Merge branch 'develop' for v4.0.13

Author: mrrobot47

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
-
+dist: xenial
 language: php
-php: 7.0
+php: 7.2
 
 env:
   global:
@@ -33,7 +33,6 @@ install:
   - sudo ./ci/test-env-install.sh
 
 before_script:
-  - composer validate
   - ./ci/prepare.sh
 
 script:

VERSION

@@ -1 +1 @@
-4.0.12
+4.0.13

ci/test-commands.sh

@@ -1,12 +1,20 @@
 #!/bin/bash
-
 # called by Travis CI
 
-# Add certificates
-./vendor/easyengine/site-command/ci/add-test-certs.sh > /dev/null
+#repos=$(find vendor/easyengine -type d -name 'features')
+sub_commands=(
+	vendor/easyengine/site-command/features
+	vendor/easyengine/site-type-php/features
+	vendor/easyengine/site-type-wp/features
+)
 
-for repo in "$(find vendor/easyengine -type d -name 'features')"; do
-	rsync -a --delete $repo/ features > /dev/null
-	echo "Running tests for $repo"
-	sudo ./vendor/bin/behat 
-done
+for command in "${sub_commands[@]}"; do
+	IFS='/' read -r -a array <<< "$command"
+	rm -rf features/*
+	rsync -av --delete $command/ features/ > /dev/null
+	for file in features/*.feature; do mv "$file" "${file%.feature}_${array[2]}.feature"; done
+	composer du
+	echo "Running tests for $command"
+	export COMPOSE_INTERACTIVE_NO_CLI=1
+	sudo ./vendor/bin/behat
+done

composer.json

@@ -33,7 +33,7 @@
         "easyengine/cron-command": "v1.0.2",
         "easyengine/log-command": "v1.0.1",
         "easyengine/mailhog-command": "v1.0.2",
-        "easyengine/site-command": "v2.3.1",
+        "easyengine/site-command": "v2.3.2",
         "easyengine/site-type-wp": "v1.0.10",
         "easyengine/site-type-php": "v1.0.10",
         "easyengine/service-command": "v1.0.9",
@@ -45,7 +45,7 @@
         "symfony/config": "3.4.18",
         "symfony/console": "3.4.18",
         "symfony/debug": "3.4.18",
-        "symfony/dependency-injection": "3.4.18",
+        "symfony/dependency-injection": "3.4.27",
         "symfony/event-dispatcher": "3.4.18",
         "symfony/filesystem": "3.4.18",
         "symfony/finder": "3.4.18",

composer.lock

@@ -2,9 +2,9 @@
     "easyengine/cron": "v4.0.0",
     "easyengine/mailhog": "v4.0.0",
     "easyengine/mariadb": "v4.0.0",
-    "easyengine/nginx-proxy": "v4.0.2",
-    "easyengine/nginx": "v4.0.0",
-    "easyengine/php": "v4.0.2",
+    "easyengine/nginx-proxy": "v4.0.3",
+    "easyengine/nginx": "v4.0.3",
+    "easyengine/php": "v4.0.3",
     "easyengine/php5.6": "v4.0.0",
     "easyengine/php7.0": "v4.0.0",
     "easyengine/php7.3": "v4.0.0",