Merge pull request #94 from magento-commerce/develop

MCLOUD-12025 Cloud Tools Release

Author: sivaram7

composer.json

@@ -21,7 +21,7 @@
         "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",
+        "monolog/monolog": "^1.25||^2.3||^2.7",
         "magento/quality-patches": "^1.1.0"
     },
     "require-dev": {

src/Application.php

@@ -37,7 +37,7 @@ public function __construct(ContainerInterface $container)
     /**
      * @inheritdoc
      */
-    protected function getDefaultCommands()
+    protected function getDefaultCommands(): array
     {
         return array_merge(parent::getDefaultCommands(), [
             $this->container->get(Command\Apply::class),

src/ApplicationEce.php

@@ -37,7 +37,7 @@ public function __construct(ContainerInterface $container)
     /**
      * @inheritdoc
      */
-    protected function getDefaultCommands()
+    protected function getDefaultCommands(): array
     {
         return array_merge(parent::getDefaultCommands(), [
             $this->container->get(Command\Ece\Apply::class),

src/Test/Functional/Acceptance/Acceptance82Cest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudPatches\Test\Functional\Acceptance;
+
+/**
+ * @group php82
+ */
+class Acceptance82Cest extends AcceptanceCest
+{
+    /**
+     * @return array
+     */
+    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],
+        ];
+    }
+}

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -8,7 +8,7 @@
 namespace Magento\CloudPatches\Test\Functional\Acceptance;
 
 /**
- * @group php82
+ * @group php83
  */
 class AcceptanceCest extends AbstractCest
 {
@@ -49,9 +49,7 @@ public function testPatches(\CliTester $I, \Codeception\Example $data): void
     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-beta-test', 'magentoVersion' => '2.4.7-beta401'],
         ];
     }
 }

src/Test/Functional/Acceptance/PatchApplierCest.php

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