All PSR-4 autoload key to be an array

BrianHenryIE · Oct 30, 2023 · b32fe49 · b32fe49
1 parent 09ebec1
commit b32fe49
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 6 deletions.
diff --git a/src/Composer/ComposerPackage.php b/src/Composer/ComposerPackage.php
@@ -163,8 +163,9 @@ public function getPackageAbsolutePath(): ?string
     /**
      *
      * e.g. ['psr-4' => [ 'BrianHenryIE\Project' => 'src' ]]
+     * e.g. ['psr-4' => [ 'BrianHenryIE\Project' => ['src','lib] ]]
      *
-     * @return array<string, array<int|string, string>>
+     * @return array<string, array<int|string, string|array<string>>>
      */
     public function getAutoload(): array
     {

diff --git a/src/Composer/Extra/StraussConfig.php b/src/Composer/Extra/StraussConfig.php
@@ -230,11 +230,14 @@ public function __construct(Composer $composer)
             // Check each autoloader.
             foreach ($composer->getPackage()->getAutoload() as $autoload) {
                 // To see if one of its paths.
-                foreach ($autoload as $path) {
-                    // Matches the target directory.
-                    if (trim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR === $this->getTargetDirectory()) {
-                        $this->classmapOutput = false;
-                        break 2;
+                foreach ($autoload as $entry) {
+                    $paths = (array) $entry;
+                    foreach ($paths as $path) {
+                        // Matches the target directory.
+                        if (trim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR === $this->getTargetDirectory()) {
+                            $this->classmapOutput = false;
+                            break 3;
+                        }
                     }
                 }
             }

diff --git a/tests/Issues/StraussIssue76Test.php b/tests/Issues/StraussIssue76Test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Test PSR-4 array of autoload values.
+ *
+ * @see https://github.com/BrianHenryIE/strauss/issues/76
+ */
+
+namespace BrianHenryIE\Strauss\Tests\Issues;
+
+use BrianHenryIE\Strauss\Console\Commands\Compose;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @package BrianHenryIE\Strauss\Tests\Issues
+ * @coversNothing
+ */
+class StraussIssue76Test extends \BrianHenryIE\Strauss\Tests\Integration\Util\IntegrationTestCase
+{
+
+    /**
+     */
+    public function test_psr4_array()
+    {
+
+        $composerJsonString = <<<'EOD'
+{
+  "autoload": {
+    "psr-4": {
+      "FakerPress\\": [
+        "src/FakerPress/",
+        "src/functions/"
+      ],
+      "FakerPress\\Dev\\": "dev/src/"
+    }
+  },
+  "extra": {
+    "strauss": {
+      "target_directory": "vendor-prefixed",
+      "namespace_prefix": "FakerPress\\ThirdParty\\",
+      "classmap_prefix": "FakerPress_ThirdParty_",
+      "constant_prefix": "FAKERPRESS__"
+    }
+  }
+}
+EOD;
+
+        chdir($this->testsWorkingDir);
+
+        file_put_contents($this->testsWorkingDir . '/composer.json', $composerJsonString);
+
+        exec('composer install');
+
+        $inputInterfaceMock = $this->createMock(InputInterface::class);
+        $outputInterfaceMock = $this->createMock(OutputInterface::class);
+
+        $strauss = new Compose();
+
+        $result = $strauss->run($inputInterfaceMock, $outputInterfaceMock);
+
+        self::assertEquals(0, $result);
+    }
+}
diff --git a/tests/Unit/Composer/ComposerPackageTest.php b/tests/Unit/Composer/ComposerPackageTest.php
@@ -3,6 +3,9 @@
 namespace BrianHenryIE\Strauss\Tests\Unit\Composer;
 
 use BrianHenryIE\Strauss\Composer\ComposerPackage;
+use BrianHenryIE\Strauss\Composer\Extra\StraussConfig;
+use Composer\Factory;
+use Composer\IO\NullIO;
 use PHPUnit\Framework\TestCase;
 
 class ComposerPackageTest extends TestCase
@@ -126,6 +129,38 @@ public function testAutoloadFiles()
         $this->assertIsArray($autoload['files']);
     }
 
+    public function testPsr4Array()
+    {
+
+        $composerJson = <<<'EOD'
+{
+    "autoload": {
+        "psr-4": { "Monolog\\": ["src/", "lib/"] }
+    }
+}
+
+EOD;
+        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
+        file_put_contents($tmpfname, $composerJson);
+
+        $composer = Factory::create(new NullIO(), $tmpfname);
+
+        $sut = new ComposerPackage($composer);
+
+        $autoload = $sut->getAutoload();
+
+        $this->assertArrayHasKey('psr-4', $autoload);
+
+        $psr4Autoload = $autoload['psr-4'];
+
+        $this->assertArrayHasKey('Monolog\\', $psr4Autoload);
+
+        $monologAutoload = $psr4Autoload['Monolog\\'];
+
+        $this->assertContains('src/', $monologAutoload);
+        $this->assertContains('lib/', $monologAutoload);
+    }
+
     public function testOverrideAutoload()
     {
         $this->markTestIncomplete();

diff --git a/tests/Unit/LicenserTest.php b/tests/Unit/LicenserTest.php
@@ -35,6 +35,7 @@ public function testFindLicenceFilesPathsAreRelative()
 
         $dependency = $this->createStub(ComposerPackage::class);
         $dependency->method('getRelativePath')->willReturn('developer-name/project-name/');
+        $dependency->method('getPackageAbsolutePath')->willReturn(__DIR__.'/vendor/developer-name/project-name/');
         $dependencies[] = $dependency;
 
         $sut = new Licenser($config, $workingDir, $dependencies, 'BrianHenryIE');