Merge branch 'develop' into 1.1-forward

Author: shiftedreality

.travis.yml

@@ -23,12 +23,8 @@ stages:
 jobs:
   include:
     - stage: static-unit
-      php: '7.1'
-      script: ./tests/travis/static-unit.sh;
-      env:
-        - TEST_SUITE=static-unit
-    - script: ./tests/travis/static-unit.sh;
       php: '7.2'
+      script: ./tests/travis/static-unit.sh;
       env:
         - TEST_SUITE=static-unit
     - script: ./tests/travis/static-unit.sh;
@@ -37,10 +33,6 @@ jobs:
         - TEST_SUITE=static-unit
     - stage: integration
       script: ./vendor/bin/phpunit --configuration ./tests/integration;
-      php: '7.1'
-      env:
-        - TEST_SUITE=integration
-    - script: ./vendor/bin/phpunit --configuration ./tests/integration;
       php: '7.2'
       env:
         - TEST_SUITE=integration
@@ -56,11 +48,6 @@ jobs:
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh varnish; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh elasticsearch; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh nginx; fi;
-    - script:
-        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-cli; fi;
-        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-fpm; fi;
-      env:
-        - TEST_SUITE=build-images
     - script:
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-cli; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-fpm; fi;
@@ -72,11 +59,7 @@ jobs:
       env:
         - TEST_SUITE=build-images
     - stage: test
-      php: '7.1'
-      dist: xenial
-      env:
-        - TEST_SUITE=functional
-    - php: '7.2'
+      php: '7.2'
       dist: xenial
       env:
         - TEST_SUITE=functional

composer.json

@@ -8,7 +8,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
         "ext-json": "*",
         "composer/composer": "^1.0",
         "composer/semver": "^1.0",
@@ -19,12 +19,15 @@
         "symfony/yaml": "^3.3||^4.0"
     },
     "require-dev": {
+        "codeception/codeception": "^4.1",
+        "codeception/module-asserts": "^1.2",
+        "codeception/module-db": "^1.0",
+        "codeception/module-phpbrowser": "^1.0",
+        "consolidation/robo": "^1.2",
         "phpmd/phpmd": "@stable",
         "phpstan/phpstan": "^0.11",
-        "phpunit/phpunit": "^7.2",
-        "squizlabs/php_codesniffer": "^3.0",
-        "codeception/codeception": "^2.5.3",
-        "consolidation/robo": "^1.2"
+        "phpunit/phpunit": "^8.5",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [
         "bin/ece-docker"

dist/bin/magento-docker

@@ -19,13 +19,21 @@ USAGE="Magento Cloud Docker
   flush-redis       clears redis cache
   flush-varnish     clears varnish cache
   ece-db            access to Database
+  php 7.1           run a command in a PHP 7.1 container
+  php 7.2           run a command in a PHP 7.2 container
+  php 7.3           run a command in a PHP 7.3 container
+  php 7.4           run a command in a PHP 7.4 container
 
 \033[33mOptions:\033[0m
   -h            show this help text\n"
 
-if [ ${#@} -ne 0 ] && [ "${@#"-h"}" = "" ]; then
-    printf "$USAGE"
-    exit 0;
+if [ ${#@} -ne 0 ]; then
+    for arg in "$@"; do
+        if [ "${arg#"-h"}" = "" ]; then
+            printf "$USAGE"
+            exit 0;
+        fi
+    done
 fi;
 
 case "$1" in
@@ -74,6 +82,11 @@ case "$1" in
     ece-db)
         docker-compose exec db sh -c 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE "$@"'
         ;;
+    php)
+        version="$2"
+        shift 2
+        docker run --rm -it -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/root/.composer/cache "magento/magento-cloud-docker-php:${version}-cli" "$@"
+        ;;
     *)
         printf "$USAGE"
         exit 0;

images/nginx/1.9/docker-entrypoint.sh

@@ -14,6 +14,7 @@ XDEBUG_UPSTREAM_FILE="/etc/nginx/conf.d/xdebug/upstream.conf"
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" $VHOST_FILE
 [ ! -z "${MFTF_UTILS}" ] && sed -i "s/!MFTF_UTILS!/${MFTF_UTILS}/" $VHOST_FILE
 [ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" $VHOST_FILE
+[ ! -z "${WITH_XDEBUG}" ] && sed -i "s/!WITH_XDEBUG!/${WITH_XDEBUG}/" $VHOST_FILE
 [ "${WITH_XDEBUG}" == "1" ] && sed -i "s/#include_xdebug_upstream/include/" $NGINX_FILE
 
 # Check if the nginx syntax is fine, then launch.

images/nginx/1.9/etc/vhost.conf

@@ -14,7 +14,7 @@ server {
     set $MAGE_ROOT !MAGENTO_ROOT!; # Variable: MAGENTO_ROOT
     set $MAGE_MODE !MAGENTO_RUN_MODE!; # Variable: MAGENTO_RUN_MODE
     set $MFTF_UTILS !MFTF_UTILS!; # Variable: MFTF_UTILS
-    set $WITH_XDEBUG !$WITH_XDEBUG!; # Variable: WITH_XDEBUG
+    set $WITH_XDEBUG !WITH_XDEBUG!; # Variable: WITH_XDEBUG
 
     set $my_fastcgi_pass "fastcgi_backend";
     if ($cookie_XDEBUG_SESSION) {