From 161d0fb010fa6d8e72bd119a8f66b1328dc81087 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Tue, 28 Mar 2017 11:33:13 +0300 Subject: [PATCH 01/17] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d736272..bd1cfe3 100644 --- a/composer.json +++ b/composer.json @@ -2,13 +2,13 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.1.0", + "version": "1.1.1", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "php": "~5.5.0|~5.6.0|~7.0.0", + "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", "composer/composer": "1.0.0-beta1", "symfony/console": "~2.3, !=2.7.0" }, From fdacba02e1fd222e259cde389037bf072649fadc Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 13 Apr 2017 13:42:47 +0300 Subject: [PATCH 02/17] MAGETWO-52770: Upgrade composer to stable version --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bd1cfe3..45a8b09 100644 --- a/composer.json +++ b/composer.json @@ -2,14 +2,14 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.1.1", + "version": "1.1.2", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", - "composer/composer": "1.0.0-beta1", + "composer/composer": "1.4.1", "symfony/console": "~2.3, !=2.7.0" }, "require-dev": { From bc3e0924b4a7fa24df32e24ce83216d06f25cd83 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 19 Apr 2017 14:59:02 +0300 Subject: [PATCH 03/17] MAGETWO-52770: Upgrade composer to stable version - Update minor version as we updating important dependency which may break someone --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 45a8b09..4d4466c 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.1.2", + "version": "1.2.0", "license": [ "OSL-3.0", "AFL-3.0" From 319ce7963caa2bf09a7558108279354cf7761236 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Wed, 31 Jan 2018 18:08:17 -0500 Subject: [PATCH 04/17] Update PHPUnit and tests and add PHP 7.2 to composer.json * Update PHPUnit to version supported by PHP 7.2 * Fix unit tests for updated PHPUnit version --- composer.json | 4 ++-- .../Composer/ConsoleArrayInputFactoryTest.php | 4 ++-- tests/Composer/InfoCommandTest.php | 4 ++-- .../MagentoComposerApplicationTest.php | 19 ++++--------------- .../RequireUpdateDryRunCommandTest.php | 6 +++--- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 4d4466c..dbee64f 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,12 @@ "AFL-3.0" ], "require": { - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0", + "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0", "composer/composer": "1.4.1", "symfony/console": "~2.3, !=2.7.0" }, "require-dev": { - "phpunit/phpunit": "4.1.0" + "phpunit/phpunit": "~6.2.0" }, "autoload": { "psr-4": { diff --git a/tests/Composer/ConsoleArrayInputFactoryTest.php b/tests/Composer/ConsoleArrayInputFactoryTest.php index 0846b11..5b13e25 100644 --- a/tests/Composer/ConsoleArrayInputFactoryTest.php +++ b/tests/Composer/ConsoleArrayInputFactoryTest.php @@ -6,7 +6,7 @@ use Magento\Composer\ConsoleArrayInputFactory; -class ConsoleArrayInputFactoryTest extends PHPUnit_Framework_TestCase +class ConsoleArrayInputFactoryTest extends \PHPUnit\Framework\TestCase { /** @@ -21,6 +21,6 @@ protected function setUp() public function testCreate() { - $this->assertInstanceOf('\Symfony\Component\Console\Input\ArrayInput', $this->factory->create([])); + $this->assertInstanceOf(Symfony\Component\Console\Input\ArrayInput::class, $this->factory->create([])); } } diff --git a/tests/Composer/InfoCommandTest.php b/tests/Composer/InfoCommandTest.php index 7b42758..e780e95 100644 --- a/tests/Composer/InfoCommandTest.php +++ b/tests/Composer/InfoCommandTest.php @@ -7,7 +7,7 @@ use Magento\Composer\MagentoComposerApplication; use Magento\Composer\InfoCommand; -class InfoCommandTest extends PHPUnit_Framework_TestCase +class InfoCommandTest extends \PHPUnit\Framework\TestCase { private $installedOutput = 'name : 3rdp/a @@ -33,7 +33,7 @@ class InfoCommandTest extends PHPUnit_Framework_TestCase protected function setUp() { - $this->application = $this->getMock('Magento\Composer\MagentoComposerApplication', [], [], '', false, false); + $this->application = $this->createMock(Magento\Composer\MagentoComposerApplication::class); $this->infoCommand = new InfoCommand($this->application); } diff --git a/tests/Composer/MagentoComposerApplicationTest.php b/tests/Composer/MagentoComposerApplicationTest.php index abf1814..ee843e0 100644 --- a/tests/Composer/MagentoComposerApplicationTest.php +++ b/tests/Composer/MagentoComposerApplicationTest.php @@ -9,7 +9,7 @@ use Magento\Composer\ConsoleArrayInputFactory; use Symfony\Component\Console\Output\BufferedOutput; -class MagentoComposerApplicationTest extends PHPUnit_Framework_TestCase +class MagentoComposerApplicationTest extends \PHPUnit\Framework\TestCase { /** * @var MagentoComposerApplication @@ -33,20 +33,9 @@ class MagentoComposerApplicationTest extends PHPUnit_Framework_TestCase protected function setUp() { - $this->composerApplication = $this->getMock( - 'Composer\Console\Application', - [ - 'resetComposer', - 'create', - 'run' - ], - [], - '', - false, - false - ); - $this->inputFactory = $this->getMock('Magento\Composer\ConsoleArrayInputFactory', [], [], '', false); - $this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\BufferedOutput', [], [], '', false); + $this->composerApplication = $this->createMock(Composer\Console\Application::class); + $this->inputFactory = $this->createMock(Magento\Composer\ConsoleArrayInputFactory::class); + $this->consoleOutput = $this->createMock(Symfony\Component\Console\Output\BufferedOutput::class); $this->application = new MagentoComposerApplication( 'path1', diff --git a/tests/Composer/RequireUpdateDryRunCommandTest.php b/tests/Composer/RequireUpdateDryRunCommandTest.php index 24d1346..777d3dc 100644 --- a/tests/Composer/RequireUpdateDryRunCommandTest.php +++ b/tests/Composer/RequireUpdateDryRunCommandTest.php @@ -8,7 +8,7 @@ use Magento\Composer\InfoCommand; use Magento\Composer\RequireUpdateDryRunCommand; -class RequireUpdateDryRunCommandTest extends PHPUnit_Framework_TestCase +class RequireUpdateDryRunCommandTest extends \PHPUnit\Framework\TestCase { /** * @var MagentoComposerApplication|\PHPUnit_Framework_MockObject_MockObject @@ -64,8 +64,8 @@ class RequireUpdateDryRunCommandTest extends PHPUnit_Framework_TestCase protected function setUp() { - $this->application = $this->getMock('Magento\Composer\MagentoComposerApplication', [], [], '', false, false); - $this->infoCommand = $this->getMock('Magento\Composer\InfoCommand', [], [], '', false, false); + $this->application = $this->createMock(Magento\Composer\MagentoComposerApplication::class); + $this->infoCommand = $this->createMock(Magento\Composer\InfoCommand::class); $this->requireUpdateDryRunCommand = new RequireUpdateDryRunCommand( $this->application, From 70b9f602187a9f92402488fcee160f902a0b1cf0 Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Thu, 8 Feb 2018 15:38:34 -0500 Subject: [PATCH 05/17] Update dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index dbee64f..85a47e1 100644 --- a/composer.json +++ b/composer.json @@ -2,15 +2,15 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.2.0", + "version": "1.3.0", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0", - "composer/composer": "1.4.1", - "symfony/console": "~2.3, !=2.7.0" + "composer/composer": "~1.6.0", + "symfony/console": "~4.0.0" }, "require-dev": { "phpunit/phpunit": "~6.2.0" From 49c6fa078eb97f5d09177bf55ca6c10d15bcf974 Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Thu, 22 Feb 2018 16:25:50 -0600 Subject: [PATCH 06/17] Update dependencies - added leading slashes --- tests/Composer/ConsoleArrayInputFactoryTest.php | 2 +- tests/Composer/InfoCommandTest.php | 2 +- tests/Composer/MagentoComposerApplicationTest.php | 6 +++--- tests/Composer/RequireUpdateDryRunCommandTest.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/Composer/ConsoleArrayInputFactoryTest.php b/tests/Composer/ConsoleArrayInputFactoryTest.php index 5b13e25..4149840 100644 --- a/tests/Composer/ConsoleArrayInputFactoryTest.php +++ b/tests/Composer/ConsoleArrayInputFactoryTest.php @@ -21,6 +21,6 @@ protected function setUp() public function testCreate() { - $this->assertInstanceOf(Symfony\Component\Console\Input\ArrayInput::class, $this->factory->create([])); + $this->assertInstanceOf(\Symfony\Component\Console\Input\ArrayInput::class, $this->factory->create([])); } } diff --git a/tests/Composer/InfoCommandTest.php b/tests/Composer/InfoCommandTest.php index e780e95..4cdde15 100644 --- a/tests/Composer/InfoCommandTest.php +++ b/tests/Composer/InfoCommandTest.php @@ -33,7 +33,7 @@ class InfoCommandTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->application = $this->createMock(Magento\Composer\MagentoComposerApplication::class); + $this->application = $this->createMock(\Magento\Composer\MagentoComposerApplication::class); $this->infoCommand = new InfoCommand($this->application); } diff --git a/tests/Composer/MagentoComposerApplicationTest.php b/tests/Composer/MagentoComposerApplicationTest.php index ee843e0..01e0e24 100644 --- a/tests/Composer/MagentoComposerApplicationTest.php +++ b/tests/Composer/MagentoComposerApplicationTest.php @@ -33,9 +33,9 @@ class MagentoComposerApplicationTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->composerApplication = $this->createMock(Composer\Console\Application::class); - $this->inputFactory = $this->createMock(Magento\Composer\ConsoleArrayInputFactory::class); - $this->consoleOutput = $this->createMock(Symfony\Component\Console\Output\BufferedOutput::class); + $this->composerApplication = $this->createMock(\Composer\Console\Application::class); + $this->inputFactory = $this->createMock(\Magento\Composer\ConsoleArrayInputFactory::class); + $this->consoleOutput = $this->createMock(\Symfony\Component\Console\Output\BufferedOutput::class); $this->application = new MagentoComposerApplication( 'path1', diff --git a/tests/Composer/RequireUpdateDryRunCommandTest.php b/tests/Composer/RequireUpdateDryRunCommandTest.php index 777d3dc..0410900 100644 --- a/tests/Composer/RequireUpdateDryRunCommandTest.php +++ b/tests/Composer/RequireUpdateDryRunCommandTest.php @@ -64,8 +64,8 @@ class RequireUpdateDryRunCommandTest extends \PHPUnit\Framework\TestCase protected function setUp() { - $this->application = $this->createMock(Magento\Composer\MagentoComposerApplication::class); - $this->infoCommand = $this->createMock(Magento\Composer\InfoCommand::class); + $this->application = $this->createMock(\Magento\Composer\MagentoComposerApplication::class); + $this->infoCommand = $this->createMock(\Magento\Composer\InfoCommand::class); $this->requireUpdateDryRunCommand = new RequireUpdateDryRunCommand( $this->application, From 51ab875259be690df68037780163c088b3ebd18f Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Fri, 23 Feb 2018 09:47:10 -0600 Subject: [PATCH 07/17] Update dependencies - removed old versions of PHP - updated PHPUnit to the latest version --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 85a47e1..6820022 100644 --- a/composer.json +++ b/composer.json @@ -8,12 +8,12 @@ "AFL-3.0" ], "require": { - "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0", + "php": "~7.1.3|~7.2.0", "composer/composer": "~1.6.0", "symfony/console": "~4.0.0" }, "require-dev": { - "phpunit/phpunit": "~6.2.0" + "phpunit/phpunit": "~7.0.0" }, "autoload": { "psr-4": { From 431518c8020b4f08b7f6be1e59d84abfb803375d Mon Sep 17 00:00:00 2001 From: Daniel Renaud Date: Fri, 23 Mar 2018 15:16:26 -0500 Subject: [PATCH 08/17] MAGETWO-89569: Update composer/composer dependency --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6820022..b54247e 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": "~7.1.3|~7.2.0", - "composer/composer": "~1.6.0", + "composer/composer": "^1.6", "symfony/console": "~4.0.0" }, "require-dev": { From 7fadf1404ea221d8935003e75ad490b31f28bf34 Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Thu, 28 Jun 2018 16:28:52 -0500 Subject: [PATCH 09/17] MC-2338: 3rd party library/dependency upgrade for 2.3 pre Alpha --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b54247e..b92f728 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "~7.1.3|~7.2.0", "composer/composer": "^1.6", - "symfony/console": "~4.0.0" + "symfony/console": "~4.0.0 || ~4.1.0" }, "require-dev": { "phpunit/phpunit": "~7.0.0" From 9b11533078443152f715e0aa4559335af0604b39 Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Fri, 29 Jun 2018 13:25:03 -0500 Subject: [PATCH 10/17] MC-2338: 3rd party library/dependency upgrade for 2.3 pre Alpha --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b92f728..b089270 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.3.0", + "version": "1.4.0", "license": [ "OSL-3.0", "AFL-3.0" From 547ef22033c6288dd33f744f41c84b9b7454fbfc Mon Sep 17 00:00:00 2001 From: Patrick McLain Date: Fri, 28 Dec 2018 12:41:10 -0500 Subject: [PATCH 11/17] Add php7.3 to composer.json Tested on: pmclain@756739b02c38:/var/www/html# php -v PHP 7.3.0 (cli) (built: Dec 10 2018 13:50:58) ( NTS ) Copyright (c) 1997-2018 The PHP Group Zend Engine v3.3.0-dev, Copyright (c) 1998-2018 Zend Technologies with the ionCube PHP Loader (enabled) + Intrusion Protection from ioncube24.com (unconfigured) v10.3.1, Copyright (c) 2002-2018, by ionCube Ltd. with Xdebug v2.7.0beta1, Copyright (c) 2002-2018, by Derick Rethans pmclain@756739b02c38:/var/www/html# vendor/bin/phpunit PHPUnit 7.0.3 by Sebastian Bergmann and contributors. ........ 8 / 8 (100%) Time: 331 ms, Memory: 6.00MB OK (8 tests, 18 assertions) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b089270..1e0be1e 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~7.1.3|~7.2.0", + "php": "~7.1.3||~7.2.0||~7.3.0", "composer/composer": "^1.6", "symfony/console": "~4.0.0 || ~4.1.0" }, From 78dc100a49dea034ea7ccd3a8dff9ed9a74570e9 Mon Sep 17 00:00:00 2001 From: Peter Dohogne Date: Mon, 29 Jul 2019 14:01:34 -0500 Subject: [PATCH 12/17] COMOPS-223: Updating the version number to release PHP 7.3 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e0be1e..7cdc6f2 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.4.0", + "version": "1.5.0", "license": [ "OSL-3.0", "AFL-3.0" From 1b1f56e7df4083e58c8117fd3ca898a9181e5694 Mon Sep 17 00:00:00 2001 From: Max Lesechko Date: Mon, 6 Jan 2020 15:33:48 -0600 Subject: [PATCH 13/17] MC-29549: Update Symfony components to 4.4LTS for 2.3.x --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7cdc6f2..b2ee20f 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.5.0", + "version": "1.5.1", "license": [ "OSL-3.0", "AFL-3.0" @@ -10,7 +10,7 @@ "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "composer/composer": "^1.6", - "symfony/console": "~4.0.0 || ~4.1.0" + "symfony/console": "~4.0.0||~4.1.0||~4.2.0||~4.3.0||~4.4.0" }, "require-dev": { "phpunit/phpunit": "~7.0.0" From fe738ac9155f550b669b260b3cfa6422eacb53fa Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 17 Jan 2020 10:43:51 -0600 Subject: [PATCH 14/17] MC-14917: Update Symfony components to 4.4LTS for 2.4.x --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b2ee20f..318c0f2 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,6 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", - "version": "1.5.1", "license": [ "OSL-3.0", "AFL-3.0" @@ -10,7 +9,7 @@ "require": { "php": "~7.1.3||~7.2.0||~7.3.0", "composer/composer": "^1.6", - "symfony/console": "~4.0.0||~4.1.0||~4.2.0||~4.3.0||~4.4.0" + "symfony/console": "~4.4.0" }, "require-dev": { "phpunit/phpunit": "~7.0.0" From a5d8cbbb40633d0682758bc8eba7f1a22590ad6f Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Fri, 3 Apr 2020 16:11:51 -0500 Subject: [PATCH 15/17] MC-33066: Add PHP 7.4 to composer.json files - Add PHP 7.4 - Update dependencies and tests --- composer.json | 6 +++--- tests/Composer/ConsoleArrayInputFactoryTest.php | 2 +- tests/Composer/InfoCommandTest.php | 2 +- tests/Composer/MagentoComposerApplicationTest.php | 8 +++----- tests/Composer/RequireUpdateDryRunCommandTest.php | 7 ++----- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 318c0f2..183ba7e 100644 --- a/composer.json +++ b/composer.json @@ -7,12 +7,12 @@ "AFL-3.0" ], "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", - "composer/composer": "^1.6", + "php": "~7.1.3||~7.2.0||~7.3.0||~7.4.0", + "composer/composer": "^1.9", "symfony/console": "~4.4.0" }, "require-dev": { - "phpunit/phpunit": "~7.0.0" + "phpunit/phpunit": "^9" }, "autoload": { "psr-4": { diff --git a/tests/Composer/ConsoleArrayInputFactoryTest.php b/tests/Composer/ConsoleArrayInputFactoryTest.php index 4149840..ac526c9 100644 --- a/tests/Composer/ConsoleArrayInputFactoryTest.php +++ b/tests/Composer/ConsoleArrayInputFactoryTest.php @@ -14,7 +14,7 @@ class ConsoleArrayInputFactoryTest extends \PHPUnit\Framework\TestCase */ protected $factory; - protected function setUp() + protected function setUp(): void { $this->factory = new ConsoleArrayInputFactory(); } diff --git a/tests/Composer/InfoCommandTest.php b/tests/Composer/InfoCommandTest.php index 4cdde15..63dbb92 100644 --- a/tests/Composer/InfoCommandTest.php +++ b/tests/Composer/InfoCommandTest.php @@ -31,7 +31,7 @@ class InfoCommandTest extends \PHPUnit\Framework\TestCase */ protected $infoCommand; - protected function setUp() + protected function setUp(): void { $this->application = $this->createMock(\Magento\Composer\MagentoComposerApplication::class); diff --git a/tests/Composer/MagentoComposerApplicationTest.php b/tests/Composer/MagentoComposerApplicationTest.php index 01e0e24..75619c5 100644 --- a/tests/Composer/MagentoComposerApplicationTest.php +++ b/tests/Composer/MagentoComposerApplicationTest.php @@ -31,7 +31,7 @@ class MagentoComposerApplicationTest extends \PHPUnit\Framework\TestCase */ protected $consoleOutput; - protected function setUp() + protected function setUp(): void { $this->composerApplication = $this->createMock(\Composer\Console\Application::class); $this->inputFactory = $this->createMock(\Magento\Composer\ConsoleArrayInputFactory::class); @@ -46,13 +46,11 @@ protected function setUp() ); } - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage Command "update" failed - */ function testWrongExitCode() { $this->composerApplication->expects($this->once())->method('run')->willReturn(1); + $this->expectException(\RuntimeException::class); + $this->expectExceptionMessage('Command "update" failed'); $this->application->runComposerCommand(['command'=>'update']); } diff --git a/tests/Composer/RequireUpdateDryRunCommandTest.php b/tests/Composer/RequireUpdateDryRunCommandTest.php index 0410900..1c97213 100644 --- a/tests/Composer/RequireUpdateDryRunCommandTest.php +++ b/tests/Composer/RequireUpdateDryRunCommandTest.php @@ -62,7 +62,7 @@ class RequireUpdateDryRunCommandTest extends \PHPUnit\Framework\TestCase ] ]; - protected function setUp() + protected function setUp(): void { $this->application = $this->createMock(\Magento\Composer\MagentoComposerApplication::class); $this->infoCommand = $this->createMock(\Magento\Composer\InfoCommand::class); @@ -79,15 +79,12 @@ public function testRun() $this->requireUpdateDryRunCommand->run([], ''); } - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage - */ public function testRunException() { $this->application->expects($this->at(1)) ->method('runComposerCommand') ->willThrowException(new \RuntimeException($this->errorMessage)); + $this->expectException(\RuntimeException::class); $this->infoCommand->expects($this->once())->method('run')->willReturn($this->packageInfo); $this->requireUpdateDryRunCommand->run(['3rdp/e 1.2.0'], ''); } From e0e05e54e728b7e64b6c3756d34ff9fe9ca1d5fe Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Wed, 8 Apr 2020 13:34:14 -0500 Subject: [PATCH 16/17] MC-31797: Remove compatibility with PHP 7.1 and 7.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 183ba7e..ce0ba9e 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "AFL-3.0" ], "require": { - "php": "~7.1.3||~7.2.0||~7.3.0||~7.4.0", + "php": "~7.3.0||~7.4.0", "composer/composer": "^1.9", "symfony/console": "~4.4.0" }, From fcc66f535d631788f2ba160ff547357086d9b2c9 Mon Sep 17 00:00:00 2001 From: Peter Dohogne Date: Mon, 15 Jun 2020 12:52:31 -0500 Subject: [PATCH 17/17] Release 1.6.0 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index ce0ba9e..84df861 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,7 @@ "name": "magento/composer", "description": "Magento composer library helps to instantiate Composer application and run composer commands.", "type": "library", + "version": "1.6.0", "license": [ "OSL-3.0", "AFL-3.0"