Move our Symfony class overrides into a location that we dynamically …

…load.
drush-ops · Apr 1, 2022 · 55c7acf · 55c7acf
1 parent dc51857
commit 55c7acf
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 0 deletions.
diff --git a/src/Style/DrushStyle.php → ...ony-compatibility/v4/Style/DrushStyle.php b/src/Style/DrushStyle.php → ...ony-compatibility/v4/Style/DrushStyle.php
diff --git a/src/Symfony/BootstrapCompilerPass.php → ...lity/v4/Symfony/BootstrapCompilerPass.php b/src/Symfony/BootstrapCompilerPass.php → ...lity/v4/Symfony/BootstrapCompilerPass.php
diff --git a/src/Symfony/BufferedConsoleOutput.php → ...lity/v4/Symfony/BufferedConsoleOutput.php b/src/Symfony/BufferedConsoleOutput.php → ...lity/v4/Symfony/BufferedConsoleOutput.php
diff --git a/src/Symfony/DrushStyleInjector.php → ...ibility/v4/Symfony/DrushStyleInjector.php b/src/Symfony/DrushStyleInjector.php → ...ibility/v4/Symfony/DrushStyleInjector.php
diff --git a/...Symfony/IndiscriminateInputDefinition.php → ...Symfony/IndiscriminateInputDefinition.php b/...Symfony/IndiscriminateInputDefinition.php → ...Symfony/IndiscriminateInputDefinition.php
diff --git a/src/Symfony/LessStrictArgvInput.php → ...bility/v4/Symfony/LessStrictArgvInput.php b/src/Symfony/LessStrictArgvInput.php → ...bility/v4/Symfony/LessStrictArgvInput.php
diff --git a/src/Preflight/Preflight.php b/src/Preflight/Preflight.php
@@ -199,6 +199,38 @@ public function loadSiteAutoloader(): ClassLoader
         return $this->environment()->loadSiteAutoloader($this->drupalFinder()->getDrupalRoot());
     }
 
+    public function loadSymfonyCompatabilityAutoloader(): ClassLoader
+    {
+        $symfonyMajorVersion = \Symfony\Component\HttpKernel\Kernel::MAJOR_VERSION;
+        $compatibilityMap = [
+            3 => false, // Drupal 8
+            4 => 'v4',  // Drupal 9
+            5 => 'v4',  // Early Drupal 10 (Symfony 5 works with Symfony 4 classes, so we don't keep an extra copy)
+            6 => 'v4',  // Drupal 10 (We'll change this to v6 in just a sec)
+        ];
+
+        if (empty($compatibilityMap[$symfonyMajorVersion])) {
+            throw new RuntimeException("Fatal error: Drush does not work with Symfony $symfonyMajorVersion. (In theory, Composer should not allow you to get this far.)");
+        }
+
+        $compatibilityBaseDir = dirname(__DIR__, 2) . '/src-symfony-compatibility';
+        $compatibilityDir = $compatibilityBaseDir . '/' . $compatibilityMap[$symfonyMajorVersion];
+
+        // Next we will make a dynamic autoloader equivalent to an
+        // entry in the autoload.php file similar to:
+        //
+        //    "psr-4": {
+        //      "Drush\\": $compatibilityDir
+        //    }
+        $loader = new \Composer\Autoload\ClassLoader();
+        // register classes with namespaces
+        $loader->addPsr4('Drush\\', $compatibilityDir);
+        // activate the autoloader
+        $loader->register();
+
+        return $loader;
+    }
+
     public function config(): DrushConfig
     {
         return $this->configLocator->config();

diff --git a/src/Runtime/Runtime.php b/src/Runtime/Runtime.php
@@ -80,6 +80,9 @@ protected function doRun($argv, $output)
         // Require the Composer autoloader for Drupal (if different)
         $loader = $this->preflight->loadSiteAutoloader();
 
+        // Load the Symfony compatability layer autoloader
+        $this->preflight->loadSymfonyCompatabilityAutoloader();
+
         // Create the Symfony Application et. al.
         $input = $this->preflight->createInput();
         $application = new Application('Drush Commandline Tool', Drush::getVersion());