From 0ce5f179b859c76234cd6b20bd490ae8dfd8f6ae Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Thu, 13 Jun 2024 17:48:13 +0530
Subject: [PATCH 1/9] AC-9749: PHPUnit 10 update

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ddd1cf3..2071479 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "symfony/console": "~4.4.0||~5.4.0||~6.4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9"
+    "phpunit/phpunit": "^9 || ^10"
   },
   "autoload": {
     "psr-4": {

From 70585bd563b81c023bc3aa964da6f2470e8dc63d Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Fri, 14 Jun 2024 12:59:32 +0530
Subject: [PATCH 2/9] AC-9749: PHPUnit 10 update test fixes

---
 phpunit.xml.dist                   | 24 ++++++++++--------------
 tests/Composer/InfoCommandTest.php |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a6c40a9..dc7c76e 100644
--- a/phpunit.xml.dist
+++ b/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>
diff --git a/tests/Composer/InfoCommandTest.php b/tests/Composer/InfoCommandTest.php
index d5e664c..3cf7999 100644
--- a/tests/Composer/InfoCommandTest.php
+++ b/tests/Composer/InfoCommandTest.php
@@ -74,7 +74,7 @@ public function testRunInstalled()
      *
      * @return array
      */
-    public function getCommandOutputDataProvider()
+    public static function getCommandOutputDataProvider()
     {
         return [
             'Package not installed' => [

From fdcb73de71ce618472df1961e5a748fe11c83c18 Mon Sep 17 00:00:00 2001
From: Nishant Rana <glo04412@adobe.com>
Date: Fri, 14 Jun 2024 18:30:08 +0530
Subject: [PATCH 3/9] AC-9749: PHPUnit 10 fixes

---
 tests/Composer/MagentoComposerApplicationTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Composer/MagentoComposerApplicationTest.php b/tests/Composer/MagentoComposerApplicationTest.php
index 113a1ff..742856c 100644
--- a/tests/Composer/MagentoComposerApplicationTest.php
+++ b/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);
 

From 194febd465e08759c1ef4530e59a269ae414e5d1 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 5 Nov 2024 14:45:02 +0530
Subject: [PATCH 4/9] AC-13307::PHP 8.4 Support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2071479..0f26e42 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0",
+    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0||~8.4.0",
     "composer/composer": "^2.0",
     "symfony/console": "~4.4.0||~5.4.0||~6.4.0"
   },

From ee4bef316e2e6984fd0dc749e058a6d6fa1e721c Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <glo17680@adobe.com>
Date: Fri, 13 Dec 2024 09:15:09 +0530
Subject: [PATCH 5/9] PHP 8.4: deprecation fixes

---
 src/MagentoComposerApplication.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MagentoComposerApplication.php b/src/MagentoComposerApplication.php
index ef9ce98..4e6defc 100644
--- a/src/MagentoComposerApplication.php
+++ b/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

From 65eb41125c41b83d314f870aca73766ffc147c4d Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 17 Dec 2024 12:52:05 +0530
Subject: [PATCH 6/9] Added PHP 8.4 support

---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index a3e48b9..0dbfc87 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -17,6 +17,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"

From 8527ee3fb2e0c75774fb845fd3db52904297a644 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Wed, 18 Dec 2024 22:46:16 +0530
Subject: [PATCH 7/9] PHP 8.4 Automation build is failing with lower dependency

---
 .github/workflows/php.yml | 1 -
 composer.json             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 0dbfc87..57a6ad7 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,7 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
           - "8.1"
           - "8.2"
           - "8.3"
diff --git a/composer.json b/composer.json
index 0f26e42..7f70da2 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0||~8.4.0",
+    "php": "~8.1.0||~8.2.0||~8.3.0||~8.4.0",
     "composer/composer": "^2.0",
     "symfony/console": "~4.4.0||~5.4.0||~6.4.0"
   },

From 8afaf3f4e7f07668b6e044e3e66cdbd7450cf09a Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Fri, 20 Dec 2024 13:31:17 -0600
Subject: [PATCH 8/9] AC-13307: PHP 8.4 Support

---
 .github/workflows/php.yml | 1 +
 composer.json             | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 57a6ad7..0dbfc87 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -13,6 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "7.4"
           - "8.1"
           - "8.2"
           - "8.3"
diff --git a/composer.json b/composer.json
index 7f70da2..c8c3fa0 100644
--- a/composer.json
+++ b/composer.json
@@ -8,12 +8,12 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~8.1.0||~8.2.0||~8.3.0||~8.4.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 || ^10"
+    "phpunit/phpunit": "^9.5.10 || ^10"
   },
   "autoload": {
     "psr-4": {

From 55a792d3fb42e99d76cc4e167e2f34f0a347a6f4 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Tue, 7 Jan 2025 22:23:56 +0530
Subject: [PATCH 9/9] Updated the composer version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c8c3fa0..7964507 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.10.0-beta1",
+  "version": "1.10.1-beta1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"