Merge pull request #112 from magento/develop

magento · Dec 5, 2017 · 603817a · 603817a
2 parents 4e02921 + ba35173
commit 603817a
Show file tree

Hide file tree

Showing 192 changed files with 10,389 additions and 1,887 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ vendor
 composer.phar
 phpunit.xml
 composer.lock
-
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,10 @@ dist: trusty
 addons:
   hosts:
       - magento2.travis
+      - magento2.docker
 services:
   - mysql
+  - docker
 language: php
 php:
   - 7.0
@@ -18,10 +20,13 @@ env:
     - TEST_SUITE=static
     - TEST_SUITE=unit
     - TEST_SUITE=integration
+    - TEST_SUITE=integration-docker
 matrix:
   exclude:
     - php: 7.1
       env: TEST_SUITE=integration
+    - php: 7.1
+      env: TEST_SUITE=integration-docker
 cache:
   apt: true
   directories:
@@ -31,5 +36,7 @@ install: composer install --no-interaction
 script:
   - if [ $TEST_SUITE == "static" ]; then phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n; fi;
   - if [ $TEST_SUITE == "static" ]; then phpmd src xml tests/static/phpmd-ruleset.xml; fi;
+  - if [ $TEST_SUITE == "static" ]; then phpunit --configuration tests/unit/phpunit.xml.dist --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml $MIN_CODE_COVERAGE; fi;
   - if [ $TEST_SUITE == "unit" ]; then phpunit --configuration tests/unit/phpunit.xml.dist; fi;
   - if [ $TEST_SUITE == "integration" ]; then phpunit --verbose --configuration tests/integration/phpunit.xml.dist; fi;
+  - if [ $TEST_SUITE == "integration-docker" ]; then cd tests/integration-docker && docker-compose run cli magento-command; fi;
diff --git a/autoload.php b/autoload.php
@@ -11,6 +11,10 @@
  */
 $magentoRoot = __DIR__ . '/../../../';
 
+if (!defined('BP')) {
+    define('BP', realpath($magentoRoot));
+}
+
 if (!file_exists($magentoRoot . '/app/etc/NonComposerComponentRegistration.php') &&
     file_exists($magentoRoot . '/init/app/etc/NonComposerComponentRegistration.php')
 ) {
@@ -25,3 +29,5 @@
         return require $file;
     }
 }
+
+throw new \RuntimeException('Required file \'autoload.php\' was not found.');
diff --git a/bin/ece-tools b/bin/ece-tools
@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/../autoload.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 $application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
 $application->run();
diff --git a/bootstrap.php b/bootstrap.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+error_reporting(E_ALL);
+date_default_timezone_set('UTC');
+
+require_once __DIR__ . '/autoload.php';
+
+$handler = new \Magento\MagentoCloud\App\ErrorHandler();
+set_error_handler([$handler, 'handle']);
diff --git a/composer.json b/composer.json
@@ -11,24 +11,25 @@
     "monolog/monolog": "^1.17",
     "symfony/console": "^2.6",
     "illuminate/container": "^5.5",
+    "illuminate/config": "^5.5",
     "psr/log": "^1.0",
     "psr/container": "^1.0",
     "composer/composer": "@stable",
-    "composer/semver": "^1.4"
+    "composer/semver": "^1.4",
+    "symfony/yaml": "^3.3"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.2.0",
     "squizlabs/php_codesniffer": " ^3.0",
     "phpmd/phpmd": "@stable",
     "php-mock/php-mock-phpunit": "^2.0",
-    "phpunit/php-code-coverage": "^5.2",
-    "illuminate/config": "^5.5"
+    "phpunit/php-code-coverage": "^5.2"
   },
   "bin": [
+    "bin/ece-tools",
     "m2-ece-build",
     "m2-ece-deploy",
-    "m2-ece-scd-dump",
-    "bin/ece-tools"
+    "m2-ece-scd-dump"
   ],
   "autoload": {
     "psr-4": {

diff --git a/m2-ece-build b/m2-ece-build
@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/bootstrap.php';
 
 $application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
 $application->setDefaultCommand('build');

diff --git a/m2-ece-deploy b/m2-ece-deploy
@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/bootstrap.php';
 
 $application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
 $application->setDefaultCommand('deploy');

diff --git a/m2-ece-scd-dump b/m2-ece-scd-dump
@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/autoload.php';
+require_once __DIR__ . '/bootstrap.php';
 
 $application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
 $application->setDefaultCommand('dump');