Merge branch 'master-v4-merge'

Author: rahulsprajapati

.editorconfig

@@ -0,0 +1,23 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# http://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+
+[*.{json,yml,feature}]
+indent_style = space
+indent_size = 2
+
+[composer.json]
+indent_style = space
+indent_size = 4

.gitattributes

@@ -0,0 +1,3 @@
+# Auto detect text files and perform EOL normalization
+* text=auto eol=lf
+tests/data/*-win.php eol=crlf

.github/CONTRIBUTING.md

@@ -10,8 +10,8 @@ Please attach the output of following command when open a new support request.
 
 ```bash
 lsb_release -a
-ee -v
-ee info
+ee cli version
+ee cli info
 wp --allow-root --info
 ```
 

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,9 @@
 This issue tracker is only for issues related to EasyEngine. Please use http://community.rtcamp.com/c/easyengine for support questions.
 
-If you feel the issue is a EasyEngine core specific issue, please attach the output of the following commands.
+If you feel the issue is a EasyEngine specific issue, please attach the output of the following commands.
 
 System Information
+- [ ] ee cli info
 - [ ] lsb_release -a
-- [ ] ee -v
-- [ ] ee info
-- [ ] wp --allow-root --info
+- [ ] docker version
+- [ ] docker-compose version

.gitignore

@@ -1,66 +1,21 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-.idea/
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-
-# Vim .swp file
-*.swp
-
-# Folder created for Nose testing
-bin/
-coverage_report/
-include/
-local/
-man/
+.DS_Store
+config.yml
+PHAR_BUILD_VERSION
+/cache
+/packages
+/vendor
+/*.phar
+/phpunit.xml.dist
+/codesniffer
+/PHP_Codesniffer-VariableAnalysis
+.*.swp
+launch.json
+ee.iml
+modules.xml
+php.xml
+php-test-framework.xml
+vcs.xml
+workspace.xml
+profiles_settings.xml
+Project_Default.xml
+.idea

.travis.yml

@@ -1,114 +1,70 @@
-notifications:
-  slack: easyengine:76AI30tP8P8AcNTaWaQ9ZAT7
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/bd77a26eab56de803949
-      - https://webhooks.gitter.im/e/e3e2feb8384c77bf1a8a
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+sudo: required
+
+language: php
+php: 7.0
 
-language: bash
+env:
+  global:
+    - PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
 
 before_install:
-  - rm -rf ~/.gnupg
+  - 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:
+  - |
+    # 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:
-  - sudo rm -rf /etc/mysql/
-  - sudo bash -c 'echo example.com > /etc/hostname'
-  - sudo service hostname restart
-  - sudo apt-get -qq purge mysql* graphviz*
-  - sudo apt-get -qq autoremove
-  - sudo apt-get update
+  - composer validate
+  - ./ci/prepare.sh
 
 script:
-  - lsb_release -a
-  - unset LANG
-  - sudo bash -c 'echo -e "[user]\n\tname = abc\n\temail = [email protected]" > /home/travis/.gitconfig'
-  - sudo echo "Travis Banch = $TRAVIS_BRANCH"
-  - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt
-  - sudo bash install $TRAVIS_BRANCH
-  - sudo ee --help
-  - sudo ee stack install || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee stack install --web || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee stack install --admin || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site create html.net --html || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create php.com --php || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create mysql.com --mysql || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site1.com --wp || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site create site2.net --wp --wpsc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site3.net --wp --w3tc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site4.com --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site4.net --wp --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site4.org --wpfc --wp || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site5.com --wpsubdir || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site create site6.com --wpsubdir --wpsc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site7.com --wpsubdir --w3tc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site8.com --wpsubdir --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site8.net --wpfc --wpsubdir || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site9.com --wpsubdomain || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site create site10.org --wpsubdomain --wpsc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site11.org --wpsubdomain --w3tc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site12.org --wpsubdomain --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site12.in --wpfc --wpsubdomain || sudo tail -n50 /var/log/ee/ee.log
-
-  - yes | sudo ee site create site.hhvm.pagespeed2.com --wpsc --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed4.com --wpfc --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed5.com --wpsubdir --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed6.com --wpsubdir --wpsc --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed8.com --wpsubdir --wpfc --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed9.com --wpsubdomain --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed10.org --wpsubdomain --wpsc --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site.hhvm.pagespeed12.in --wpfc --wpsubdomain --hhvm || sudo tail -n50 /var/log/ee/ee.log
+  - sudo ./vendor/bin/behat
+  - ./ci/test-commands.sh
 
-  - sudo ee site create site1.localtest.me --php --mysql || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site2.localtest.me --mysql --html || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site3.localtest.me --php --html || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site4.localtest.me --wp --wpsubdomain || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create site5.localtest.me --wp --wpsubdir --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site6.localtest.me --wpredis || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site7.localtest.me --wpsubdomain --wpredis || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site create site8.localtest.me --wpsubdir --wpredis || sudo tail -n50 /var/log/ee/ee.log
+after_script:
+  - cat /opt/easyengine/logs/install.log
+  - cat /opt/easyengine/logs/ee.log
 
+jobs:
+  include:
+    - stage: deploy
+      env: DEPLOY_BRANCH=master-v4
+      after_success: ./ci/deploy.sh
 
-  - sudo ee debug --all || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee debug --all=off || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee debug site12.net || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee debug site12.net --all=off || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create 1.com --html || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create 2.com --php || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create 3.com --mysql || sudo tail -n50 /var/log/ee/ee.log
+cache:
+  directories:
+    - $HOME/.composer/cache
 
-  - sudo ee site update 1.com --wp || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update 2.com --wpsubdir || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update 3.com --wpsubdomain || sudo tail -n50 /var/log/ee/ee.log
+branches:
+  only:
+    - develop-v4
+    - master-v4
 
-  - sudo ee site update site1.com --wp --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update site1.com --wp --w3tc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update site1.com --wp --wpsc || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site update site1.com --wpredis || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site update site5.com --wpsubdir --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update site5.com --wpsubdir --wpsc || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site update site9.com --wpsubdomain --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update site9.com --wpsubdomain --wpsc || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site update site.hhvm.pagespeed12.in --hhvm=off || sudo tail -n50 /var/log/ee/ee.log
-  - yes | sudo ee site update site9.com --hhvm || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site info site.hhvm.pagespeed12.in || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site info site9.com || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site create www.site-1.com --wp || sudo tail -n50 /var/log/ee/ee.log|| sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site create www.subsite.site-1.com --wpfc || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site update www.subsite.site-1.com --wp || sudo tail -n50 /var/log/ee/ee.log
-  - sudo ee site delete www.subsite.site-1.com --all --no-prompt || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ee site delete site12.in --all --no-prompt || sudo tail -n50 /var/log/ee/ee.log
-
-  - sudo ls /var/www/
-  - sudo wp --allow-root --info
-  - sudo bash -c 'cat /var/log/ee/ee.log'
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+addons:
+  apt:
+    packages:
+      - docker-ce