Merge pull request #30 from magento-commerce/develop

develop to 1.10.x sync

.github/workflows/php.yml

@@ -17,6 +17,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"

composer.json

@@ -2,18 +2,18 @@
   "name": "magento/composer",
   "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
   "type": "library",
-  "version": "1.10.0",
+  "version": "1.10.1-beta1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0",
-    "composer/composer": "^2.0",
+    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0||~8.4.0",
+    "composer/composer": "^2.1.13",
     "symfony/console": "~4.4.0||~5.4.0||~6.4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9"
+    "phpunit/phpunit": "^9.5.10 || ^10"
   },
   "autoload": {
     "psr-4": {

phpunit.xml.dist

@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
-        >
+         bootstrap="vendor/autoload.php">
     <php>
-        <ini name="error_reporting" value="-1" />
+        <ini name="error_reporting" value="-1"/>
     </php>
-
     <testsuites>
         <testsuite name="Magento Composer Library Test">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <source>
+        <include>
             <directory>./</directory>
-            <exclude>
-                <directory>./tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>./tests</directory>
+        </exclude>
+    </source>
 </phpunit>

src/MagentoComposerApplication.php

@@ -65,9 +65,9 @@ class MagentoComposerApplication
     public function __construct(
         $pathToComposerHome,
         $pathToComposerJson,
-        Application $consoleApplication = null,
-        ConsoleArrayInputFactory $consoleArrayInputFactory = null,
-        BufferedOutput $consoleOutput = null
+        ?Application $consoleApplication = null,
+        ?ConsoleArrayInputFactory $consoleArrayInputFactory = null,
+        ?BufferedOutput $consoleOutput = null
     ) {
         $this->consoleApplication = $consoleApplication ? $consoleApplication : new Application();
         $this->consoleArrayInputFactory = $consoleArrayInputFactory ? $consoleArrayInputFactory

tests/Composer/InfoCommandTest.php

@@ -74,7 +74,7 @@ public function testRunInstalled()
      *
      * @return array
      */
-    public function getCommandOutputDataProvider()
+    public static function getCommandOutputDataProvider()
     {
         return [
             'Package not installed' => [

tests/Composer/MagentoComposerApplicationTest.php

@@ -34,7 +34,8 @@ class MagentoComposerApplicationTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        $this->composerApplication = $this->createMock(\Composer\Console\Application::class);
+        $this->composerApplication = $this->getMockBuilder('Composer\Console\Application')
+            ->getMock();
         $this->inputFactory = $this->createMock(\Magento\Composer\ConsoleArrayInputFactory::class);
         $this->consoleOutput = $this->createMock(\Symfony\Component\Console\Output\BufferedOutput::class);