Merge pull request #200 from BrianHenryIE/fix-vendor-autoloader

Fix vendor autoloader dev entries when target is vendor

Author: BrianHenryIE

composer.json

@@ -19,7 +19,7 @@
         "brianhenryie/simple-php-code-parser": "^0.15.2",
         "composer-runtime-api": "^2.0",
         "composer/class-map-generator": "^1.6.0",
-        "composer/composer": "*",
+        "composer/composer": "^2.6.0",
         "elazar/flystream": "^0.5.0|^1",
         "json-mapper/json-mapper": ">=2.0.0 <=2.22.3",
         "league/flysystem": "^2.1|^3.0",

src/Pipeline/Autoload/DumpAutoload.php

@@ -111,7 +111,14 @@ protected function generatedMainAutoloader(): void
 //        $generator->setApcu($apcu, $apcuPrefix);
 //        $generator->setPlatformRequirementFilter($this->getPlatformRequirementFilter($input));
         $optimize = true; // $input->getOption('optimize') || $config->get('optimize-autoloader');
-        $generator->setDevMode(false);
+
+        /**
+         * If the target directory is different to the vendor directory, then we do not want to include dev
+         * dependencies, but if it is vendor, then unless composer install was run with --no-dev, we do want them.
+         */
+        if ($this->config->getVendorDirectory() !== $this->config->getTargetDirectory()) {
+            $generator->setDevMode(false);
+        }
 
         $localRepo = new InstalledFilesystemRepository(new JsonFile($this->config->getTargetDirectory() . 'composer/installed.json'));
 
@@ -179,6 +186,10 @@ protected function createInstalledVersionsFiles(): void
 
     protected function prefixNewAutoloader(): void
     {
+        if ($this->config->getVendorDirectory() === $this->config->getTargetDirectory()) {
+            return;
+        }
+
         $this->logger->debug('Prefixing the new Composer autoloader.');
 
         $projectFiles = $this->fileEnumerator->compileFileListForPaths([

tests/Issues/StraussIssue200Test.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @see https://github.com/BrianHenryIE/strauss/pull/200
+ */
+
+namespace BrianHenryIE\Strauss\Tests\Issues;
+
+use BrianHenryIE\Strauss\Tests\Integration\Util\IntegrationTestCase;
+
+/**
+ * @package BrianHenryIE\Strauss\Tests\Issues
+ * @coversNothing
+ */
+class StraussIssue200Test extends IntegrationTestCase
+{
+    public function test_does_not_remove_vendor_autoload_dev_entries()
+    {
+
+        $composerJsonString = <<<'EOD'
+{
+  "require": {
+    "psr/log": "*"
+  },
+  "require-dev": {
+    "psr/simple-cache": "*"
+  },
+  "extra": {
+    "strauss": {
+      "target_directory": "vendor",
+      "namespace_prefix": "Company\\Project\\"
+    }
+  }
+}
+EOD;
+
+        chdir($this->testsWorkingDir);
+
+        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+
+        exec('composer install');
+        $exitCode = $this->runStrauss($output);
+        assert(0 === $exitCode, $output);
+
+        $php_string = file_get_contents($this->testsWorkingDir . 'vendor/composer/installed.json');
+        $this->assertStringContainsString("Company\\\\Project\\\\Psr\\\\Log\\\\", $php_string);
+        $this->assertStringContainsString("\"Psr\\\\SimpleCache\\\\", $php_string);
+
+        $php_string = file_get_contents($this->testsWorkingDir . 'vendor/composer/autoload_psr4.php');
+        $this->assertStringContainsString("Company\\\\Project\\\\Psr\\\\Log\\\\", $php_string);
+        $this->assertStringContainsString("Psr\\\\SimpleCache\\\\", $php_string);
+    }
+}

tests/Unit/Pipeline/Autoload/DumpAutoloadTest.php

@@ -89,8 +89,8 @@ public function test_create_installed_versions_files(): void
         $logger = new NullLogger();
 
         $config->expects('isDryRun')->times(1)->andReturn(true);
-        $config->expects('getVendorDirectory')->times(3)->andReturn('mem://project/vendor');
-        $config->expects('getTargetDirectory')->times(4)->andReturn('mem://project/vendor-prefixed');
+        $config->expects('getVendorDirectory')->times(4)->andReturn('mem://project/vendor');
+        $config->expects('getTargetDirectory')->times(5)->andReturn('mem://project/vendor-prefixed');
 
         $installedVersions = <<<EOD
 <?php // a core Composer file that is not unique per install.

tests/Unit/Pipeline/FileSymbolScannerTest.php

@@ -479,7 +479,7 @@ public function test_it_parses_classes_after_semicolon()
     {
 
         $contents = "
-	    myvar = 123; class Pear { };
+	    \$myvar = 123; class Pear { };
 	    ";
 
         $filesystemReaderMock = Mockery::mock(Filesystem::class);