Merge branch 'develop-v4' for v4.0.0-beta.6

Signed-off-by: Mriyam Tamuli <[email protected]>

Author: mbtamuli

.travis.yml

@@ -8,32 +8,47 @@ env:
     - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
 
 before_install:
+  - sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
   - |
     # Remove Xdebug for a huge performance increase:
     if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
       phpenv config-rm xdebug.ini
     else
       echo "xdebug.ini does not exist"
     fi
+  - |
+    # Update commands in composer.json to develop if branch is not master.
+    if [[ "$TRAVIS_BRANCH" != "master-v4" ]]; then
+      sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
+    fi
 
 install:
-  - composer install --no-interaction
+  - |
+    # Run composer install for master else update.
+    if [[ "$TRAVIS_BRANCH" = "master-v4" ]]; then
+      composer install --no-interaction
+    else
+      composer update
+    fi
   - sudo ./ci/test-env-install.sh
 
 before_script:
   - composer validate
   - ./ci/prepare.sh
+
+script:
   - sudo ./vendor/bin/behat
   - ./ci/test-commands.sh
 
 after_script:
+  - cat /opt/easyengine/install.log
   - cat /opt/easyengine/ee.log
 
 jobs:
   include:
     - stage: deploy
       env: DEPLOY_BRANCH=master-v4
-      script: ./ci/deploy.sh
+      after_success: ./ci/deploy.sh
 
 cache:
   directories:
@@ -48,3 +63,8 @@ notifications:
   email:
     on_success: never
     on_failure: change
+
+addons:
+  apt:
+    packages:
+      - docker-ce

README.md

@@ -1,6 +1,9 @@
 # EasyEngine v4
 
+<img width="150" height="150" src="https://easyengine.io/wp-content/uploads/2015/11/cropped-favicon-easyengine.png" alt="EasyEngine Logo" align="right" />
+
 [![Build Status](https://travis-ci.org/EasyEngine/easyengine.svg?branch=master-v4)](https://travis-ci.org/EasyEngine/easyengine)
+[![Join EasyEngine Slack Channel](http://slack.easyengine.io/badge.svg)](http://slack.easyengine.io/)
 
 ## Requirements
 
@@ -26,6 +29,24 @@ wget -O /usr/local/bin/ee https://raw.githubusercontent.com/EasyEngine/easyengin
 chmod +x /usr/local/bin/ee
 ```
 
+### Tab completions
+
+EasyEngine also comes with a tab completion script for Bash and ZSH. Just download [ee-completion.bash](https://raw.githubusercontent.com/EasyEngine/easyengine/develop-v4/utils/ee-completion.bash) and source it from `~/.bash_profile`:
+
+```bash
+source /FULL/PATH/TO/ee-completion.bash
+```
+
+Don't forget to run `source ~/.bash_profile` afterwards.
+
+If using zsh for your shell, you may need to load and start `bashcompinit` before sourcing. Put the following in your `.zshrc`:
+
+```bash
+autoload bashcompinit
+bashcompinit
+source /FULL/PATH/TO/ee-completion.bash
+```
+
 ## Usage
 
 To get started with EasyEngine and create a wordpress site, run
@@ -82,3 +103,8 @@ In future, community will be able to make their own packages and commands!
 ## Contributing
 
 We warmheartedly welcome all contributions however and in whatever capacity you can either through Pull Requests or by reporting Issues. You can contribute here or in any of the above mentioned commands repo.
+
+## Donations
+
+[![PayPal-Donate](https://cloud.githubusercontent.com/assets/4115/5297691/c7b50292-7bd7-11e4-987b-2dc21069e756.png)](http://rt.cx/eedonate)
+[![BitCoin-Donate](https://bitpay.com/img/donate-button.svg)](https://bitpay.com/417008/donate)

VERSION

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

ci/prepare.sh

@@ -2,11 +2,12 @@
 
 # called by Travis CI
 
-if [[ "$TRAVIS_BRANCH" == "develop-v4" ]]; then
+if [[ "$TRAVIS_BRANCH" != $DEPLOY_BRANCH ]]; then
     version=$(head -n 1 VERSION)
     version="$(echo $version | xargs)"
-    version+="-nightly"
+    version+="-nightly-$(git rev-parse --short HEAD)"
     echo $version > VERSION
+    sed -i 's/\:\ \"\(.*\)\"/\:\ \"\1-nightly\"/g' img-versions.json
 fi
 
 php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet

ci/test-env-install.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 function setup_test_requirements() {
+    readonly LOG_FILE="/opt/easyengine/install.log"
     # Adding software-properties-common for add-apt-repository.
     apt-get install -y software-properties-common
     # Adding ondrej/php repository for installing php, this works for all ubuntu flavours.

composer.json

@@ -25,17 +25,19 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.0",
-        "acmephp/core": "dev-master",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.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",
+        "easyengine/admin-tools-command": "v1.0.0-beta.1",
+        "easyengine/auth-command": "v1.0.0-beta.1",
+        "easyengine/config-command": "v1.0.0-beta.1",
+        "easyengine/cron-command": "v1.0.0-beta.3",
+        "easyengine/mailhog-command": "v1.0.0-beta.1",
+        "easyengine/site-command": "v2.1.0",
+        "easyengine/site-type-wp": "v1.0.0-beta.2",
+        "easyengine/site-type-php": "v1.0.0-beta.1",
+        "easyengine/service-command": "v1.0.0-beta.1",
+        "easyengine/shell-command" : "v1.0.0-beta.2",
         "justinrainbow/json-schema": "~5.2.5",
-        "league/flysystem": "^1.0.19",
         "monolog/monolog": "^1.23",
         "mustache/mustache": "~2.4",
         "rmccue/requests": "~1.6",
@@ -47,10 +49,8 @@
         "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"
@@ -71,8 +71,7 @@
             "EE": "php"
         },
         "psr-4": {
-            "": "php/commands/src",
-            "AcmePhp\\Cli\\": "php/AcmePhp/Cli"
+            "": "php/commands/src"
         }
     },
     "extra": {