Merge pull request #25 from magento-trigger/MC-33066

PHP 7.4 Support

Author: fascinosum

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.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": {

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();
     }

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);
 

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']);
     }

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'], '');
     }