Merge pull request #42 from magento-commerce/develop

MCLOUD-7868: Merge develop into 1.2

Author: oshmyheliuk

.travis.yml

@@ -86,12 +86,14 @@ before_install:
   # https://github.com/kylekatarnls/update-helper/issues/9
   - if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
 
-install: if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
+install:
+  - phpenv config-add travis.php.ini
+  - if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
 
 before_script:
-  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "build-images" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && ([ $TEST_SUITE == "build-images" ] || [ $TEST_SUITE == "functional" ]); then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
   - if [ $TEST_SUITE == "functional" ]; then sudo sysctl -w vm.max_map_count=262144; fi;
-  - if [ $TEST_SUITE == "functional" ]; then cp codeception.dist.yml codeception.yml && sed -i "s/use_generated_images:\ false/use_generated_images:\ true/" codeception.yml; fi;
+  - if [ $TEST_SUITE == "functional" ]; then cp codeception.dist.yml codeception.yml && sed -i "s/use_custom_images:\ false/use_custom_images:\ true/" codeception.yml; fi;
 
 script:
   - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi;

bin/init-docker.sh

@@ -69,8 +69,8 @@ add_host()
     echo "127.0.0.1 $DOMAIN" | sudo tee -a /etc/hosts
 }
 
-PHP_VERSION="7.2"
-IMAGE_VERSION="1.1"
+PHP_VERSION="7.4"
+IMAGE_VERSION="1.2.1"
 ADD_HOST=true
 DOMAIN="magento2.docker"
 USAGE="Init Docker

codeception.dist.yml

@@ -25,10 +25,10 @@ modules:
       composer_magento_username: "%REPO_USERNAME%"
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"
-      use_generated_images: false
-      generated_images_namespace: "cloudft"
+      use_custom_images: false
+      custom_images_namespace: "cloudft"
+      version_custom_images: "%TRAVIS_BUILD_NUMBER%"
       use_cached_workdir: true
-      version_generated_images: "%TRAVIS_BUILD_NUMBER%"
       printOutput: false
     Magento\CloudDocker\Test\Functional\Codeception\Docker:
       system_magento_dir: "%Magento.docker.settings.system.magento_dir%"

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -26,7 +26,7 @@
         "codeception/module-rest": "^1.2",
         "consolidation/robo": "^1.2",
         "phpmd/phpmd": "@stable",
-        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan": "^0.12",
         "phpunit/phpunit": "^8.5",
         "squizlabs/php_codesniffer": "^3.0"
     },
@@ -68,6 +68,10 @@
                 "dist/mutagen.sh",
                 "mutagen.sh"
             ],
+            [
+                "dist/php.dev.ini",
+                "php.dev.ini"
+            ],
             [
                 "dist/mnt",
                 ".docker/mnt"

config/services.xml

@@ -51,7 +51,6 @@
         <service id="Magento\CloudDocker\App\ConfigurationMismatchException" autowire="false"/>
         <service id="Magento\CloudDocker\App\GenericException" autowire="false"/>
         <service id="Magento\CloudDocker\Compose\DeveloperBuilder" shared="false"/>
-        <service id="Magento\CloudDocker\Config\Config" autowire="false"/>
         <service id="Magento\CloudDocker\Config\Source\CliSource" autowire="false"/>
         <service id="Magento\CloudDocker\Config\Source\CustomSource" autowire="false"/>
         <service id="Composer\Semver\VersionParser"/>

dist/php.dev.ini

@@ -0,0 +1,2 @@
+; configuration for development mode
+opcache.validate_timestamps = 1