Merge remote-tracking branch 'origin/develop' into fix-compose-vulnerability

Author: tomreece

composer.json

@@ -13,10 +13,10 @@
         "composer/composer": "^1.4 || ^2.0",
         "composer/semver": "@stable",
         "illuminate/config": "^5.5||^8.77",
-        "symfony/config": "^4.4 || ^5.1",
-        "symfony/console": "^2.8 || ^4.0 || ^5.1",
-        "symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1",
-        "symfony/yaml": "^3.3 || ^4.0 || ^5.1"
+        "symfony/config": "^4.4 || ^5.1|| ^5.4 || ^6.4",
+        "symfony/console": "^2.8 || ^4.0 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1|| ^5.4 || ^6.4",
+        "symfony/yaml": "^3.3 || ^4.0 || ^5.1 || ^5.4|| ^6.4"
     },
     "require-dev": {
         "codeception/codeception": "^4.1",
@@ -26,7 +26,7 @@
         "codeception/module-rest": "^1.2",
         "consolidation/robo": "^1.2 || ^2.0",
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan": "^1.8",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "squizlabs/php_codesniffer": "^3.0"
     },

config/services.xml

@@ -9,6 +9,7 @@
         <prototype namespace="Magento\CloudDocker\" resource="../src/*" exclude="../src/{Test}"/>
         <service id="Magento\CloudDocker\App\Container" autowire="false"/>
         <service id="Magento\CloudDocker\App\ContainerInterface" alias="container"/>
+        <service id="Psr\Container\ContainerInterface" alias="service_container"/>
         <service id="Magento\CloudDocker\App\ContainerException" autowire="false"/>
         <service id="Magento\CloudDocker\Compose\BuilderFactory">
             <argument key="$strategies" type="collection">

src/Application.php

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

src/Compose/ProductionBuilder/Service/ElasticSearch.php

@@ -73,7 +73,7 @@ public function getConfig(Config $config): array
         return $this->serviceFactory->create(
             $this->getServiceName(),
             $config->getServiceVersion($this->getServiceName()),
-            !empty($esEnvVars) ? ['environment' => $esEnvVars] : [],
+            ['environment' => $esEnvVars],
             $config->getServiceImage($this->getServiceName()),
             $config->getCustomRegistry(),
             $config->getServiceImagePattern($this->getServiceName())

src/Compose/ProductionBuilder/Service/OpenSearch.php

@@ -84,7 +84,7 @@ public function getConfig(Config $config): array
         return $this->serviceFactory->create(
             $this->getServiceName(),
             $this->getVersion($config),
-            !empty($osEnvVars) ? ['environment' => $osEnvVars] : [],
+            ['environment' => $osEnvVars],
             $config->getServiceImage($this->getServiceName()),
             $config->getCustomRegistry(),
             $config->getServiceImagePattern($this->getServiceName())

src/Test/Functional/Acceptance/Acceptance82Cest.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+use Robo\Exception\TaskException;
+
+/**
+ * @group php82
+ */
+class Acceptance82Cest extends AcceptanceCest
+{
+    /**
+     * Template version for testing
+     */
+    protected const TEMPLATE_VERSION = '2.4.6';
+}

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -10,14 +10,14 @@
 use Robo\Exception\TaskException;
 
 /**
- * @group php82
+ * @group php83
  */
 class AcceptanceCest extends AbstractCest
 {
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.6';
+    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
 
     /**
      * @param \CliTester $I

src/Test/Functional/Acceptance/Developer82Cest.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+use CliTester;
+
+/**
+ * @group php82
+ */
+class Developer82Cest extends DeveloperCest
+{
+    /**
+     * Template version for testing
+     */
+    protected const TEMPLATE_VERSION = '2.4.6';
+}

src/Test/Functional/Acceptance/DeveloperCest.php

@@ -10,14 +10,14 @@
 use CliTester;
 
 /**
- * @group php82
+ * @group php83
  */
 class DeveloperCest extends AbstractCest
 {
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.6';
+    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
 
     /**
      * Tests that php settings contains configuration from php.dev.ini

src/Test/Functional/Acceptance/Elasticsearch82Cest.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+use CliTester;
+use Codeception\Example;
+use Robo\Exception\TaskException;
+
+/**
+ * @group php82
+ */
+class Elasticsearch82Cest extends ElasticsearchCest
+{
+    /**
+     * Template version for testing
+     */
+    protected const TEMPLATE_VERSION = '2.4.6';
+}