conflict fix

Author: glo72880

composer.json

@@ -6,31 +6,30 @@
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {
-            "type": "composer",
-            "url": "https://repo.magento.com/"
+          "type": "composer",
+          "url": "https://repo.magento.com/"
         }
     },
     "require": {
         "php": "^8.0",
         "ext-json": "*",
         "composer/composer": "^1.9 || ^2.0",
         "composer/semver": "@stable",
-        "symfony/config": "^4.4||^5.0||^6.0",
-        "symfony/console": "^4.4||^5.0||^6.0",
-        "symfony/dependency-injection": "^4.4||^5.0||^6.0",
-        "symfony/process": "^4.4||^5.0||^6.0",
-        "symfony/proxy-manager-bridge": "^4.4||^5.0||^6.0",
-        "symfony/yaml": "^4.4||^5.0||^6.0",
-        "monolog/monolog": "^2.3||^2.7",
-        "magento/quality-patches": "^1.1.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.1 || ^5.4 || ^6.4",
+        "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||^2.7"
     },
     "require-dev": {
-        "codeception/codeception": "^4.1",
-        "codeception/module-asserts": "^1.2",
-        "codeception/module-db": "^1.0",
-        "codeception/module-phpbrowser": "^1.0",
-        "codeception/module-rest": "^1.2",
-        "consolidation/robo": "^2.0",
+        "codeception/codeception": "^4.1 || ^5.1",
+        "codeception/module-asserts": "^1.2 || ^3.0",
+        "codeception/module-db": "^1.0 || ^3.0",
+        "codeception/module-phpbrowser": "^1.0 || ^3.0",
+        "codeception/module-rest": "^1.2 || ^3.0",
+        "consolidation/robo": "^1.2 || ^3.0",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "squizlabs/php_codesniffer": "^3.0"

src/Test/Functional/Acceptance/Acceptance82Cest.php

@@ -20,7 +20,7 @@ protected function patchesDataProvider(): array
         return [
             ['templateVersion' => '2.4.6', 'magentoVersion' => '2.4.6'],
             ['templateVersion' => '2.4.6', 'magentoVersion' => '2.4.6-p1'],
-            ['templateVersion' => '2.4.7-beta', 'magentoVersion' => null],
+            ['templateVersion' => '2.4.7', 'magentoVersion' => null],
         ];
     }
 }

src/Test/Functional/Acceptance/Acceptance83Cest.php

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

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -7,10 +7,7 @@
 
 namespace Magento\CloudPatches\Test\Functional\Acceptance;
 
-/**
- * @group php83
- */
-class AcceptanceCest extends AbstractCest
+abstract class AcceptanceCest extends AbstractCest
 {
     /**
      * @param \CliTester $I
@@ -46,10 +43,5 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
     /**
      * @return array
      */
-    protected function patchesDataProvider(): array
-    {
-        return [
-            ['templateVersion' => '2.4.7-beta-test', 'magentoVersion' => '2.4.7-beta401'],
-        ];
-    }
+    abstract protected function patchesDataProvider(): array;
 }

src/Test/Functional/Acceptance/PatchApplierCest.php

@@ -21,7 +21,7 @@ public function _before(\CliTester $I): void
     {
         parent::_before($I);
 
-        $this->prepareTemplate($I, '2.4.7-beta-test');
+        $this->prepareTemplate($I, '2.4.7');
         $I->copyFileToWorkDir('files/debug_logging/.magento.env.yaml', '.magento.env.yaml');
     }