Fix coenjacobs#32 Unintended discarding of default config when sibling config set

Author: BrianHenryIE

src/Composer/Extra/StraussConfig.php

@@ -69,10 +69,9 @@ class StraussConfig
     protected array $excludeFromCopy = array();
 
     /**
-     * @var array{packages?: string[], namespaces?: string[], filePatterns?: string[]}
+     * @var array{packages: string[], namespaces: string[], filePatterns: string[]}
      */
-    protected array $excludeFromPrefix = array('file_patterns'=>array('/^psr.*$/'));
-
+    protected array $excludeFromPrefix = array('file_patterns'=>array('/^psr.*$/'),'namespaces'=>array(),'packages'=>array());
 
     /**
      * An array of autoload keys to replace packages' existing autoload key.
@@ -140,6 +139,8 @@ public function __construct(Composer $composer)
             $rename->addMapping(StraussConfig::class, 'exclude_packages', 'excludePackages');
             $rename->addMapping(StraussConfig::class, 'delete_vendor_directories', 'deleteVendorFiles');
 
+            $rename->addMapping(StraussConfig::class, 'exclude_prefix_packages', 'excludePackagesFromPrefixing');
+
             $mapper->unshift($rename);
             $mapper->push(new \JsonMapper\Middleware\CaseConversion(
                 \JsonMapper\Enums\TextNotation::UNDERSCORE(),
@@ -342,7 +343,15 @@ public function getExcludeFilePatternsFromCopy(): array
 
     public function setExcludeFromPrefix(array $excludeFromPrefix): void
     {
-        $this->excludeFromPrefix = $excludeFromPrefix;
+        if (isset($excludeFromPrefix['packages'])) {
+            $this->excludeFromPrefix['packages'] = $excludeFromPrefix['packages'];
+        }
+        if (isset($excludeFromPrefix['namespaces'])) {
+            $this->excludeFromPrefix['namespaces'] = $excludeFromPrefix['namespaces'];
+        }
+        if (isset($excludeFromPrefix['file_patterns'])) {
+            $this->excludeFromPrefix['file_patterns'] = $excludeFromPrefix['file_patterns'];
+        }
     }
 
     /**
@@ -355,6 +364,11 @@ public function getExcludePackagesFromPrefixing(): array
         return $this->excludeFromPrefix['packages'] ?? array();
     }
 
+    public function setExcludePackagesFromPrefixing(array $excludePackagesFromPrefixing): void
+    {
+        $this->excludeFromPrefix['packages'] = $excludePackagesFromPrefixing;
+    }
+
     public function getExcludeNamespacesFromPrefixing(): array
     {
         return $this->excludeFromPrefix['namespaces'] ?? array();

tests/Unit/Composer/Extra/StraussConfigTest.php

@@ -396,6 +396,114 @@ public function testGetPackagesFromConfig()
         $this->assertContains('pimple/pimple', $sut->getPackages());
     }
 
+
+    public function testGetOldSyntaxExcludePackagesFromPrefixing()
+    {
+        $this->markTestSkipped('Currently needs a reflectable property in the target object');
+
+        $composerExtraStraussJson = <<<'EOD'
+{
+  "name": "brianhenryie/strauss-config-test",
+  "extra": {
+    "strauss": {
+      "exclude_prefix_packages": [
+        "psr/container"
+      ]
+    }
+  }
+}
+
+EOD;
+        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
+        file_put_contents($tmpfname, $composerExtraStraussJson);
+
+        $composer = Factory::create(new NullIO(), $tmpfname);
+
+        $sut = new StraussConfig($composer);
+
+        $this->assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
+    }
+
+
+    public function testGetExcludePackagesFromPrefixing()
+    {
+
+        $composerExtraStraussJson = <<<'EOD'
+{
+  "name": "brianhenryie/strauss-config-test",
+  "extra": {
+    "strauss": {
+        "exclude_from_prefix": {
+            "packages": [
+                "psr/container"
+            ]
+        }
+    }
+  }
+}
+
+EOD;
+        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
+        file_put_contents($tmpfname, $composerExtraStraussJson);
+
+        $composer = Factory::create(new NullIO(), $tmpfname);
+
+        $sut = new StraussConfig($composer);
+
+        $this->assertContains('psr/container', $sut->getExcludePackagesFromPrefixing());
+    }
+
+
+    public function testGetExcludeFilePatternsFromPrefixingDefault()
+    {
+
+        $composerExtraStraussJson = <<<'EOD'
+{
+  "name": "brianhenryie/strauss-config-test"
+}
+
+EOD;
+        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
+        file_put_contents($tmpfname, $composerExtraStraussJson);
+
+        $composer = Factory::create(new NullIO(), $tmpfname);
+
+        $sut = new StraussConfig($composer);
+
+        $this->assertContains('/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing());
+    }
+
+    /**
+     * When excluding a package, the default file pattern exclusion was being forgotten.
+     *
+     * @see https://github.com/BrianHenryIE/strauss/issues/32
+     */
+    public function testGetExcludeFilePatternsFromPrefixingDefaultAfterExcludingPackages()
+    {
+
+        $composerExtraStraussJson = <<<'EOD'
+{
+  "name": "brianhenryie/strauss-config-test",
+    "extra": {
+    "strauss": {
+        "exclude_from_prefix": {
+            "packages": ["yahnis-elsts/plugin-update-checker","erusev/parsedown"]
+        }
+    }
+  }
+}
+
+EOD;
+        $tmpfname = tempnam(sys_get_temp_dir(), 'strauss-test-');
+        file_put_contents($tmpfname, $composerExtraStraussJson);
+
+        $composer = Factory::create(new NullIO(), $tmpfname);
+
+        $sut = new StraussConfig($composer);
+
+        $this->assertContains('/^psr.*$/', $sut->getExcludeFilePatternsFromPrefixing());
+    }
+
     /**
      * When Strauss config has no packages specified, use composer.json's require list.
      */