Merge remote-tracking branch 'origin/develop' into MCLOUD-10032

Author: BaDos

composer.json

@@ -13,14 +13,14 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "ext-json": "*",
-        "composer/composer": "@stable",
+        "composer/composer": "^1.4 || ^2.0",
         "composer/semver": "@stable",
-        "symfony/config": "^3.3||^4.4||^5.0",
-        "symfony/console": "^2.6||^4.0||^5.0",
-        "symfony/dependency-injection": "^3.3||^4.3||^5.0",
-        "symfony/process": "^2.1||^4.1||^5.0",
-        "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0",
-        "symfony/yaml": "^3.3||^4.0||^5.0",
+        "symfony/config": "^3.3||^4.4||^5.0||^6.0",
+        "symfony/console": "^2.6||^4.0||^5.0||^6.0",
+        "symfony/dependency-injection": "^3.3||^4.3||^5.0||^6.0",
+        "symfony/process": "^2.1||^4.1||^5.0||^6.0",
+        "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",
+        "symfony/yaml": "^3.3||^4.0||^5.0||^6.0",
         "monolog/monolog": "^1.25||^2.3",
         "magento/quality-patches": "^1.1.0"
     },
@@ -30,7 +30,7 @@
         "codeception/module-db": "^1.0",
         "codeception/module-phpbrowser": "^1.0",
         "codeception/module-rest": "^1.2",
-        "consolidation/robo": "^1.2",
+        "consolidation/robo": "^1.2 || ^2.0",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "squizlabs/php_codesniffer": "^3.0"
@@ -56,7 +56,10 @@
         "phpunit": "phpunit --configuration tests/unit"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "magento/*": true
+        }
     },
     "prefer-stable": true
 }

config/services.xml

@@ -7,6 +7,7 @@
         <prototype namespace="Magento\CloudPatches\" resource="../src/*" exclude="../src/{Test}"/>
 
         <service id="Psr\Log\LoggerInterface" alias="Magento\CloudPatches\App\Logger" />
+        <service id="Psr\Container\ContainerInterface" alias="Magento\CloudPatches\App\Container" />
         <service id="Magento\CloudPatches\App\Container" autowire="false"/>
         <service id="Magento\CloudPatches\Filesystem\DirectoryList" autowire="false"/>
         <service id="Symfony\Component\Console\Helper\QuestionHelper"/>

src/Test/Functional/Acceptance/Acceptance81Cest.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudPatches\Test\Functional\Acceptance;
+
+/**
+ * @group php81
+ */
+class Acceptance81Cest extends AcceptanceCest
+{
+    /**
+     * @return array
+     */
+    protected function patchesDataProvider(): array
+    {
+        return [
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
+            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p3'],
+            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
+            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
+            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p2'],
+        ];
+    }
+}

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -8,7 +8,7 @@
 namespace Magento\CloudPatches\Test\Functional\Acceptance;
 
 /**
- * @group php81
+ * @group php82
  */
 class AcceptanceCest extends AbstractCest
 {
@@ -49,11 +49,7 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
     protected function patchesDataProvider(): array
     {
         return [
-            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
-            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
-            ['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
-            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
-            ['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
+            ['templateVersion' => '2.4.6', 'magentoVersion' => null],
         ];
     }
 }

src/Test/Functional/Acceptance/PatchApplierCest.php

@@ -10,7 +10,7 @@
 use Magento\CloudDocker\Test\Functional\Codeception\Docker;
 
 /**
- * @group php81
+ * @group php82
  */
 class PatchApplierCest extends AbstractCest
 {
@@ -21,7 +21,7 @@ public function _before(\CliTester $I): void
     {
         parent::_before($I);
 
-        $this->prepareTemplate($I, '2.4.4');
+        $this->prepareTemplate($I, '2.4.6');
         $I->copyFileToWorkDir('files/debug_logging/.magento.env.yaml', '.magento.env.yaml');
     }
 

src/Test/Unit/Composer/MagentoVersionTest.php

@@ -12,6 +12,7 @@
 use Composer\Package\RootPackageInterface;
 use Composer\Repository\RepositoryManager;
 use Composer\Repository\WritableRepositoryInterface;
+use Composer\Repository\InstalledRepositoryInterface;
 use Magento\CloudPatches\Composer\MagentoVersion;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -24,7 +25,7 @@ class MagentoVersionTest extends TestCase
     const VERSION = '2.3.5';
 
     /**
-     * @var WritableRepositoryInterface|MockObject
+     * @var WritableRepositoryInterface|InstalledRepositoryInterface|MockObject
      */
     private $repository;
 
@@ -43,7 +44,11 @@ class MagentoVersionTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->repository = $this->getMockForAbstractClass(WritableRepositoryInterface::class);
+        $this->repository = $this->getMockForAbstractClass(
+            (version_compare(PHP_VERSION, '7.3') == -1)
+                ? WritableRepositoryInterface::class
+                : InstalledRepositoryInterface::class
+        );
         $this->rootPackage = $this->getMockForAbstractClass(RootPackageInterface::class);
         $repositoryManager = $this->createMock(RepositoryManager::class);
         $repositoryManager->method('getLocalRepository')