Merge pull request #206 from tstarling/v2-namespace

Work around Composer multi-version loading hack using a "V2" namespace
wikimedia · Feb 24, 2021 · 8ca2ed8 · 8ca2ed8
2 parents a674d4b + 04bd9e5
commit 8ca2ed8
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
     },
     "autoload": {
         "psr-4": {
-            "Wikimedia\\Composer\\": "src/"
+            "Wikimedia\\Composer\\Merge\\V2\\": "src/"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev"
+             "dev-master": "2.x-dev"
         },
-        "class": "Wikimedia\\Composer\\MergePlugin"
+        "class": "Wikimedia\\Composer\\Merge\\V2\\MergePlugin"
     },
     "config": {
         "optimize-autoloader": true,

diff --git a/src/Merge/ExtraPackage.php → src/ExtraPackage.php b/src/Merge/ExtraPackage.php → src/ExtraPackage.php
@@ -8,9 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
-
-use Wikimedia\Composer\Logger;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use Composer\Json\JsonFile;
@@ -22,8 +20,6 @@
 use Composer\Package\RootPackage;
 use Composer\Package\RootPackageInterface;
 use Composer\Package\Version\VersionParser;
-use Composer\Plugin\PluginInterface;
-use Composer\Semver\Constraint\MultiConstraint as SemverMultiConstraint;
 use Composer\Semver\Intervals;
 use UnexpectedValueException;
 
@@ -346,9 +342,9 @@ protected function mergeConstraints(Link $origin, Link $merge, PluginState $stat
         $newPrettyString = $merge->getConstraint()->getPrettyString();
 
         if ($state->isComposer1()) {
-            $constraintClass = 'Wikimedia\\Composer\\Merge\\MultiConstraint';
+            $constraintClass = MultiConstraint::class;
         } else {
-            $constraintClass = 'Composer\\Semver\\Constraint\\MultiConstraint';
+            $constraintClass = \Composer\Semver\Constraint\MultiConstraint::class;
 
             if (Intervals::isSubsetOf($origin->getConstraint(), $merge->getConstraint())) {
                 return $origin;

diff --git a/src/Logger.php b/src/Logger.php
@@ -8,7 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\IO\IOInterface;
 

diff --git a/src/MergePlugin.php b/src/MergePlugin.php
@@ -8,11 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer;
-
-use Wikimedia\Composer\Merge\ExtraPackage;
-use Wikimedia\Composer\Merge\MissingFileException;
-use Wikimedia\Composer\Merge\PluginState;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use Composer\DependencyResolver\Operation\InstallOperation;

diff --git a/src/Merge/MissingFileException.php → src/MissingFileException.php b/src/Merge/MissingFileException.php → src/MissingFileException.php
@@ -8,7 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 /**
  * @author Bryan Davis <bd808@bd808.com>

diff --git a/src/Merge/MultiConstraint.php → src/MultiConstraint.php b/src/Merge/MultiConstraint.php → src/MultiConstraint.php
@@ -9,7 +9,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Semver\Constraint\EmptyConstraint;
 use Composer\Semver\Constraint\MultiConstraint as SemverMultiConstraint;

diff --git a/src/Merge/NestedArray.php → src/NestedArray.php b/src/Merge/NestedArray.php → src/NestedArray.php
@@ -8,7 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 /**
  * Adapted from

diff --git a/src/Merge/PluginState.php → src/PluginState.php b/src/Merge/PluginState.php → src/PluginState.php
@@ -8,7 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use Composer\Plugin\PluginInterface;

diff --git a/src/Merge/StabilityFlags.php → src/StabilityFlags.php b/src/Merge/StabilityFlags.php → src/StabilityFlags.php
@@ -8,7 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Package\BasePackage;
 use Composer\Package\Version\VersionParser;

diff --git a/tests/phpunit/LoggerTest.php b/tests/phpunit/LoggerTest.php
@@ -8,14 +8,13 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer;
+namespace Wikimedia\Composer\Merge\V2;
 
-use Composer\IO\IOInterface;
 use Prophecy\Argument;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Wikimedia\Composer\Logger
+ * @covers \Wikimedia\Composer\Merge\V2\Logger
  */
 class LoggerTest extends TestCase
 {

diff --git a/tests/phpunit/MergePluginTest.php b/tests/phpunit/MergePluginTest.php
@@ -8,10 +8,7 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer;
-
-use Wikimedia\Composer\Merge\ExtraPackage;
-use Wikimedia\Composer\Merge\PluginState;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use Composer\DependencyResolver\Operation\InstallOperation;
@@ -32,12 +29,12 @@
 use ReflectionProperty;
 
 /**
- * @covers Wikimedia\Composer\Logger
- * @covers Wikimedia\Composer\Merge\ExtraPackage
- * @covers Wikimedia\Composer\Merge\NestedArray
- * @covers Wikimedia\Composer\Merge\PluginState
- * @covers Wikimedia\Composer\Merge\StabilityFlags
- * @covers Wikimedia\Composer\MergePlugin
+ * @covers \Wikimedia\Composer\Merge\V2\Logger
+ * @covers \Wikimedia\Composer\Merge\V2\ExtraPackage
+ * @covers \Wikimedia\Composer\Merge\V2\NestedArray
+ * @covers \Wikimedia\Composer\Merge\V2\PluginState
+ * @covers \Wikimedia\Composer\Merge\V2\StabilityFlags
+ * @covers \Wikimedia\Composer\Merge\V2\MergePlugin
  */
 class MergePluginTest extends TestCase
 {
@@ -1313,7 +1310,7 @@ function ($args) use ($that) {
     public function testMissingRequireThrowsException()
     {
         $dir = $this->fixtureDir(__FUNCTION__);
-        $this->expectException(\Wikimedia\Composer\Merge\MissingFileException::class);
+        $this->expectException(MissingFileException::class);
         $root = $this->rootFromJson("{$dir}/composer.json");
         $root->getRequires()->shouldNotBeCalled();
         $root->getDevRequires()->shouldNotBeCalled();

diff --git a/tests/phpunit/Merge/NestedArrayTest.php → tests/phpunit/NestedArrayTest.php b/tests/phpunit/Merge/NestedArrayTest.php → tests/phpunit/NestedArrayTest.php
@@ -8,13 +8,13 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass Wikimedia\Composer\Merge\NestedArray
+ * @coversDefaultClass \Wikimedia\Composer\Merge\V2\NestedArray
  */
 class NestedArrayTest extends TestCase
 {

diff --git a/tests/phpunit/Merge/PluginStateTest.php → tests/phpunit/PluginStateTest.php b/tests/phpunit/Merge/PluginStateTest.php → tests/phpunit/PluginStateTest.php
@@ -8,13 +8,13 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Composer;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Wikimedia\Composer\Merge\PluginState
+ * @covers \Wikimedia\Composer\Merge\V2\PluginState
  */
 class PluginStateTest extends TestCase
 {

diff --git a/tests/phpunit/Merge/StabilityFlagsTest.php → tests/phpunit/StabilityFlagsTest.php b/tests/phpunit/Merge/StabilityFlagsTest.php → tests/phpunit/StabilityFlagsTest.php
@@ -8,13 +8,13 @@
  * license. See the LICENSE file for details.
  */
 
-namespace Wikimedia\Composer\Merge;
+namespace Wikimedia\Composer\Merge\V2;
 
 use Composer\Package\BasePackage;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Wikimedia\Composer\Merge\StabilityFlags
+ * @covers \Wikimedia\Composer\Merge\V2\StabilityFlags
  */
 class StabilityFlagsTest extends TestCase
 {