From 5c4a48a02be278d2e5d93ee6c478f5830c01d51b Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Tue, 23 Aug 2022 14:19:14 +0530
Subject: [PATCH 01/17] AC-2841:PHP 7.4 compatibility removal from the codebase

---
 composer.json                                      | 2 +-
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 697157e..a2c0cde 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0",
+    "php": "~8.1.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },
diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index ba2f94e..d53d058 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0",
+    "php": "~8.1.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },

From 2a3609586bc53643c0ddc394b6e1eafccb57b268 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Thu, 8 Sep 2022 14:39:07 +0530
Subject: [PATCH 02/17] AC-3005::Investigate drop of composer 1.x support

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

diff --git a/composer.json b/composer.json
index 697157e..be61b74 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
   ],
   "require": {
     "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0",
-    "composer/composer": "^1.0 || ^2.0",
+    "composer/composer": "^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },
   "require-dev": {

From 41447a9253c2a2fff13958d42434b5aec392f7b5 Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Mon, 3 Oct 2022 12:43:29 +0530
Subject: [PATCH 03/17] AC-6646::Add PHP 8.2 Compatibility Support

---
 composer.json                                      | 2 +-
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a2c0cde..95ebe40 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~8.1.0",
+    "php": "~8.1.0||~8.2.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },
diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index d53d058..b88d2f4 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~8.1.0",
+    "php": "~8.1.0||~8.2.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },

From 0c8252c55f3c1e2d4ccf31834f21ba944ec8f92c Mon Sep 17 00:00:00 2001
From: Faizan Shaikh <glo88465@adobe.com>
Date: Mon, 14 Nov 2022 15:43:21 +0530
Subject: [PATCH 04/17] AC-2841: Reverted removal of PHP7.4 support

---
 composer.json                                      | 2 +-
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6b0d215..f63ebd6 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~8.1.0||~8.2.0",
+    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
     "composer/composer": "^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },
diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index b88d2f4..354b119 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~8.1.0||~8.2.0",
+    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },

From 533a9d5932b4658e4cabc00d3e5ef87515c54fbe Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Wed, 4 Jan 2023 14:26:11 -0600
Subject: [PATCH 05/17] 2.0.3 version

---
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index 354b119..b3d517f 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/composer-root-update-plugin",
   "type": "composer-plugin",
   "description": "Plugin to look ahead for Magento Open Source or Adobe Commerce project root changes when running composer update for new magento/product or magento/magento-cloud metapackage versions",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

From dcbfe8b121b7767443c33289e0ab0173117771bb Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 23 Jan 2023 15:27:18 -0600
Subject: [PATCH 06/17] Test fixes + compatibility with PHP 8.2

---
 .../Commands/RequireCommerceCommand.php       |  2 ++
 .../Utils/PackageUtils.php                    |  2 +-
 .../_files/expected_no_override.composer.json |  3 +++
 .../_files/expected_override.composer.json    |  3 +++
 .../_files/test.composer.json                 |  3 +++
 .../Updater/RootPackageRetrieverTest.php      | 21 +++++++++++++++----
 .../Updater/RootProjectUpdaterTest.php        | 12 ++++++++++-
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
index 508129a..2c168c1 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
@@ -51,6 +51,8 @@ class RequireCommerceCommand extends ExtendableRequireCommand
      */
     protected $console;
 
+    protected $repos;
+
     /**
      * Use the native RequireCommand config with options/doc additions for the root project composer.json update
      *
diff --git a/src/Magento/ComposerRootUpdatePlugin/Utils/PackageUtils.php b/src/Magento/ComposerRootUpdatePlugin/Utils/PackageUtils.php
index 03f31f4..c0530fe 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Utils/PackageUtils.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Utils/PackageUtils.php
@@ -125,7 +125,7 @@ public function getEditionLabel(string $packageEdition): ?string
     public function findRequire(Composer $composer, string $packageMatcher)
     {
         $requires = array_values($composer->getPackage()->getRequires());
-        if (@preg_match($packageMatcher, null) === false) {
+        if (@preg_match($packageMatcher, '') === false) {
             foreach ($requires as $link) {
                 if ($packageMatcher == $link->getTarget()) {
                     return $link;
diff --git a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_no_override.composer.json b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_no_override.composer.json
index c514c55..8bde6ea 100644
--- a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_no_override.composer.json
+++ b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_no_override.composer.json
@@ -30,6 +30,9 @@
         "vendor1/different-conflicting2": "2.0.0",
         "vendor1/different-conflicting3": "3.0.0"
     },
+    "config": {
+        "allow-plugins": true
+    },
     "extra": {
         "extra-key1": "install1",
         "extra-key2": "target2",
diff --git a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_override.composer.json b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_override.composer.json
index 5ca9e7a..3333647 100644
--- a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_override.composer.json
+++ b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/expected_override.composer.json
@@ -22,6 +22,9 @@
             "Magento\\Sniffs\\": "dev/tests/framework/Magento/Sniffs/"
         }
     },
+    "config": {
+        "allow-plugins": true
+    },
     "conflict": {
         "vendor1/conflicting1": "1.0.0",
         "vendor1/conflicting2": "2.1.0",
diff --git a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/test.composer.json b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/test.composer.json
index e29e39f..210bc53 100644
--- a/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/test.composer.json
+++ b/tests/Integration/Magento/ComposerRootUpdatePlugin/_files/test.composer.json
@@ -37,5 +37,8 @@
     "sample-data": "Suggested Sample Data 1.0.0",
     "vendor/suggested": "Another Suggested Package"
   },
+  "config": {
+    "allow-plugins": true
+  },
   "minimum-stability": "dev"
 }
diff --git a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootPackageRetrieverTest.php b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootPackageRetrieverTest.php
index e9333ed..dc8327b 100644
--- a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootPackageRetrieverTest.php
+++ b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootPackageRetrieverTest.php
@@ -15,7 +15,7 @@
 use Composer\Package\RootPackageInterface;
 use Composer\Plugin\PluginInterface;
 use Composer\Repository\ComposerRepository;
-use Composer\Repository\RepositoryInterface;
+use Composer\Repository\LockArrayRepository;
 use Composer\Repository\RepositoryManager;
 use Composer\Util\RemoteFilesystem;
 use Magento\ComposerRootUpdatePlugin\Utils\Console;
@@ -153,7 +153,7 @@ public function testGetOriginalRootNotOnRepo_NoConfirm()
 
     public function testGetTargetRootFromRepo()
     {
-        $this->repo->expects($this->any())->method('loadPackages')->willReturn(
+        $this->repo->expects($this->atLeast(1))->method('loadPackages')->willReturn(
             [
                 'namesFound' => [$this->originalRoot->getName()],
                 'packages' => [
@@ -210,7 +210,16 @@ protected function setUp(): void
             'isLocked',
             'getLockedRepository'
         ]);
-        $lockedRepo = $this->getMockForAbstractClass(RepositoryInterface::class);
+        $lockedRepo = $this->getMockForAbstractClass(
+            LockArrayRepository::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getPackages'],
+            false
+        );
         $originalProduct = $this->getMockForAbstractClass(PackageInterface::class);
         $originalProduct->method('getName')->willReturn('magento/product-enterprise-edition');
         $originalProduct->method('getVersion')->willReturn('1.1.0.0');
@@ -232,11 +241,15 @@ protected function setUp(): void
         $this->originalRoot->method('getVersion')->willReturn('1.1.0.0');
         $this->originalRoot->method('getStabilityPriority')->willReturn(0);
 
-        $this->targetRoot = $this->createPartialMock(Package::class, ['getName', 'getVersion', 'getStabilityPriority']);
+        $this->targetRoot = $this->createPartialMock(
+            Package::class,
+            ['getName', 'getVersion', 'getStabilityPriority', 'getPrettyVersion']
+        );
         $this->targetRoot->id = 2;
         $this->targetRoot->method('getName')->willReturn('magento/project-enterprise-edition');
         $this->targetRoot->method('getVersion')->willReturn('2.0.0.0');
         $this->targetRoot->method('getStabilityPriority')->willReturn(0);
+        $this->targetRoot->method('getPrettyVersion')->willReturn('');
 
         $repoManager = $this->createPartialMock(RepositoryManager::class, ['getRepositories']);
         if ($apiMajorVersion == '1') {
diff --git a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootProjectUpdaterTest.php b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootProjectUpdaterTest.php
index c878e8c..1edfa2f 100644
--- a/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootProjectUpdaterTest.php
+++ b/tests/Unit/Magento/ComposerRootUpdatePlugin/Updater/RootProjectUpdaterTest.php
@@ -16,6 +16,7 @@
 use Composer\Package\Package;
 use Composer\Package\RootPackage;
 use Composer\Repository\ComposerRepository;
+use Composer\Repository\LockArrayRepository;
 use Composer\Repository\RepositoryInterface;
 use Composer\Repository\RepositoryManager;
 use Composer\Semver\Constraint\Constraint;
@@ -273,7 +274,16 @@ public function setUp(): void
         $repo = $this->createPartialMock(ComposerRepository::class, []);
         $repoManager = $this->createPartialMock(RepositoryManager::class, ['getRepositories']);
         $repoManager->method('getRepositories')->willReturn([$repo]);
-        $lockedRepo = $this->getMockForAbstractClass(RepositoryInterface::class);
+        $lockedRepo = $this->getMockForAbstractClass(
+            LockArrayRepository::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getPackages'],
+            false
+        );
         $lockedRepo->method('getPackages')->willReturn([
             new Package('magento/product-community-edition', '1.0.0.0', '1.0.0')
         ]);

From 5f32fec1ba9a39b5c10d9f81d67538eb06b10aa7 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 23 Jan 2023 15:34:23 -0600
Subject: [PATCH 07/17] Tests configuration

---
  .github / workflows/tests.yml                | 37 +++++++++++++++++++
 .../Commands/RequireCommerceCommand.php       |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644  .github / workflows/tests.yml

diff --git a/ .github / workflows/tests.yml b/ .github / workflows/tests.yml
new file mode 100644
index 0000000..0a9fa5d
--- /dev/null
+++ b/ .github / workflows/tests.yml	
@@ -0,0 +1,37 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Unit Tests
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  pull_request:
+    branches: [ develop ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
+      # Runs a single command using the runners shell
+      - name: Run composer install
+        run: composer install
+
+      # Runs a single command using the runners shell
+      - name: Run unit tests
+        run: php vendor/bin/phpunit tests/Unit
\ No newline at end of file
diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
index 2c168c1..f960f26 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
@@ -51,6 +51,9 @@ class RequireCommerceCommand extends ExtendableRequireCommand
      */
     protected $console;
 
+    /**
+     * @var array
+     */
     protected $repos;
 
     /**

From 4abb6abf342a9e8dd301e72f8ce93eb0ff6c168d Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 23 Jan 2023 15:40:08 -0600
Subject: [PATCH 08/17] Tests configuration

---
  .github / workflows/tests.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ .github / workflows/tests.yml b/ .github / workflows/tests.yml
index 0a9fa5d..624e409 100644
--- a/ .github / workflows/tests.yml	
+++ b/ .github / workflows/tests.yml	
@@ -5,8 +5,11 @@ name: Unit Tests
 # Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
+  push:
   pull_request:
-    branches: [ develop ]
+    types: [opened, reopened,synchronize]
+    branches:
+      - develop
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

From f1e83a7cc534405c380fd10bfd80bcb875babff5 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 23 Jan 2023 15:46:10 -0600
Subject: [PATCH 09/17] Tests configuration

---
 { .github / workflows => .github/workflows}/tests.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename { .github / workflows => .github/workflows}/tests.yml (100%)

diff --git a/ .github / workflows/tests.yml b/.github/workflows/tests.yml
similarity index 100%
rename from  .github / workflows/tests.yml
rename to .github/workflows/tests.yml

From af2cd89f421322777bb82dc7d834c12276b48e0b Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Mon, 23 Jan 2023 15:49:10 -0600
Subject: [PATCH 10/17] Tests configuration

---
 .github/workflows/integration-tests.yml       | 40 +++++++++++++++++++
 .../workflows/{tests.yml => unit-tests.yml}   |  0
 2 files changed, 40 insertions(+)
 create mode 100644 .github/workflows/integration-tests.yml
 rename .github/workflows/{tests.yml => unit-tests.yml} (100%)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
new file mode 100644
index 0000000..5dfe41c
--- /dev/null
+++ b/.github/workflows/integration-tests.yml
@@ -0,0 +1,40 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Integration Tests
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+  pull_request:
+    types: [opened, reopened,synchronize]
+    branches:
+      - develop
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
+      # Runs a single command using the runners shell
+      - name: Run composer install
+        run: composer install
+
+      # Runs a single command using the runners shell
+      - name: Run unit tests
+        run: php vendor/bin/phpunit tests/Integration
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/unit-tests.yml
similarity index 100%
rename from .github/workflows/tests.yml
rename to .github/workflows/unit-tests.yml

From b90ab7a174ffbc20f2558ba701841cf26aa49b60 Mon Sep 17 00:00:00 2001
From: Rajesh Kumar <glo71317@adobe.com>
Date: Wed, 15 Nov 2023 13:40:47 +0530
Subject: [PATCH 11/17] AC-10558::Adobe Commerce 2.4.7 core code is compatible
 with PHP 8.3

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

diff --git a/composer.json b/composer.json
index f63ebd6..bf8600f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
+    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0||~8.3.0",
     "composer/composer": "^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },

From a39d2e8f1ed72a1555f3090f871186b729d05f68 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 9 Feb 2024 14:32:08 +0100
Subject: [PATCH 12/17] Declare return types to be compatible with composer
 2.7+

---
 .../Plugin/Commands/RequireCommerceCommand.php                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
index f960f26..671aa8f 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php
@@ -61,7 +61,7 @@ class RequireCommerceCommand extends ExtendableRequireCommand
      *
      * @return void
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -154,7 +154,7 @@ protected function getFormattedHelp(): string
      *
      * @throws Exception
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->console = new Console($this->getIO(), $input->getOption(self::INTERACTIVE_OPT));
         $console = $this->console;

From 71a5a1a0d80a223ab0648219cc62bbbb691af265 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 9 Feb 2024 14:33:05 +0100
Subject: [PATCH 13/17] Declare return types to be compatible with composer
 2.7+

---
 .../Plugin/Commands/OverrideRequireCommand.php                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
index 2dec9c9..9657936 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
@@ -86,7 +86,7 @@ public function setApplication(Application $application = null)
      *
      * @return void
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -170,7 +170,7 @@ protected function configure()
      *
      * @throws Exception
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->console = new Console($this->getIO(), $input->getOption(self::INTERACTIVE_OPT));
         $this->pkgUtils = new PackageUtils($this->console);

From 307a56ec781716358149b79120052a83593ef6f4 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 14 Feb 2024 20:17:18 +0100
Subject: [PATCH 14/17] Add setApplication return type

---
 .../Plugin/Commands/OverrideRequireCommand.php                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
index 9657936..d1dfbc2 100644
--- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
+++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php
@@ -69,7 +69,7 @@ class OverrideRequireCommand extends ExtendableRequireCommand
      * @param Application|null $application
      * @return void
      */
-    public function setApplication(Application $application = null)
+    public function setApplication(Application $application = null): void
     {
         // For Composer versions below 2.1.6:
         // In order to trick Composer into overriding its native RequireCommand with this class, the name needs to be

From bc98bd8b9798b3a8857c210acbe611f275f9255e Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Wed, 14 Feb 2024 16:34:44 -0600
Subject: [PATCH 15/17] PHP 8.3 support

---
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index b3d517f..498db28 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -8,7 +8,7 @@
     "AFL-3.0"
   ],
   "require": {
-    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0",
+    "php": "~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0||~8.3.0",
     "composer/composer": "^1.0 || ^2.0",
     "composer-plugin-api": "^1.0 || ^2.0"
   },

From 1f1519dda42e7017dcd573655d59285f434652de Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Wed, 14 Feb 2024 16:35:52 -0600
Subject: [PATCH 16/17] Update version to 2.0.4-beta1

---
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index 498db28..618d5b7 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/composer-root-update-plugin",
   "type": "composer-plugin",
   "description": "Plugin to look ahead for Magento Open Source or Adobe Commerce project root changes when running composer update for new magento/product or magento/magento-cloud metapackage versions",
-  "version": "2.0.3",
+  "version": "2.0.4-beta1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

From bcb6c72cb6795c300daf0950f65900011e82f058 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Tue, 9 Apr 2024 10:54:19 -0500
Subject: [PATCH 17/17] Update version in composer.json

---
 src/Magento/ComposerRootUpdatePlugin/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/ComposerRootUpdatePlugin/composer.json b/src/Magento/ComposerRootUpdatePlugin/composer.json
index 618d5b7..902d442 100644
--- a/src/Magento/ComposerRootUpdatePlugin/composer.json
+++ b/src/Magento/ComposerRootUpdatePlugin/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/composer-root-update-plugin",
   "type": "composer-plugin",
   "description": "Plugin to look ahead for Magento Open Source or Adobe Commerce project root changes when running composer update for new magento/product or magento/magento-cloud metapackage versions",
-  "version": "2.0.4-beta1",
+  "version": "2.0.4",
   "license": [
     "OSL-3.0",
     "AFL-3.0"