Merge branch 'master' into studio_master

ezsystems · Aug 23, 2016 · 4384e05 · 4384e05
2 parents 7f21fe5 + 6f55d6b
commit 4384e05
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 24 deletions.
diff --git a/.env b/.env
@@ -12,8 +12,8 @@ DATABASE_PASSWORD=SetYourOwnPassword
 DATABASE_NAME=ezp
 
 ## Docker images (name and version)
-# For prod use the PHP image needs to be adjusted in Dockerfile, for dev you can optionally use ezsystems/php:7.0-v0-dev
 PHP_IMAGE=ezsystems/php:7.0-v0
+PHP_IMAGE_DEV=ezsystems/php:7.0-v0-dev
 NGINX_IMAGE=nginx:stable
 MYSQL_IMAGE=mariadb:10.0
 SELENIUM_IMAGE=selenium/standalone-firefox
@@ -23,5 +23,4 @@ REDIS_IMAGE=redis
 APP_PROD_IMAGE=my-ez-app
 
 # Install config
-INSTALL_PHP_IMAGE=ezsystems/php:7.0-v0-dev
 INSTALL_EZ_INSTALL_TYPE=clean
diff --git a/RUNNING_BEHAT.md b/RUNNING_BEHAT.md
@@ -1,5 +1,8 @@
 # Running the behat features
 
+*Note: If you want there is a way to run Behat using Docker setup, where you won't have to install any software other
+then Docker. See `doc/docker-compose/README.md` for further info.*
+
 ## Install selenium server
 Download the last version of the selenium server on the [download page](http://www.seleniumhq.org/download/).
 

diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -6,10 +6,6 @@ _profiler:
     resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
     prefix:   /_profiler
 
-_configurator:
-    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
-    prefix:   /_configurator
-
 # Symfony 2.6
 _errors:
     resource: "@TwigBundle/Resources/config/routing/errors.xml"

diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -5,9 +5,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="bootstrap.php.cache"
+         bootstrap="autoload.php"
 >
-
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>../src/*/*Bundle/Tests</directory>

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -1,7 +1,7 @@
 # This file contains the default configuration for behat testing using EzSystems/BehatBundle
 default:
     calls:
-        error_reporting: 14335 # E_ALL & ~E_USER_DEPRECATED
+        error_reporting: -1 # Report all PHP errors
     extensions:
         Behat\MinkExtension:
             base_url: 'http://localhost'

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "sensio/distribution-bundle": "^5.0",
+        "sensio/distribution-bundle": "^3.0.36|^4.0.6|^5.0",
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "tedivm/stash-bundle": "~0.4",

diff --git a/composer.lock b/composer.lock
diff --git a/doc/docker-compose/README.md b/doc/docker-compose/README.md
@@ -13,6 +13,14 @@
 This setup requires Docker Compose 1.7 or higher, and Docker 1.10 or higher. Defaults are set in `.env`, and
 files to ignore are set in `.dockerignore`. By default `.env` specifies that production image is built and setup for use.
 
+#### Before you begin: Install Docker & Docker-Compose
+
+Before jumping into steps below, make sure you have recent versions of [Docker & Docker-Compose](https://www.docker.com/)
+installed on your machine.
+
+*For Windows you'll also need to [install bash](https://msdn.microsoft.com/en-us/commandline/wsl/about), or adapt instructions below for Windows command line where needed.*
+
+
 #### Concept: Docker Compose "Building blocks" for eZ Platform
 
 The current Docker Compose files are made to be mixed and matched togtehr as you'd like. Currently available:
@@ -33,13 +41,6 @@ However below environment variable `COMPOSE_FILE` is used instead since this is
 `.env` file at root of the project.
 
 
-#### Before you begin: Install Docker & Docker-Compose
-
-Before jumping into steps below, make sure you have recent versions of [Docker & Docker-Compose](https://www.docker.com/)
-installed on your machine.
-
-*For Windows you'll also need to [install bash](https://msdn.microsoft.com/en-us/commandline/wsl/about), or adapt instructions below for Windows command line where needed.*
-
 ## Project setup
 
 ### Production / Demo "image" use
@@ -99,7 +100,7 @@ docker-compose -f doc/docker-compose/install.yml up --abort-on-container-exit
 docker-compose up -d --force-recreate
 ```
 
-*Last step is to execute behat scenarios using `behatphpcli` container which has access to web and selenium containers, example:*
+*Last step is to execute behat scenarios using `app` container which now has access to web and selenium containers, example:*
 ```
 docker-compose exec --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/behat -vv --profile=rest --suite=fullJson --tags=~@broken"
 ```

diff --git a/doc/docker-compose/install.yml b/doc/docker-compose/install.yml
@@ -13,7 +13,7 @@ services:
      - MYSQL_DATABASE=$DATABASE_NAME
 
   install_app:
-    image: ${INSTALL_PHP_IMAGE}
+    image: ${PHP_IMAGE_DEV}
     volumes:
      - ${COMPOSE_DIR}/../..:/var/www
      - ${COMPOSER_HOME}:/root/.composer

diff --git a/web/app.php b/web/app.php
@@ -18,10 +18,11 @@
 // Depending on SYMFONY_CLASSLOADER_FILE use custom class loader, otherwise use bootstrap cache, or autoload in debug
 if ($loaderFile = getenv('SYMFONY_CLASSLOADER_FILE')) {
     require_once $loaderFile;
-} elseif ($useDebugging) {
-    require_once __DIR__ . '/../app/autoload.php';
 } else {
-    require_once __DIR__ . '/../app/bootstrap.php.cache';
+    require_once __DIR__ . '/../app/autoload.php';
+    if (!$useDebugging) {
+        require_once __DIR__ . '/../app/bootstrap.php.cache';
+    }
 }
 
 require_once __DIR__ . '/../app/AppKernel.php';