MCLOUD-14020: Added normalized data function to handle custom tags

Author: prateek-karanpuria-adobe

src/Config/Source/CloudSource.php

@@ -15,6 +15,8 @@
 use Magento\CloudDocker\Service\ServiceFactory;
 use Magento\CloudDocker\Service\ServiceInterface;
 use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Tag\TaggedValue;
+
 use Exception;
 
 /**
@@ -94,6 +96,8 @@ public function read(): Repository
                 $this->filesystem->get($this->fileList->getAppConfig()),
                 $flags
             );
+
+            $appConfig = $this->normalizeYamlData($appConfig);
         } catch (\Exception $exception) {
             throw new SourceException($exception->getMessage(), $exception->getCode(), $exception);
         }
@@ -157,6 +161,55 @@ public function read(): Repository
         return $repository;
     }
 
+    /**
+     * Recursively unwrap Symfony YAML TaggedValue objects and handle common tags.
+     *
+     * This method handles !env, !include, !php/const, and unknown tags,
+     * ensuring all YAML values are normalized to arrays or scalars for safe merging.
+     *
+     * @param mixed $data
+     * @return mixed
+     *
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity") Method is intentionally complex due to tag handling.
+     */
+    private function normalizeYamlData(mixed $data): mixed
+    {
+        if ($data instanceof TaggedValue) {
+            $tag = $data->getTag();
+            $value = $data->getValue();
+
+            switch ($tag) {
+                case '!env':
+                    $envValue = getenv((string)$value);
+                    return $envValue !== false ? $envValue : null;
+
+                case '!include':
+                    if (file_exists((string)$value)) {
+                        $included = Yaml::parseFile((string)$value);
+                        return $this->normalizeYamlData($included);
+                    }
+                    return null;
+
+                case '!php/const':
+                    // Evaluate the PHP constant
+                    return defined($value) ? constant($value) : null;
+
+                default:
+                    $val = $this->normalizeYamlData($value);
+                    return is_array($val) ? $val : [$val];
+            }
+        }
+
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                $data[$key] = $this->normalizeYamlData($value);
+            }
+            return $data;
+        }
+
+        return $data;
+    }
+
     /**
      * Adds service relationships to the repository.
      *

tests/functional/Codeception/TestInfrastructure.php

@@ -10,6 +10,7 @@
 use Composer\Factory;
 use Composer\IO\NullIO;
 use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Tag\TaggedValue;
 
 /**
  * The module to work with test infrastructure
@@ -706,7 +707,57 @@ private function readYamlConfiguration(string $path): array
         if (defined(Yaml::class . '::PARSE_CUSTOM_TAGS')) {
             $flags |= Yaml::PARSE_CUSTOM_TAGS;
         }
-        return (array) Yaml::parseFile($path, $flags);
+        $data = (array) Yaml::parseFile($path, $flags);
+        return $this->normalizeYamlData($data) ?: [];
+    }
+
+    /**
+     * Recursively unwrap Symfony YAML TaggedValue objects and handle common tags.
+     *
+     * This method handles !env, !include, !php/const, and unknown tags,
+     * ensuring all YAML values are normalized to arrays or scalars for safe merging.
+     *
+     * @param mixed $data
+     * @return mixed
+     *
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity") Method is intentionally complex due to tag handling.
+     */
+    private function normalizeYamlData(mixed $data): mixed
+    {
+        if ($data instanceof TaggedValue) {
+            $tag = $data->getTag();
+            $value = $data->getValue();
+
+            switch ($tag) {
+                case '!env':
+                    $envValue = getenv((string)$value);
+                    return $envValue !== false ? $envValue : null;
+
+                case '!include':
+                    if (file_exists((string)$value)) {
+                        $included = Yaml::parseFile((string)$value);
+                        return $this->normalizeYamlData($included);
+                    }
+                    return null;
+
+                case '!php/const':
+                    // Evaluate the PHP constant
+                    return defined($value) ? constant($value) : null;
+
+                default:
+                    $val = $this->normalizeYamlData($value);
+                    return is_array($val) ? $val : [$val];
+            }
+        }
+
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                $data[$key] = $this->normalizeYamlData($value);
+            }
+            return $data;
+        }
+
+        return $data;
     }
 
     /**