Merge pull request #272 from magento/MCLOUD-6633

MCLOUD-6633: Add Magento 2.4.0 and PHP 7.4 support for FT magento-cloud-docker

Author: shiftedreality

.travis.yml

@@ -79,6 +79,9 @@ jobs:
     - php: '7.3'
       env:
         - TEST_SUITE=functional
+    - php: '7.4'
+      env:
+        - TEST_SUITE=functional
 
 install: if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
 

src/Test/Functional/Acceptance/Acceptance73Cest.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+/**
+ * @group php73
+ */
+class Acceptance73Cest extends AcceptanceCest
+{
+    protected const TEMPLATE_VERSION = '2.3.5';
+}

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -10,7 +10,7 @@
 use Robo\Exception\TaskException;
 
 /**
- * @group php73
+ * @group php74
  */
 class AcceptanceCest extends AbstractCest
 {

src/Test/Functional/Acceptance/Elasticsearch73Cest.php

@@ -0,0 +1,52 @@
+<?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 php73
+ */
+class Elasticsearch73Cest extends ElasticsearchCest
+{
+    /**
+     * Template version for testing
+     */
+    protected const TEMPLATE_VERSION = '2.3.5';
+
+    /**
+     * @return array
+     */
+    protected function dataProvider(): array
+    {
+        return [
+            [
+                'version' => '6.5',
+                'xms' => '518m',
+                'xmx' => '518m',
+                'param' => [
+                    'key' => 'node.store.allow_mmapfs',
+                    'value' => 'false',
+                    'needle' => '"store":{"allow_mmapfs":"false"}',
+                ]
+            ],
+            [
+                'version' => '7.5',
+                'xms' => '520m',
+                'xmx' => '520m',
+                'param' => [
+                    'key' => 'node.store.allow_mmap',
+                    'value' => 'false',
+                    'needle' => '"store":{"allow_mmap":"false"}',
+                ]
+            ],
+        ];
+    }
+}

src/Test/Functional/Acceptance/ElasticsearchCest.php

@@ -12,14 +12,14 @@
 use Robo\Exception\TaskException;
 
 /**
- * @group php73
+ * @group php74
  */
 class ElasticsearchCest extends AbstractCest
 {
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.3.3';
+    protected const TEMPLATE_VERSION = '2.4.0';
 
     /**
      * @param CliTester $I

src/Test/Functional/Acceptance/SplitDb73Cest.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+/**
+ * @group php73
+ */
+class SplitDb73Cest extends SplitDbCest
+{
+    protected const TEMPLATE_VERSION = '2.3.5';
+}

src/Test/Functional/Acceptance/SplitDbCest.php

@@ -11,7 +11,7 @@
 use Robo\Exception\TaskException;
 
 /**
- * @group php73
+ * @group php74
  */
 class SplitDbCest extends AbstractCest
 {

tests/travis/functional.sh

@@ -16,4 +16,7 @@ case $TRAVIS_PHP_VERSION in
     7.3)
         ./vendor/bin/codecept run -g php73 --steps
         ;;
+    7.4)
+        ./vendor/bin/codecept run -g php74 --steps
+        ;;
 esac