Merge pull request #46 from thewilkybarkid/classmap

Manipulate the classmap rather than the generated classmap file

Author: webmozart

src/PuliPlugin.php

@@ -43,6 +43,7 @@ public static function getSubscribedEvents()
         return array(
             ScriptEvents::POST_INSTALL_CMD => 'listen',
             ScriptEvents::POST_UPDATE_CMD => 'listen',
+            ScriptEvents::PRE_AUTOLOAD_DUMP => 'listen',
             ScriptEvents::POST_AUTOLOAD_DUMP => 'listen',
         );
     }
@@ -78,6 +79,9 @@ public function listen(Event $event)
         }
 
         switch ($event->getName()) {
+            case ScriptEvents::PRE_AUTOLOAD_DUMP:
+                $this->impl->preAutoloadDump();
+                break;
             case ScriptEvents::POST_AUTOLOAD_DUMP:
                 $this->impl->postAutoloadDump();
                 break;

src/PuliPluginImpl.php

@@ -83,6 +83,11 @@ class PuliPluginImpl
      */
     private $rootDir;
 
+    /**
+     * @var bool
+     */
+    private $runPreAutoloadDump = true;
+
     /**
      * @var bool
      */
@@ -98,6 +103,11 @@ class PuliPluginImpl
      */
     private $initialized = false;
 
+    /**
+     * @var string
+     */
+    private $autoloadFile;
+
     public function __construct(Event $event, PuliRunner $puliRunner = null)
     {
         $this->composer = $event->getComposer();
@@ -106,29 +116,28 @@ public function __construct(Event $event, PuliRunner $puliRunner = null)
         $this->isDev = $event->isDevMode();
         $this->puliRunner = $puliRunner;
         $this->rootDir = Path::normalize(getcwd());
+
+        $vendorDir = $this->config->get('vendor-dir');
+
+        // On TravisCI, $vendorDir is a relative path. Probably an old Composer
+        // build or something. Usually, $vendorDir should be absolute already.
+        $vendorDir = Path::makeAbsolute($vendorDir, $this->rootDir);
+
+        $this->autoloadFile = $vendorDir.'/autoload.php';
     }
 
-    public function postAutoloadDump()
+    public function preAutoloadDump()
     {
         if (!$this->initialized) {
             $this->initialize();
         }
 
         // This method is called twice. Run it only once.
-        if (!$this->runPostAutoloadDump) {
+        if (!$this->runPreAutoloadDump) {
             return;
         }
 
-        $this->runPostAutoloadDump = false;
-
-        $vendorDir = $this->config->get('vendor-dir');
-
-        // On TravisCI, $vendorDir is a relative path. Probably an old Composer
-        // build or something. Usually, $vendorDir should be absolute already.
-        $vendorDir = Path::makeAbsolute($vendorDir, $this->rootDir);
-
-        $autoloadFile = $vendorDir.'/autoload.php';
-        $classMapFile = $vendorDir.'/composer/autoload_classmap.php';
+        $this->runPreAutoloadDump = false;
 
         try {
             $factoryClass = $this->getConfigKey('factory.in.class');
@@ -141,9 +150,51 @@ public function postAutoloadDump()
 
         $factoryFile = Path::makeAbsolute($factoryFile, $this->rootDir);
 
-        $this->insertFactoryClassConstant($autoloadFile, $factoryClass);
-        $this->insertFactoryClassMap($classMapFile, $vendorDir, $factoryClass, $factoryFile);
-        $this->setBootstrapFile($autoloadFile);
+        $autoload = $this->composer->getPackage()->getAutoload();
+        $autoload['classmap'][] = $factoryFile;
+
+        $this->composer->getPackage()->setAutoload($autoload);
+
+        if (!file_exists($factoryFile)) {
+            $filesystem = new Filesystem();
+            // Let Composer find the factory class with a temporary stub
+
+            $namespace = explode('\\', ltrim($factoryClass, '\\'));
+            $className = array_pop($namespace);
+
+            if (count($namespace)) {
+                $stub = '<?php namespace '.implode('\\', $namespace).'; class '.$className.' {}';
+            } else {
+                $stub = '<?php class '.$className.' {}';
+            }
+
+            $filesystem->dumpFile($factoryFile, $stub);
+        }
+    }
+
+    public function postAutoloadDump()
+    {
+        if (!$this->initialized) {
+            $this->initialize();
+        }
+
+        // This method is called twice. Run it only once.
+        if (!$this->runPostAutoloadDump) {
+            return;
+        }
+
+        $this->runPostAutoloadDump = false;
+
+        try {
+            $factoryClass = $this->getConfigKey('factory.in.class');
+        } catch (PuliRunnerException $e) {
+            $this->printWarning('Could not load Puli configuration', $e);
+
+            return;
+        }
+
+        $this->insertFactoryClassConstant($this->autoloadFile, $factoryClass);
+        $this->setBootstrapFile($this->autoloadFile);
     }
 
     /**
@@ -200,6 +251,13 @@ public function postInstall()
 
     private function initialize()
     {
+        if (!file_exists($this->autoloadFile)) {
+            $filesystem = new Filesystem();
+            // Avoid problems if using the runner before autoload.php has been
+            // generated
+            $filesystem->dumpFile($this->autoloadFile, '');
+        }
+
         $this->initialized = true;
 
         // Keep the manually set runner
@@ -210,6 +268,7 @@ private function initialize()
                 $this->puliRunner = new PuliRunner($this->config->get('bin-dir'));
             } catch (RuntimeException $e) {
                 $this->printWarning('Plugin initialization failed', $e);
+                $this->runPreAutoloadDump = false;
                 $this->runPostAutoloadDump = false;
                 $this->runPostInstall = false;
             }
@@ -220,6 +279,7 @@ private function initialize()
             $this->verifyPuliVersion();
         } catch (RuntimeException $e) {
             $this->printWarning('Version check failed', $e);
+            $this->runPreAutoloadDump = false;
             $this->runPostAutoloadDump = false;
             $this->runPostInstall = false;
         }
@@ -439,33 +499,6 @@ private function insertFactoryClassConstant($autoloadFile, $factoryClass)
         file_put_contents($autoloadFile, $contents);
     }
 
-    private function insertFactoryClassMap($classMapFile, $vendorDir, $factoryClass, $factoryFile)
-    {
-        if (!file_exists($classMapFile)) {
-            throw new PuliPluginException(sprintf(
-                'Could not adjust autoloader: The file %s was not found.',
-                $classMapFile
-            ));
-        }
-
-        $this->io->write(sprintf('<info>Registering "%s" with the class-map autoloader</info>', $factoryClass));
-
-        $relFactoryFile = Path::makeRelative($factoryFile, $vendorDir);
-        $escFactoryClass = var_export($factoryClass, true);
-        $escFactoryFile = var_export('/'.$relFactoryFile, true);
-        $classMap = sprintf("\n    %s => \$vendorDir . %s,", $escFactoryClass, $escFactoryFile);
-
-        $contents = file_get_contents($classMapFile);
-
-        // Regex modifiers:
-        // "m": \s matches newlines
-        // "D": $ matches at EOF only
-        // Translation: insert before the last ");" in the file
-        $contents = preg_replace('/\n(?=\);\s*$)/mD', "\n".$classMap, $contents);
-
-        file_put_contents($classMapFile, $contents);
-    }
-
     private function setBootstrapFile($autoloadFile)
     {
         $bootstrapFile = $this->getConfigKey('bootstrap-file');