Fix Merge plugin usage (#14)

theofidry · Oct 11, 2021 · 7a6d71c · 7a6d71c
1 parent 4bd31c5
commit 7a6d71c
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -30,9 +30,12 @@ test: vendor fixtures/vendor fixtures/vendor-bin/sub/vendor
 
 vendor:
 	composer update
+	touch $@
 
 fixtures/vendor:
 	composer update --working-dir fixtures --no-interaction ${COMPOSER_FLAGS}
+	touch $@
 
 fixtures/vendor-bin/sub/vendor:
 	composer update --working-dir fixtures/vendor-bin/sub --no-interaction ${COMPOSER_FLAGS}
+	touch $@
diff --git a/fixtures/vendor-bin/sub/composer.lock b/fixtures/vendor-bin/sub/composer.lock
diff --git a/src/InheritancePlugin.php b/src/InheritancePlugin.php
@@ -15,8 +15,8 @@
 use Composer\IO\IOInterface;
 use Composer\Package\Package;
 use Fidry\Composer\InheritancePlugin\Merge\PluginState;
-use Wikimedia\Composer\Logger;
-use Wikimedia\Composer\MergePlugin as WikimediaMergePlugin;
+use Wikimedia\Composer\Merge\V2\Logger;
+use Wikimedia\Composer\Merge\V2\MergePlugin as WikimediaMergePlugin;
 
 /**
  * @author Théo FIDRY <theo.fidry@gmail.com>

diff --git a/src/Merge/ExtraPackage.php b/src/Merge/ExtraPackage.php
@@ -12,7 +12,7 @@
 namespace Fidry\Composer\InheritancePlugin\Merge;
 
 use Fidry\Composer\InheritancePlugin\InheritancePlugin;
-use Wikimedia\Composer\Merge\ExtraPackage as WikimediaExtraPackage;
+use Wikimedia\Composer\Merge\V2\ExtraPackage as WikimediaExtraPackage;
 
 /**
  * @author Théo FIDRY <theo.fidry@gmail.com>

diff --git a/src/Merge/PluginState.php b/src/Merge/PluginState.php
@@ -11,7 +11,7 @@
 
 namespace Fidry\Composer\InheritancePlugin\Merge;
 
-use Wikimedia\Composer\Merge\PluginState as WikimediaPluginState;
+use Wikimedia\Composer\Merge\V2\PluginState as WikimediaPluginState;
 
 /**
  * @author Théo FIDRY <theo.fidry@gmail.com>