Merge branch 'develop-v4' into master-v4 for v4.0.0-beta.5

Author: mbtamuli

.gitignore

@@ -17,4 +17,5 @@ php-test-framework.xml
 vcs.xml
 workspace.xml
 profiles_settings.xml
-Project_Default.xml
+Project_Default.xml
+.idea

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 
 language: php
-php: 7.1
+php: 7.0
 
 env:
   global:
@@ -22,8 +22,12 @@ install:
 
 before_script:
   - composer validate
-  - ./vendor/bin/behat
   - ./ci/prepare.sh
+  - sudo ./vendor/bin/behat
+  - ./ci/test-commands.sh
+
+after_script:
+  - cat /opt/easyengine/ee.log
 
 jobs:
   include:

README.md

@@ -31,18 +31,23 @@ chmod +x /usr/local/bin/ee
 To get started with EasyEngine and create a wordpress site, run
 
 ```
-ee site create example.com
+ee site create example.com --type=wp
 ```
 
 Need a wordpress site with caching? Try
 
 ```
-ee site create example.com --wpredis
+ee site create example.com --type=wp --cache
 ```
 
 Need a wordpress multi-site with page cache?
 ```
-ee site create example.com --wpsubdir --wpredis
+ee site create example.com --type=wp --mu=wpsubdir --cache
+```
+
+Need a plain and simple html site?
+```
+ee site create example.com
 ```
 
 Want to play around with your new site?
@@ -52,6 +57,8 @@ ee shell example.com
 
 Want to know more? Checkout readme of these commands -
  * [site command](https://github.com/EasyEngine/site-command/)
+ * [site-wp command](https://github.com/EasyEngine/site-wp-command/)
+ * [cron command](https://github.com/EasyEngine/cron-command/)
  * [shell command](https://github.com/EasyEngine/shell-command/)
 
 Note: :warning: EasyEngine will currently only run with root privileges. You can run `ee help`, `ee help site` and `ee help site create` to get all the details about the various commands and subcommands that you can run.
@@ -62,7 +69,7 @@ Development of easyengine is done entirely on GitHub.
 
 We've used [wp-cli](https://github.com/wp-cli/wp-cli/) framework as a base and built EasyEngine on top of it.
 
-This repo contains main core of easyengine (the framework). 
+This repo contains main core of easyengine (the framework).
 All top level commands(except `ee cli`) i.e. `ee site`, `ee shell` have their own repos.
 
 Currently we have following commands which are bundled by default in EasyEngine:

VERSION

@@ -1 +1 @@
-4.0.0-beta.4
+4.0.0-beta.5

ci/prepare.sh

@@ -9,4 +9,4 @@ if [[ "$TRAVIS_BRANCH" == "develop-v4" ]]; then
     echo $version > VERSION
 fi
 
-php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quite  > /dev/null
+php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet

ci/test-commands.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# called by Travis CI
+
+# Add certificates
+./vendor/easyengine/site-command/ci/add-test-certs.sh > /dev/null
+
+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

composer.json

@@ -24,16 +24,20 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.3.29",
+        "php": ">=7.0",
+        "acmephp/core": "dev-master",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.0",
-        "easyengine/cron-command": "v1.0.0-beta.1",
-        "easyengine/site-command": "v1.0.0",
+        "easyengine/cron-command": "v1.0.0-beta.2",
+        "easyengine/site-command": "v2.0.0",
+        "easyengine/site-wp-command": "v1.0.0-beta.1",
         "easyengine/shell-command": "v1.0.0-beta.1",
+        "ext-openssl": "*",
+        "guzzlehttp/guzzle": "^6.0",
         "justinrainbow/json-schema": "~5.2.5",
+        "league/flysystem": "^1.0.19",
         "monolog/monolog": "^1.23",
         "mustache/mustache": "~2.4",
-        "ramsey/array_column": "~1.1",
         "rmccue/requests": "~1.6",
         "symfony/config": "^2.7|^3.0",
         "symfony/console": "^2.7|^3.0",
@@ -43,8 +47,10 @@
         "symfony/filesystem": "^2.7|^3.0",
         "symfony/finder": "^2.7|^3.0",
         "symfony/process": "^2.1|^3.0",
+        "symfony/serializer": "^3.0",
         "symfony/translation": "^2.7|^3.0",
         "symfony/yaml": "^2.7|^3.0",
+        "webmozart/assert": "^1.0",
         "wp-cli/autoload-splitter": "^0.1.5",
         "wp-cli/mustangostang-spyc": "^0.6.3",
         "wp-cli/php-cli-tools": "~0.11.2"
@@ -65,7 +71,8 @@
             "EE": "php"
         },
         "psr-4": {
-            "": "php/commands/src"
+            "": "php/commands/src",
+            "AcmePhp\\Cli\\": "php/AcmePhp/Cli"
         }
     },
     "extra": {