Merge branch '0.1.1' into develop

magento · Feb 13, 2020 · d720d4c · d720d4c
2 parents ae43e75 + 06087ac
commit d720d4c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -6,8 +6,8 @@
     "AFL-3.0"
   ],
   "require": {
-    "composer-plugin-api": "^1.0",
-    "composer/composer": "<=1.8.0"
+    "composer/composer": "<=1.9.3",
+    "composer-plugin-api": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.5.0"

diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/MageRootRequireCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/MageRootRequireCommand.php
@@ -117,6 +117,7 @@ protected function configure()
             );
 
         $mageHelp = '
+
 <comment>Magento Root Updates:</comment>
   With <info>' . PluginDefinition::PACKAGE_NAME . "</info> installed, <info>$origName</info> will also check for and
   execute any changes to the root composer.json file that exist between the Magento

diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -2,14 +2,14 @@
   "name": "magento/composer-root-update-plugin",
   "type": "composer-plugin",
   "description": "Plugin to look ahead for Magento project root changes when running composer update for new Magento versions",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "composer-plugin-api": "^1.0",
-    "composer/composer": "<=1.8.0"
+    "composer/composer": "<=1.9.3",
+    "composer-plugin-api": "^1.0"
   },
   "suggest": {
     "magento/framework": "Enables the Magento Composer Root Update Plugin's functionality for the Web Setup Wizard"

diff --git a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/DeltaResolverTest.php b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/DeltaResolverTest.php
@@ -469,10 +469,18 @@ public function setUp()
         $this->console = new Console($this->io);
         $this->retriever = $this->createPartialMock(
             RootPackageRetriever::class,
-            ['getOriginalRootPackage', 'getTargetRootPackage', 'getUserRootPackage']
+            [
+                'getOriginalRootPackage',
+                'getOriginalLabel',
+                'getTargetRootPackage',
+                'getTargetLabel',
+                'getUserRootPackage'
+            ]
         );
         $this->retriever->method('getOriginalRootPackage')->willReturn(null);
+        $this->retriever->method('getOriginalLabel')->willReturn('Magento Open Source 1.0.0');
         $this->retriever->method('getTargetRootPackage')->willReturn(null);
+        $this->retriever->method('getTargetLabel')->willReturn('Magento Open Source 2.0.0');
         $this->retriever->method('getUserRootPackage')->willReturn(null);
     }
 }
diff --git a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/MagentoRootUpdaterTest.php b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/MagentoRootUpdaterTest.php
@@ -310,17 +310,21 @@ public function setUp()
             'getOriginalRootPackage',
             'getOriginalEdition',
             'getOriginalVersion',
+            'getOriginalLabel',
             'getTargetRootPackage',
             'getTargetEdition',
             'getTargetVersion',
+            'getTargetLabel',
             'getUserRootPackage'
         ]);
         $retriever->method('getOriginalRootPackage')->willReturn($baseRoot);
         $retriever->method('getOriginalEdition')->willReturn('community');
         $retriever->method('getOriginalVersion')->willReturn('1.0.0.0');
+        $retriever->method('getOriginalLabel')->willReturn('Magento Open Source 1.0.0');
         $retriever->method('getTargetRootPackage')->willReturn($targetRoot);
         $retriever->method('getTargetEdition')->willReturn('community');
         $retriever->method('getTargetVersion')->willReturn('2.0.0.0');
+        $retriever->method('getTargetLabel')->willReturn('Magento Open Source 2.0.0');
         $retriever->method('getUserRootPackage')->willReturn($installRoot);
 
         $this->retriever = $retriever;