symfony · sustmi · Apr 15, 2017 · Apr 15, 2017 · Apr 15, 2017 · Apr 15, 2017
diff --git a/composer.json b/composer.json
@@ -46,6 +46,7 @@
         "symfony/dom-crawler": "self.version",
         "symfony/dotenv": "self.version",
         "symfony/event-dispatcher": "self.version",
+        "symfony/error-page-bundle": "self.version",
         "symfony/expression-language": "self.version",
         "symfony/filesystem": "self.version",
         "symfony/finder": "self.version",

diff --git a/src/Symfony/Bundle/ErrorPageBundle/.gitignore b/src/Symfony/Bundle/ErrorPageBundle/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/src/Symfony/Bundle/ErrorPageBundle/CHANGELOG.md b/src/Symfony/Bundle/ErrorPageBundle/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+4.0.0
+-----
+
+ * Separated from TwigBundle
diff --git a/...Bundle/Controller/ExceptionController.php → ...Bundle/Controller/ExceptionController.php b/...Bundle/Controller/ExceptionController.php → ...Bundle/Controller/ExceptionController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\Controller;
+namespace Symfony\Bundle\ErrorPageBundle\Controller;
 
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
@@ -105,22 +105,22 @@ protected function findTemplate(Request $request, $format, $code, $showException
 
         // For error pages, try to find a template for the specific HTTP status code and format
         if (!$showException) {
-            $template = sprintf('@Twig/Exception/%s%s.%s.twig', $name, $code, $format);
+            $template = sprintf('@ErrorPage/Exception/%s%s.%s.twig', $name, $code, $format);
             if ($this->templateExists($template)) {
                 return $template;
             }
         }
 
         // try to find a template for the given format
-        $template = sprintf('@Twig/Exception/%s.%s.twig', $name, $format);
+        $template = sprintf('@ErrorPage/Exception/%s.%s.twig', $name, $format);
         if ($this->templateExists($template)) {
             return $template;
         }
 
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return sprintf('@Twig/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
+        return sprintf('@ErrorPage/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
     }
 
     // to be removed when the minimum required version of Twig is >= 3.0

diff --git a/...dle/Controller/PreviewErrorController.php → ...dle/Controller/PreviewErrorController.php b/...dle/Controller/PreviewErrorController.php → ...dle/Controller/PreviewErrorController.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\Controller;
+namespace Symfony\Bundle\ErrorPageBundle\Controller;
 
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;

diff --git a/...ection/Compiler/ExceptionListenerPass.php → ...ection/Compiler/ExceptionListenerPass.php b/...ection/Compiler/ExceptionListenerPass.php → ...ection/Compiler/ExceptionListenerPass.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
+namespace Symfony\Bundle\ErrorPageBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Registers the Twig exception listener if Twig is registered as a templating engine.
+ * Registers the exception listener if Twig is registered as a templating engine.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -29,11 +29,11 @@ public function process(ContainerBuilder $container)
 
         // register the exception controller only if Twig is enabled and required dependencies do exist
         if (!class_exists('Symfony\Component\Debug\Exception\FlattenException') || !interface_exists('Symfony\Component\EventDispatcher\EventSubscriberInterface')) {
-            $container->removeDefinition('twig.exception_listener');
+            $container->removeDefinition('error_page.exception_listener');
         } elseif ($container->hasParameter('templating.engines')) {
             $engines = $container->getParameter('templating.engines');
             if (!in_array('twig', $engines)) {
-                $container->removeDefinition('twig.exception_listener');
+                $container->removeDefinition('error_page.exception_listener');
             }
         }
     }

diff --git a/src/Symfony/Bundle/ErrorPageBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/ErrorPageBundle/DependencyInjection/Configuration.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\ErrorPageBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+/**
+ * ErrorPageExtension configuration structure.
+ *
+ * @author Jeremy Mikola <jmikola@gmail.com>
+ */
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * Generates the configuration tree builder.
+     *
+     * @return TreeBuilder The tree builder
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('error_page');
+
+        $rootNode
+            ->children()
+                ->scalarNode('exception_controller')->defaultValue('error_page.controller.exception:showAction')->end()
+            ->end()
+        ;
+
+        return $treeBuilder;
+    }
+}
diff --git a/src/Symfony/Bundle/ErrorPageBundle/DependencyInjection/ErrorPageExtension.php b/src/Symfony/Bundle/ErrorPageBundle/DependencyInjection/ErrorPageExtension.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\ErrorPageBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+
+/**
+ * ErrorPageExtension.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jeremy Mikola <jmikola@gmail.com>
+ */
+class ErrorPageExtension extends Extension
+{
+    /**
+     * @param array            $configs
+     * @param ContainerBuilder $container
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('error_page.xml');
+
+        $configuration = $this->getConfiguration($configs, $container);
+
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $container->setParameter('error_page.exception_listener.controller', $config['exception_controller']);
+    }
+}
diff --git a/src/Symfony/Bundle/ErrorPageBundle/ErrorPageBundle.php b/src/Symfony/Bundle/ErrorPageBundle/ErrorPageBundle.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\ErrorPageBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Bundle\ErrorPageBundle\DependencyInjection\Compiler\ExceptionListenerPass;
+
+/**
+ * ErrorPageBundle
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ErrorPageBundle extends Bundle
+{
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new ExceptionListenerPass());
+    }
+}
diff --git a/src/Symfony/Bundle/ErrorPageBundle/LICENSE b/src/Symfony/Bundle/ErrorPageBundle/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2017 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Symfony/Bundle/ErrorPageBundle/README.md b/src/Symfony/Bundle/ErrorPageBundle/README.md
@@ -0,0 +1,10 @@
+ErrorPageBundle
+==========
+
+Resources
+---------
+
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/config/error_page.xml b/src/Symfony/Bundle/ErrorPageBundle/Resources/config/error_page.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="error_page.exception_listener" class="Symfony\Component\HttpKernel\EventListener\ExceptionListener">
+            <tag name="kernel.event_subscriber" />
+            <tag name="monolog.logger" channel="request" />
+            <argument>%error_page.exception_listener.controller%</argument>
+            <argument type="service" id="logger" on-invalid="null" />
+        </service>
+
+        <service id="error_page.controller.exception" class="Symfony\Bundle\ErrorPageBundle\Controller\ExceptionController">
+            <argument type="service" id="twig" />
+            <argument>%kernel.debug%</argument>
+        </service>
+
+        <service id="error_page.controller.preview_error" class="Symfony\Bundle\ErrorPageBundle\Controller\PreviewErrorController">
+            <argument type="service" id="http_kernel" />
+            <argument>%error_page.exception_listener.controller%</argument>
+        </service>
+    </services>
+</container>
diff --git a/...undle/Resources/config/routing/errors.xml → ...undle/Resources/config/routing/errors.xml b/...undle/Resources/config/routing/errors.xml → ...undle/Resources/config/routing/errors.xml
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/error.atom.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/error.atom.twig
@@ -0,0 +1 @@
+{{ include('@ErrorPage/Exception/error.xml.twig') }}
diff --git a/.../Resources/views/Exception/error.css.twig → .../Resources/views/Exception/error.css.twig b/.../Resources/views/Exception/error.css.twig → .../Resources/views/Exception/error.css.twig
diff --git a/...Resources/views/Exception/error.html.twig → ...Resources/views/Exception/error.html.twig b/...Resources/views/Exception/error.html.twig → ...Resources/views/Exception/error.html.twig
diff --git a/...e/Resources/views/Exception/error.js.twig → ...e/Resources/views/Exception/error.js.twig b/...e/Resources/views/Exception/error.js.twig → ...e/Resources/views/Exception/error.js.twig
diff --git a/...Resources/views/Exception/error.json.twig → ...Resources/views/Exception/error.json.twig b/...Resources/views/Exception/error.json.twig → ...Resources/views/Exception/error.json.twig
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/error.rdf.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/error.rdf.twig
@@ -0,0 +1 @@
+{{ include('@ErrorPage/Exception/error.xml.twig') }}
diff --git a/.../Resources/views/Exception/error.txt.twig → .../Resources/views/Exception/error.txt.twig b/.../Resources/views/Exception/error.txt.twig → .../Resources/views/Exception/error.txt.twig
diff --git a/.../Resources/views/Exception/error.xml.twig → .../Resources/views/Exception/error.xml.twig b/.../Resources/views/Exception/error.xml.twig → .../Resources/views/Exception/error.xml.twig
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.atom.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.atom.twig
@@ -0,0 +1 @@
+{{ include('@ErrorPage/Exception/exception.xml.twig', { exception: exception }) }}
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.css.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.css.twig
@@ -0,0 +1,3 @@
+/*
+{{ include('@ErrorPage/Exception/exception.txt.twig', { exception: exception }) }}
+*/
diff --git a/...urces/views/Exception/exception.html.twig → ...urces/views/Exception/exception.html.twig b/...urces/views/Exception/exception.html.twig → ...urces/views/Exception/exception.html.twig
@@ -4,7 +4,7 @@
             <h2 class="exception-hierarchy">
                 {% for previousException in exception.allPrevious|reverse %}
                     {{ previousException.class|abbr_class }}
-                    <span class="icon">{{ include('@Twig/images/chevron-right.svg') }}</span>
+                    <span class="icon">{{ include('@ErrorPage/images/chevron-right.svg') }}</span>
                 {% endfor %}
                 {{ exception.class|abbr_class }}
             </h2>
@@ -20,7 +20,7 @@
             </h1>
 
             <div class="exception-illustration hidden-xs-down">
-                {{ include('@Twig/images/symfony-ghost.svg') }}
+                {{ include('@ErrorPage/images/symfony-ghost.svg') }}
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
 
             <div class="tab-content">
                 {% for i, e in exception_as_array %}
-                    {{ include('@Twig/Exception/traces.html.twig', { exception: e, index: loop.index, expand: i in _exceptions_with_user_code or (_exceptions_with_user_code is empty and loop.first) }, with_context = false) }}
+                    {{ include('@ErrorPage/Exception/traces.html.twig', { exception: e, index: loop.index, expand: i in _exceptions_with_user_code or (_exceptions_with_user_code is empty and loop.first) }, with_context = false) }}
                 {% endfor %}
             </div>
         </div>
@@ -61,7 +61,7 @@
 
             <div class="tab-content">
                 {% if logger %}
-                    {{ include('@Twig/Exception/logs.html.twig', { logs: logger.logs }, with_context = false)  }}
+                    {{ include('@ErrorPage/Exception/logs.html.twig', { logs: logger.logs }, with_context = false)  }}
                 {% else %}
                     <div class="empty">
                         <p>No log messages</p>
@@ -81,7 +81,7 @@
 
             <div class="tab-content">
                 {% for e in exception_as_array %}
-                    {{ include('@Twig/Exception/traces_text.html.twig', { exception: e, index: loop.index, num_exceptions: loop.length }, with_context = false) }}
+                    {{ include('@ErrorPage/Exception/traces_text.html.twig', { exception: e, index: loop.index, num_exceptions: loop.length }, with_context = false) }}
                 {% endfor %}
             </div>
         </div>

diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.js.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.js.twig
@@ -0,0 +1,3 @@
+/*
+{{ include('@ErrorPage/Exception/exception.txt.twig', { exception: exception }) }}
+*/
diff --git a/...urces/views/Exception/exception.json.twig → ...urces/views/Exception/exception.json.twig b/...urces/views/Exception/exception.json.twig → ...urces/views/Exception/exception.json.twig
diff --git a/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.rdf.twig b/src/Symfony/Bundle/ErrorPageBundle/Resources/views/Exception/exception.rdf.twig
@@ -0,0 +1 @@
+{{ include('@ErrorPage/Exception/exception.xml.twig', { exception: exception }) }}
diff --git a/...ources/views/Exception/exception.txt.twig → ...ources/views/Exception/exception.txt.twig b/...ources/views/Exception/exception.txt.twig → ...ources/views/Exception/exception.txt.twig
@@ -2,6 +2,6 @@
 [message] {{ exception.message }}
 {% for i, e in exception.toarray %}
 [{{ i + 1 }}] {{ e.class }}: {{ e.message }}
-{{ include('@Twig/Exception/traces.txt.twig', { exception: e }, with_context = false) }}
+{{ include('@ErrorPage/Exception/traces.txt.twig', { exception: e }, with_context = false) }}
 
 {% endfor %}
diff --git a/...ources/views/Exception/exception.xml.twig → ...ources/views/Exception/exception.xml.twig b/...ources/views/Exception/exception.xml.twig → ...ources/views/Exception/exception.xml.twig
@@ -3,7 +3,7 @@
 <error code="{{ status_code }}" message="{{ status_text }}">
 {% for e in exception.toarray %}
     <exception class="{{ e.class }}" message="{{ e.message }}">
-{{ include('@Twig/Exception/traces.xml.twig', { exception: e }, with_context = false) }}
+{{ include('@ErrorPage/Exception/traces.xml.twig', { exception: e }, with_context = false) }}
     </exception>
 {% endfor %}
 </error>
diff --git a/.../views/Exception/exception_full.html.twig → .../views/Exception/exception_full.html.twig b/.../views/Exception/exception_full.html.twig → .../views/Exception/exception_full.html.twig
@@ -1,4 +1,4 @@
-{% extends '@Twig/layout.html.twig' %}
+{% extends '@ErrorPage/layout.html.twig' %}
 
 {% block head %}
     <style>
@@ -138,5 +138,5 @@
 {% endblock %}
 
 {% block body %}
-    {% include '@Twig/Exception/exception.html.twig' %}
+    {% include '@ErrorPage/Exception/exception.html.twig' %}
 {% endblock %}
diff --git a/.../Resources/views/Exception/logs.html.twig → .../Resources/views/Exception/logs.html.twig b/.../Resources/views/Exception/logs.html.twig → .../Resources/views/Exception/logs.html.twig
diff --git a/...Resources/views/Exception/trace.html.twig → ...Resources/views/Exception/trace.html.twig b/...Resources/views/Exception/trace.html.twig → ...Resources/views/Exception/trace.html.twig
@@ -1,6 +1,6 @@
 {% if trace.file|default(false) %}
-    <span class="icon icon-close">{{ include('@Twig/images/icon-minus-square.svg') }}</span>
-    <span class="icon icon-open">{{ include('@Twig/images/icon-plus-square.svg') }}</span>
+    <span class="icon icon-close">{{ include('@ErrorPage/images/icon-minus-square.svg') }}</span>
+    <span class="icon icon-open">{{ include('@ErrorPage/images/icon-plus-square.svg') }}</span>
 {% endif %}
 
 {% if trace.function %}

diff --git a/.../Resources/views/Exception/trace.txt.twig → .../Resources/views/Exception/trace.txt.twig b/.../Resources/views/Exception/trace.txt.twig → .../Resources/views/Exception/trace.txt.twig
diff --git a/...esources/views/Exception/traces.html.twig → ...esources/views/Exception/traces.html.twig b/...esources/views/Exception/traces.html.twig → ...esources/views/Exception/traces.html.twig
@@ -10,8 +10,8 @@
                         </span>
                         {{ exception.class|split('\\')|last }}
 
-                        <span class="icon icon-close">{{ include('@Twig/images/icon-minus-square-o.svg') }}</span>
-                        <span class="icon icon-open">{{ include('@Twig/images/icon-plus-square-o.svg') }}</span>
+                        <span class="icon icon-close">{{ include('@ErrorPage/images/icon-minus-square-o.svg') }}</span>
+                        <span class="icon icon-open">{{ include('@ErrorPage/images/icon-plus-square-o.svg') }}</span>
                     </h3>
 
                     {% if exception.message is not empty and index > 1 %}
@@ -28,7 +28,7 @@
             {% if _display_code_snippet %}{% set _is_first_user_code = false %}{% endif %}
             <tr>
                 <td class="trace-line {{ trace.file|default(false) ? 'sf-toggle' }}" data-toggle-selector="#trace-html-{{ index }}-{{ i }}" data-toggle-initial="{{ _display_code_snippet ? 'display' }}">
-                    {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace }, with_context = false) }}
+                    {{ include('@ErrorPage/Exception/trace.html.twig', { prefix: index, i: i, trace: trace }, with_context = false) }}
                 </td>
             </tr>
         {% endfor %}

diff --git a/...Resources/views/Exception/traces.txt.twig → ...Resources/views/Exception/traces.txt.twig b/...Resources/views/Exception/traces.txt.twig → ...Resources/views/Exception/traces.txt.twig
@@ -6,7 +6,7 @@
 {% endif %}
 
 {% for trace in exception.trace %}
-  at {{ include('@Twig/Exception/trace.txt.twig', { trace: trace }, with_context = false) }}
+  at {{ include('@ErrorPage/Exception/trace.txt.twig', { trace: trace }, with_context = false) }}
 {% endfor %}
 </pre>
 {% endif %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{ include('@ErrorPage/Exception/error.xml.twig') }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{ include('@ErrorPage/Exception/exception.xml.twig', { exception: exception }) }}