moved ErrorHandler management to the distributions
This commit is contained in:
parent
0f0e5817b1
commit
ca3c5e652e
@ -9,6 +9,9 @@ timeline closely anyway.
|
|||||||
beta1 to beta2
|
beta1 to beta2
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
|
* The ``error_handler`` setting has been removed. The ``ErrorHandler`` class
|
||||||
|
is now managed directly by Symfony SE in ``AppKernel``.
|
||||||
|
|
||||||
* The Doctrine metadata files has moved from
|
* The Doctrine metadata files has moved from
|
||||||
``Resources/config/doctrine/metadata/orm/`` to ``Resources/config/`` and the
|
``Resources/config/doctrine/metadata/orm/`` to ``Resources/config/`` and the
|
||||||
extension from ``.dcm.yml`` to ``.orm.dcm.yml``
|
extension from ``.dcm.yml`` to ``.orm.dcm.yml``
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
framework:
|
framework:
|
||||||
charset: UTF-8
|
charset: UTF-8
|
||||||
error_handler: null
|
|
||||||
secret: xxxxxxxxxx
|
secret: xxxxxxxxxx
|
||||||
csrf_protection:
|
csrf_protection:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
@ -40,7 +40,6 @@ class Configuration implements ConfigurationInterface
|
|||||||
->scalarNode('cache_warmer')->defaultValue(!$this->debug)->end()
|
->scalarNode('cache_warmer')->defaultValue(!$this->debug)->end()
|
||||||
->scalarNode('charset')->end()
|
->scalarNode('charset')->end()
|
||||||
->scalarNode('secret')->isRequired()->end()
|
->scalarNode('secret')->isRequired()->end()
|
||||||
->scalarNode('error_handler')->end()
|
|
||||||
->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
|
->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end()
|
||||||
->scalarNode('ide')->defaultNull()->end()
|
->scalarNode('ide')->defaultNull()->end()
|
||||||
->booleanNode('test')->end()
|
->booleanNode('test')->end()
|
||||||
|
@ -67,17 +67,6 @@ class FrameworkExtension extends Extension
|
|||||||
|
|
||||||
$container->setParameter('kernel.secret', $config['secret']);
|
$container->setParameter('kernel.secret', $config['secret']);
|
||||||
|
|
||||||
if (isset($config['error_handler'])) {
|
|
||||||
if (false === $config['error_handler']) {
|
|
||||||
$container->getDefinition('error_handler')->setMethodCalls(array());
|
|
||||||
} else {
|
|
||||||
$container
|
|
||||||
->getDefinition('error_handler')->addMethodCall('register', array())
|
|
||||||
->replaceArgument(0, $config['error_handler'])
|
|
||||||
;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$container->getDefinition('exception_listener')->replaceArgument(0, $config['exception_controller']);
|
$container->getDefinition('exception_listener')->replaceArgument(0, $config['exception_controller']);
|
||||||
|
|
||||||
if (!empty($config['test'])) {
|
if (!empty($config['test'])) {
|
||||||
|
@ -34,16 +34,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
|
|||||||
*/
|
*/
|
||||||
class FrameworkBundle extends Bundle
|
class FrameworkBundle extends Bundle
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* Boots the Bundle.
|
|
||||||
*/
|
|
||||||
public function boot()
|
|
||||||
{
|
|
||||||
if ($this->container->has('error_handler')) {
|
|
||||||
$this->container->get('error_handler');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function build(ContainerBuilder $container)
|
public function build(ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
parent::build($container);
|
parent::build($container);
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
<parameters>
|
<parameters>
|
||||||
<parameter key="event_dispatcher.class">Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher</parameter>
|
<parameter key="event_dispatcher.class">Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher</parameter>
|
||||||
<parameter key="http_kernel.class">Symfony\Bundle\FrameworkBundle\HttpKernel</parameter>
|
<parameter key="http_kernel.class">Symfony\Bundle\FrameworkBundle\HttpKernel</parameter>
|
||||||
<parameter key="error_handler.class">Symfony\Component\HttpKernel\Debug\ErrorHandler</parameter>
|
|
||||||
<parameter key="filesystem.class">Symfony\Component\HttpKernel\Util\Filesystem</parameter>
|
<parameter key="filesystem.class">Symfony\Component\HttpKernel\Util\Filesystem</parameter>
|
||||||
<parameter key="cache_warmer.class">Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate</parameter>
|
<parameter key="cache_warmer.class">Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate</parameter>
|
||||||
<parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
|
<parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
|
||||||
@ -18,10 +17,6 @@
|
|||||||
<argument type="service" id="service_container" />
|
<argument type="service" id="service_container" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="error_handler" class="%error_handler.class%">
|
|
||||||
<argument /> <!-- level (null by default) -->
|
|
||||||
</service>
|
|
||||||
|
|
||||||
<service id="http_kernel" class="%http_kernel.class%">
|
<service id="http_kernel" class="%http_kernel.class%">
|
||||||
<argument type="service" id="event_dispatcher" />
|
<argument type="service" id="event_dispatcher" />
|
||||||
<argument type="service" id="service_container" />
|
<argument type="service" id="service_container" />
|
||||||
|
Reference in New Issue
Block a user