Merge pull request #156 from magento-commerce/MCLOUD-14020

MCLOUD-14020: Symphony package constants & tags fixes

Author: andriyShevtsov

src/Environment/ConfigReader.php

@@ -11,6 +11,7 @@
 use Magento\CloudPatches\Filesystem\Filesystem;
 use Magento\CloudPatches\Filesystem\FileSystemException;
 use Symfony\Component\Yaml\Yaml;
+use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Exception\ParseException;
 
 /**
@@ -60,11 +61,92 @@ public function read(): array
             if (!$this->filesystem->exists($path)) {
                 $this->config = [];
             } else {
-                $parseFlag = defined(Yaml::class . '::PARSE_CONSTANT') ? Yaml::PARSE_CONSTANT : 0;
-                $this->config = (array)Yaml::parse($this->filesystem->get($path), $parseFlag);
+                $flags = 0;
+                if (defined(Yaml::class . '::PARSE_CONSTANT')) {
+                    $flags |= Yaml::PARSE_CONSTANT;
+                }
+                if (defined(Yaml::class . '::PARSE_CUSTOM_TAGS')) {
+                    $flags |= Yaml::PARSE_CUSTOM_TAGS;
+                }
+                $this->config = (array) Yaml::parse(
+                    $this->filesystem->get($path),
+                    $flags
+                );
+
+                $this->config = $this->normalizeYamlData($this->config);
             }
         }
 
         return $this->config;
     }
+
+    /**
+     * Recursively normalizes Symfony YAML TaggedValue objects into PHP-native values.
+     *
+     * Handles the following YAML tags:
+     *  - !env: resolves environment variables.
+     *  - !include: parses and normalizes included YAML files.
+     *  - !php/const: resolves PHP constants (e.g. !php/const:\PDO::ATTR_ERRMODE).
+     *  - Other or unknown tags: recursively normalize their values.
+     *
+     * Ensures all YAML data is converted to scalars or arrays suitable for safe merging.
+     *
+     * @param mixed $data The parsed YAML data (array, scalar, or TaggedValue).
+     * @return mixed The normalized data structure.
+     *
+     * @SuppressWarnings("PHPMD.NPathComplexity")
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity") Method is intentionally complex due to tag resolution logic.
+     */
+    private function normalizeYamlData(mixed $data): mixed
+    {
+        if ($data instanceof TaggedValue) {
+            $tag   = $data->getTag();   // e.g. "php/const:\PDO::MYSQL_ATTR_LOCAL_INFILE"
+            $value = $data->getValue();
+
+            // Handle php/const tags (Symfony strips leading '!')
+            if (str_starts_with($tag, 'php/const:')) {
+                // Extract the constant name
+                $constName = substr($tag, strlen('php/const:'));
+                $constName = ltrim($constName, '\\');
+
+                // Resolve the constant name to its value if defined
+                $constKey = defined($constName) ? constant($constName) : $constName;
+
+                // Handle YAML quirk where ": 1" is parsed literally
+                $raw = is_string($value) ? $value : (string)$value;
+                $cleanVal = str_replace([':', ' '], '', $raw);
+                $constVal = is_numeric($cleanVal) ? (int)$cleanVal : $cleanVal;
+
+                return [$constKey => $constVal];
+            }
+
+            // Handle !env
+            if ($tag === 'env') {
+                $envValue = getenv((string)$value);
+                return $envValue !== false ? $envValue : null;
+            }
+
+            // Handle !include
+            if ($tag === 'include') {
+                if (file_exists((string)$value)) {
+                    $included = Yaml::parseFile((string)$value);
+                    return $this->normalizeYamlData($included);
+                }
+                return null;
+            }
+
+            // Default — recursively normalize nested tagged structures
+            $normalized = $this->normalizeYamlData($value);
+            return is_array($normalized) ? $normalized : [$normalized];
+        }
+
+        // Recursively normalize arrays
+        if (is_array($data)) {
+            foreach ($data as $key => $value) {
+                $data[$key] = $this->normalizeYamlData($value);
+            }
+        }
+
+        return $data;
+    }
 }