.htaccess

@@ -32,6 +32,11 @@ AddEncoding gzip svgz
   php_value assert.active                   0
 </IfModule>
 
+# PHP 8, Apache 1 and 2.
+<IfModule mod_php.c>
+  php_value assert.active                   0
+</IfModule>
+
 # Requires mod_expires to be enabled.
 <IfModule mod_expires.c>
   # Enable expirations.

composer.json

@@ -18,7 +18,7 @@
         "behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.4",
         "behat/mink-selenium2-driver": "^1.4",
-        "composer/composer": "^2.0.2",
+        "composer/composer": "^2.2.12",
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "mikey179/vfsstream": "^1.6.8",
@@ -37,8 +37,6 @@
         "easyrdf/easyrdf": "^0.9 || ^1.0"
     },
     "replace": {
-        "paragonie/random_compat": "9.99.99",
-        "symfony/polyfill-php70": "*",
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*"
     },
@@ -49,6 +47,12 @@
         "autoloader-suffix": "Drupal9",
         "platform": {
             "php": "7.3.0"
+        },
+        "allow-plugins": {
+            "composer/installers": true,
+            "drupal/core-project-message": true,
+            "drupal/core-vendor-hardening": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "extra": {
@@ -99,13 +103,13 @@
         "drupal-phpunit-upgrade-check": "Drupal\\Core\\Composer\\Composer::upgradePHPUnit",
         "drupal-phpunit-upgrade": [
             "@composer update phpunit/phpunit --with-dependencies --no-progress",
-            "@composer require phpspec/prophecy-phpunit:^2 --no-progress --no-suggest"
+            "@composer require phpspec/prophecy-phpunit:^2 --no-progress"
         ],
         "post-update-cmd": [
             "Drupal\\Composer\\Composer::generateMetapackages"
         ],
-        "phpcs": "phpcs --standard=core/phpcs.xml.dist --runtime-set installed_paths $($COMPOSER_BINARY config vendor-dir)/drupal/coder/coder_sniffer --",
-        "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --runtime-set installed_paths $($COMPOSER_BINARY config vendor-dir)/drupal/coder/coder_sniffer --"
+        "phpcs": "phpcs --standard=core/phpcs.xml.dist --",
+        "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --"
     },
     "repositories": [
         {

composer/Composer.php

@@ -85,6 +85,7 @@ protected static function setTemplateProjectStability(string $root, string $vers
 
   /**
    * Ensure that the minimum required version of Composer is running.
+   *
    * Throw an exception if Composer is too old.
    */
   public static function ensureComposerVersion(): void {

composer/Generator/Builder/DrupalCoreRecommendedBuilder.php

@@ -41,7 +41,7 @@ public function getPackage() {
       // If there is no 'source' record, then this is a path repository
       // or something else that we do not want to include.
       if (isset($package['source']) && !in_array($package['name'], $remove_list)) {
-        $composer['require'][$package['name']] = $package['version'];
+        $composer['require'][$package['name']] = '~' . $package['version'];
       }
     }
     return $composer;
@@ -56,7 +56,7 @@ protected function initialPackageMetadata() {
     return [
       "name" => "drupal/core-recommended",
       "type" => "metapackage",
-      "description" => "Locked core dependencies; require this project INSTEAD OF drupal/core.",
+      "description" => "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
       "license" => "GPL-2.0-or-later",
       "conflict" => [
         "webflo/drupal-core-strict" => "*",

composer/Generator/PackageGenerator.php

@@ -29,7 +29,7 @@ public function __construct() {
   }
 
   /**
-   * Generate Drupal's metapackages whenever composer.lock is updated
+   * Generate Drupal's metapackages whenever composer.lock is updated.
    *
    * @param \Composer\IO\IOInterface $io
    *   Composer IO object for interacting with the user.

composer/Metapackage/CoreRecommended/composer.json

 {
     "name": "drupal/core-recommended",
     "type": "metapackage",
-    "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
+    "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
     "license": "GPL-2.0-or-later",
     "conflict": {
         "webflo/drupal-core-strict": "*"
     },
     "require": {
         "drupal/core": "9.4.x-dev",
-        "asm89/stack-cors": "1.3.0",
-        "composer/semver": "3.2.6",
-        "doctrine/annotations": "1.13.2",
-        "doctrine/lexer": "1.2.1",
-        "doctrine/reflection": "1.2.2",
-        "egulias/email-validator": "3.1.2",
-        "guzzlehttp/guzzle": "6.5.5",
-        "guzzlehttp/promises": "1.5.1",
-        "guzzlehttp/psr7": "1.8.3",
-        "laminas/laminas-diactoros": "2.8.0",
-        "laminas/laminas-escaper": "2.9.0",
-        "laminas/laminas-feed": "2.15.0",
-        "laminas/laminas-stdlib": "3.6.1",
-        "masterminds/html5": "2.7.5",
-        "pear/archive_tar": "1.4.14",
-        "pear/console_getopt": "v1.4.3",
-        "pear/pear-core-minimal": "v1.10.11",
-        "pear/pear_exception": "v1.0.2",
-        "psr/cache": "1.0.1",
-        "psr/container": "1.1.1",
-        "psr/http-factory": "1.0.1",
-        "psr/http-message": "1.0.1",
-        "psr/log": "1.1.4",
-        "ralouphie/getallheaders": "3.0.3",
-        "stack/builder": "v1.0.6",
-        "symfony-cmf/routing": "2.3.4",
-        "symfony/console": "v4.4.34",
-        "symfony/debug": "v4.4.31",
-        "symfony/dependency-injection": "v4.4.34",
-        "symfony/deprecation-contracts": "v2.5.0",
-        "symfony/error-handler": "v4.4.34",
-        "symfony/event-dispatcher": "v4.4.34",
-        "symfony/event-dispatcher-contracts": "v1.1.11",
-        "symfony/http-client-contracts": "v2.5.0",
-        "symfony/http-foundation": "v4.4.34",
-        "symfony/http-kernel": "v4.4.35",
-        "symfony/mime": "v5.4.0",
-        "symfony/polyfill-ctype": "v1.23.0",
-        "symfony/polyfill-iconv": "v1.23.0",
-        "symfony/polyfill-intl-idn": "v1.23.0",
-        "symfony/polyfill-intl-normalizer": "v1.23.0",
-        "symfony/polyfill-mbstring": "v1.23.1",
-        "symfony/polyfill-php80": "v1.23.1",
-        "symfony/process": "v4.4.35",
-        "symfony/psr-http-message-bridge": "v2.1.2",
-        "symfony/routing": "v4.4.34",
-        "symfony/serializer": "v4.4.35",
-        "symfony/service-contracts": "v2.5.0",
-        "symfony/translation": "v4.4.34",
-        "symfony/translation-contracts": "v2.5.0",
-        "symfony/validator": "v4.4.35",
-        "symfony/var-dumper": "v5.4.0",
-        "symfony/yaml": "v4.4.34",
-        "twig/twig": "v2.14.7",
-        "typo3/phar-stream-wrapper": "v3.1.7"
+        "asm89/stack-cors": "~1.3.0",
+        "composer/semver": "~3.3.2",
+        "doctrine/annotations": "~1.13.2",
+        "doctrine/lexer": "~1.2.3",
+        "doctrine/reflection": "~1.2.3",
+        "egulias/email-validator": "~3.2",
+        "guzzlehttp/guzzle": "~6.5.8",
+        "guzzlehttp/promises": "~1.5.1",
+        "guzzlehttp/psr7": "~1.9.0",
+        "laminas/laminas-diactoros": "~2.11.1",
+        "laminas/laminas-escaper": "~2.9.0",
+        "laminas/laminas-feed": "~2.17.0",
+        "laminas/laminas-stdlib": "~3.7.1",
+        "masterminds/html5": "~2.7.5",
+        "pear/archive_tar": "~1.4.14",
+        "pear/console_getopt": "~v1.4.3",
+        "pear/pear-core-minimal": "~v1.10.11",
+        "pear/pear_exception": "~v1.0.2",
+        "psr/cache": "~1.0.1",
+        "psr/container": "~1.1.1",
+        "psr/http-factory": "~1.0.1",
+        "psr/http-message": "~1.0.1",
+        "psr/log": "~1.1.4",
+        "ralouphie/getallheaders": "~3.0.3",
+        "stack/builder": "~v1.0.6",
+        "symfony-cmf/routing": "~2.3.4",
+        "symfony/console": "~v4.4.42",
+        "symfony/debug": "~v4.4.41",
+        "symfony/dependency-injection": "~v4.4.42",
+        "symfony/deprecation-contracts": "~v2.5.1",
+        "symfony/error-handler": "~v4.4.41",
+        "symfony/event-dispatcher": "~v4.4.42",
+        "symfony/event-dispatcher-contracts": "~v1.1.12",
+        "symfony/http-client-contracts": "~v2.5.1",
+        "symfony/http-foundation": "~v4.4.41",
+        "symfony/http-kernel": "~v4.4.42",
+        "symfony/mime": "~v5.4.9",
+        "symfony/polyfill-ctype": "~v1.25.0",
+        "symfony/polyfill-iconv": "~v1.25.0",
+        "symfony/polyfill-intl-idn": "~v1.25.0",
+        "symfony/polyfill-intl-normalizer": "~v1.25.0",
+        "symfony/polyfill-mbstring": "~v1.25.0",
+        "symfony/polyfill-php80": "~v1.25.0",
+        "symfony/process": "~v4.4.41",
+        "symfony/psr-http-message-bridge": "~v2.1.2",
+        "symfony/routing": "~v4.4.41",
+        "symfony/serializer": "~v4.4.42",
+        "symfony/service-contracts": "~v2.5.1",
+        "symfony/translation": "~v4.4.41",
+        "symfony/translation-contracts": "~v2.5.1",
+        "symfony/validator": "~v4.4.41",
+        "symfony/var-dumper": "~v5.4.9",
+        "symfony/yaml": "~v4.4.37",
+        "twig/twig": "~v2.15.3",
+        "typo3/phar-stream-wrapper": "~v3.1.7"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -9,7 +9,7 @@
     "require": {
         "behat/mink": "^1.8",
         "behat/mink-selenium2-driver": "^1.4",
-        "composer/composer": "^2.0.2",
+        "composer/composer": "^2.2.12",
         "drupal/coder": "^8.3.10",
         "easyrdf/easyrdf": "^0.9 || ^1.0",
         "friends-of-behat/mink-browserkit-driver": "^1.4",

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -8,57 +8,61 @@
     },
     "require": {
         "drupal/core": "9.4.x-dev",
-        "behat/mink": "v1.9.0",
-        "behat/mink-selenium2-driver": "v1.5.0",
-        "composer/ca-bundle": "1.3.1",
-        "composer/composer": "2.1.12",
+        "behat/mink": "v1.10.0",
+        "behat/mink-selenium2-driver": "v1.6.0",
+        "composer/ca-bundle": "1.3.2",
+        "composer/composer": "2.2.14",
         "composer/metadata-minifier": "1.0.0",
-        "composer/spdx-licenses": "1.5.6",
-        "composer/xdebug-handler": "2.0.2",
-        "doctrine/instantiator": "1.4.0",
-        "drupal/coder": "8.3.13",
+        "composer/pcre": "1.0.1",
+        "composer/spdx-licenses": "1.5.7",
+        "composer/xdebug-handler": "3.0.3",
+        "dealerdirect/phpcodesniffer-composer-installer": "v0.7.2",
+        "doctrine/instantiator": "1.4.1",
+        "drupal/coder": "8.3.15",
         "easyrdf/easyrdf": "1.1.1",
         "friends-of-behat/mink-browserkit-driver": "v1.5.0",
-        "instaclick/php-webdriver": "1.4.10",
-        "justinrainbow/json-schema": "5.2.11",
+        "instaclick/php-webdriver": "1.4.14",
+        "justinrainbow/json-schema": "5.2.12",
         "mikey179/vfsstream": "v1.6.10",
-        "myclabs/deep-copy": "1.10.2",
+        "myclabs/deep-copy": "1.11.0",
         "phar-io/manifest": "2.0.3",
-        "phar-io/version": "3.1.0",
+        "phar-io/version": "3.2.1",
         "phpdocumentor/reflection-common": "2.2.0",
         "phpdocumentor/reflection-docblock": "5.3.0",
-        "phpdocumentor/type-resolver": "1.5.1",
-        "phpspec/prophecy": "1.14.0",
+        "phpdocumentor/type-resolver": "1.6.1",
+        "phpspec/prophecy": "v1.15.0",
+        "phpstan/phpdoc-parser": "1.5.1",
         "phpunit/php-code-coverage": "7.0.15",
-        "phpunit/php-file-iterator": "2.0.4",
+        "phpunit/php-file-iterator": "2.0.5",
         "phpunit/php-text-template": "1.2.1",
         "phpunit/php-timer": "2.1.3",
         "phpunit/php-token-stream": "4.0.4",
-        "phpunit/phpunit": "8.5.21",
-        "react/promise": "v2.8.0",
+        "phpunit/phpunit": "8.5.26",
+        "react/promise": "v2.9.0",
         "sebastian/code-unit-reverse-lookup": "1.0.2",
         "sebastian/comparator": "3.0.3",
         "sebastian/diff": "3.0.3",
         "sebastian/environment": "4.2.4",
         "sebastian/exporter": "3.1.4",
-        "sebastian/global-state": "3.0.1",
+        "sebastian/global-state": "3.0.2",
         "sebastian/object-enumerator": "3.0.4",
         "sebastian/object-reflector": "1.1.2",
         "sebastian/recursion-context": "3.0.1",
         "sebastian/resource-operations": "2.0.2",
         "sebastian/type": "1.1.4",
         "sebastian/version": "2.0.1",
-        "seld/jsonlint": "1.8.3",
-        "seld/phar-utils": "1.1.2",
-        "sirbrillig/phpcs-variable-analysis": "v2.11.2",
-        "squizlabs/php_codesniffer": "3.6.1",
-        "symfony/browser-kit": "v4.4.27",
-        "symfony/css-selector": "v4.4.27",
-        "symfony/dom-crawler": "v4.4.30",
-        "symfony/filesystem": "v4.4.27",
-        "symfony/finder": "v4.4.30",
-        "symfony/lock": "v4.4.33",
-        "symfony/phpunit-bridge": "v5.4.0",
+        "seld/jsonlint": "1.9.0",
+        "seld/phar-utils": "1.2.0",
+        "sirbrillig/phpcs-variable-analysis": "v2.11.3",
+        "slevomat/coding-standard": "7.2.1",
+        "squizlabs/php_codesniffer": "3.6.2",
+        "symfony/browser-kit": "v4.4.37",
+        "symfony/css-selector": "v4.4.37",
+        "symfony/dom-crawler": "v4.4.42",
+        "symfony/filesystem": "v4.4.42",
+        "symfony/finder": "v4.4.41",
+        "symfony/lock": "v4.4.40",
+        "symfony/phpunit-bridge": "v5.4.8",
         "theseer/tokenizer": "1.2.1",
         "webmozart/assert": "1.10.0"
     }

composer/Metapackage/README.txt

@@ -28,7 +28,7 @@ Drupal Core provides three metapackages that serve different purposes.
 Note that a project that uses both drupal/core-recommended and
 drupal/core-dev-pinned must update them both at the same time, e.g.:
 
-  composer update drupal/core-recommended drupal/core-dev-pinned --with-updates
+  composer update drupal/core-recommended drupal/core-dev-pinned --with-dependencies
 
 Composer may have trouble with the update if one of these projects is listed
 on the command line without the other. Running composer update without any

composer/Plugin/ProjectMessage/Message.php

@@ -73,11 +73,13 @@ public function getText() {
               $this->messageText[] = '  * Name: ' . $homepage;
             }
             break;
+
           case 'description':
             if ($homepage = $this->rootPackage->getDescription()) {
               $this->messageText[] = '  * Description: ' . $homepage;
             }
             break;
+
           case 'homepage':
             if ($homepage = $this->rootPackage->getHomepage()) {
               $this->messageText[] = '  * Homepage: ' . $homepage;

composer/Plugin/Scaffold/Git.php

@@ -6,7 +6,7 @@
 use Composer\Util\ProcessExecutor;
 
 /**
- * Provide some Git utility operations
+ * Provide some Git utility operations.
  *
  * @internal
  */
@@ -21,6 +21,8 @@ private function __construct() {
   /**
    * Determines whether the specified scaffold file is already ignored.
    *
+   * @param \Composer\IO\IOInterface $io
+   *   The Composer IO interface.
    * @param string $path
    *   Path to scaffold file to check.
    * @param string $dir
@@ -39,6 +41,8 @@ public static function checkIgnore(IOInterface $io, $path, $dir = NULL) {
   /**
    * Determines whether the specified scaffold file is tracked by git.
    *
+   * @param \Composer\IO\IOInterface $io
+   *   The Composer IO interface.
    * @param string $path
    *   Path to scaffold file to check.
    * @param string $dir
@@ -57,8 +61,11 @@ public static function checkTracked(IOInterface $io, $path, $dir = NULL) {
   /**
    * Checks to see if the project root dir is in a git repository.
    *
+   * @param \Composer\IO\IOInterface $io
+   *   The Composer IO interface.
    * @param string $dir
    *   Base directory for git process.
+   *
    * @return bool
    *   True if this is a repository.
    */

composer/Plugin/Scaffold/ManageGitIgnore.php

@@ -28,6 +28,8 @@ class ManageGitIgnore {
   /**
    * ManageGitIgnore constructor.
    *
+   * @param \Composer\IO\IOInterface $io
+   *   The Composer IO interface.
    * @param string $dir
    *   The directory where the project is located.
    */

composer/Plugin/Scaffold/Operations/AppendOp.php

@@ -126,7 +126,6 @@ public function process(ScaffoldFilePath $destination, IOInterface $io, Scaffold
       $io->write($interpolator->interpolate("  - Prepend to <info>[dest-rel-path]</info> from <info>[prepend-rel-path]</info>"));
     }
     // Notify that we are appending, if there is append data.
-    $append_contents = '';
     if (!empty($this->append)) {
       $this->append->addInterpolationData($interpolator, 'append');
       $io->write($interpolator->interpolate("  - Append to <info>[dest-rel-path]</info> from <info>[append-rel-path]</info>"));
@@ -187,10 +186,12 @@ public function scaffoldAtNewLocation(ScaffoldFilePath $destination) {
 
   /**
    * Check to see if the append/prepend data has already been applied.
+   *
    * @param string $contents
    *   The contents of the target file.
    * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $data_path
    *   The path to the data to append or prepend
+   *
    * @return bool
    *   'TRUE' if the append/prepend data already exists in contents.
    */

composer/Plugin/Scaffold/Operations/OperationData.php

@@ -25,7 +25,7 @@ class OperationData {
   protected $data;
 
   /**
-   * The destination path
+   * The destination path.
    *
    * @var string
    */
@@ -34,6 +34,8 @@ class OperationData {
   /**
    * OperationData constructor.
    *
+   * @param string $destination
+   *   The destination path.
    * @param mixed $data
    *   The raw data array to wrap.
    */
@@ -53,7 +55,7 @@ public function destination() {
   }
 
   /**
-   * Gets operation mode
+   * Gets operation mode.
    *
    * @return string
    *   Operation mode.
@@ -63,7 +65,7 @@ public function mode() {
   }
 
   /**
-   * Checks if path exists
+   * Checks if path exists.
    *
    * @return bool
    *   Returns true if path exists
@@ -73,7 +75,7 @@ public function hasPath() {
   }
 
   /**
-   * Gets path
+   * Gets path.
    *
    * @return string
    *   The path.

composer/Plugin/Scaffold/Operations/OperationFactory.php

@@ -44,7 +44,7 @@ public function __construct(Composer $composer) {
    *   The scaffolding operation object (skip, replace, etc.)
    *
    * @throws \RuntimeException
-   *   Exception thrown when parameter data does not identify a known scaffol
+   *   Exception thrown when parameter data does not identify a known scaffold
    *   operation.
    */
   public function create(PackageInterface $package, OperationData $operation_data) {

composer/Plugin/Scaffold/Operations/ReplaceOp.php

@@ -92,8 +92,7 @@ public function process(ScaffoldFilePath $destination, IOInterface $io, Scaffold
   protected function copyScaffold(ScaffoldFilePath $destination, IOInterface $io) {
     $interpolator = $destination->getInterpolator();
     $this->source->addInterpolationData($interpolator);
-    $success = file_put_contents($destination->fullPath(), $this->contents());
-    if (!$success) {
+    if (file_put_contents($destination->fullPath(), $this->contents()) === FALSE) {
       throw new \RuntimeException($interpolator->interpolate("Could not copy source file <info>[src-rel-path]</info> to <info>[dest-rel-path]</info>!"));
     }
     $io->write($interpolator->interpolate("  - Copy <info>[dest-rel-path]</info> from <info>[src-rel-path]</info>"));

composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php

@@ -103,7 +103,7 @@ public function filterFiles(array $files_to_filter) {
    *   TRUE if at least one item in the list has content
    */
   protected function checkListHasItemWithContent(array $scaffold_files) {
-    foreach ($scaffold_files as $destination_rel_path => $scaffold_file) {
+    foreach ($scaffold_files as $scaffold_file) {
       $contents = $scaffold_file->op()->contents();
       if (!empty($contents)) {
         return TRUE;
@@ -186,7 +186,7 @@ public static function process(ScaffoldFileCollection $collection, IOInterface $
    */
   public function checkUnchanged() {
     $results = [];
-    foreach ($this as $project_name => $scaffold_files) {
+    foreach ($this as $scaffold_files) {
       foreach ($scaffold_files as $scaffold_file) {
         if (!$scaffold_file->hasChanged()) {
           $results[] = $scaffold_file->destination()->relativePath();

composer/Plugin/VendorHardening/FileSecurity.php

@@ -77,6 +77,9 @@ protected static function htaccessPreventExecution() {
 <IfModule mod_php7.c>
   php_flag engine off
 </IfModule>
+<IfModule mod_php.c>
+  php_flag engine off
+</IfModule>
 EOF;
   }
 

composer/Plugin/VendorHardening/VendorHardeningPlugin.php

@@ -117,6 +117,7 @@ public function onPostCmd(Event $event) {
    * PRE_PACKAGE_INSTALL event handler.
    *
    * @param \Composer\Installer\PackageEvent $event
+   *   The package event.
    */
   public function onPrePackageInstall(PackageEvent $event) {
     /** @var \Composer\Package\CompletePackage $package */
@@ -128,6 +129,7 @@ public function onPrePackageInstall(PackageEvent $event) {
    * PRE_PACKAGE_UPDATE event handler.
    *
    * @param \Composer\Installer\PackageEvent $event
+   *   The package event.
    */
   public function onPrePackageUpdate(PackageEvent $event) {
     /** @var \Composer\Package\CompletePackage $package */
@@ -139,6 +141,7 @@ public function onPrePackageUpdate(PackageEvent $event) {
    * POST_PACKAGE_INSTALL event handler.
    *
    * @param \Composer\Installer\PackageEvent $event
+   *   The package event.
    */
   public function onPostPackageInstall(PackageEvent $event) {
     $this->cleanPackage($event->getOperation()->getPackage());
@@ -148,6 +151,7 @@ public function onPostPackageInstall(PackageEvent $event) {
    * POST_PACKAGE_UPDATE event handler.
    *
    * @param \Composer\Installer\PackageEvent $event
+   *   The package event.
    */
   public function onPostPackageUpdate(PackageEvent $event) {
     $this->cleanPackage($event->getOperation()->getTargetPackage());
@@ -211,6 +215,7 @@ protected function findBinOverlap($binaries, $clean_paths) {
     $filesystem = [];
     foreach ($clean_paths as $clean_path) {
       $clean_pieces = explode("/", $clean_path);
+      // phpcs:ignore DrupalPractice.CodeAnalysis.VariableAnalysis.UnusedVariable
       $current = &$filesystem;
       foreach ($clean_pieces as $clean_piece) {
         $current = &$current[$clean_piece];