Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

Commit

Permalink
EZP-26128: Align eZ Platform with Sensio Distribution Bundle v5.0 (#133)
Browse files Browse the repository at this point in the history
* [Composer] EZP-26128: Bumped sensio/distribution-bundle to ^5.0

* EZP-26128: Removed the _configurator routing entry from app/config/routing_dev.yml

* EZP-26128: Added autoloading code in front controllers

* EZP-26128: Ensured tests are run with full error reporting

* fixup! EZP-26128: Ensured tests are run with full error reporting
  • Loading branch information
alongosz authored and andrerom committed Aug 22, 2016
1 parent ff19137 commit dfe122b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
4 changes: 0 additions & 4 deletions app/config/routing_dev.yml
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions app/phpunit.xml.dist
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion 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'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -23,7 +23,7 @@
"symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
"sensio/distribution-bundle": "~3.0",
"sensio/distribution-bundle": "^5.0",
"sensio/generator-bundle": "~2.3",
"incenteev/composer-parameter-handler": "~2.0",
"tedivm/stash-bundle": "~0.4",
Expand Down
7 changes: 4 additions & 3 deletions web/app.php
Expand Up @@ -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';
Expand Down

0 comments on commit dfe122b

Please sign in to comment.