Merge pull request #274 from symfony-cmf/error_pages

ElectricMaxxx · ElectricMaxxx · commit fcec18cd4d03 · 2016-02-10T21:59:32.000+01:00
Sync error page with core
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ cache:
 
 env:
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=302
+    - SYMFONY_DEPRECATIONS_HELPER=286
 
 matrix:
   include:
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -182,12 +182,12 @@ private function addErrorHandlerSection(NodeBuilder $nodeBuilder)
                 ->fixXmlConfig('template')
                 ->fixXmlConfig('exclusion_rule')
                 ->children()
-                    ->scalarNode('enable_parent_provider')->defaultValue(false)->end()
-                    ->scalarNode('enable_sibling_provider')->defaultValue(false)->end()
+                    ->booleanNode('enable_parent_provider')->defaultFalse()->end()
+                    ->booleanNode('enable_sibling_provider')->defaultFalse()->end()
                     ->arrayNode('templates')
                         ->useAttributeAsKey('format')
                         ->requiresAtLeastOneElement()
-                        ->defaultValue(array('html' => 'CmfSeoBundle:Exception:exception.html.twig'))
+                        ->defaultValue(array('html' => 'CmfSeoBundle:Exception:error.html.twig'))
                         ->prototype('scalar')->end()
                     ->end()
                     ->arrayNode('exclusion_rules')
diff --git a/Resources/config/schema/seo-1.0.xsd b/Resources/config/schema/seo-1.0.xsd
@@ -27,6 +27,11 @@
     </xsd:complexType>
 
     <xsd:complexType name="persistence">
+        <xsd:all minOccurs="0">
+            <xsd:element name="phpcr" type="persistence_layer" />
+            <xsd:element name="orm" type="persistence_layer" />
+        </xsd:all>
+
         <xsd:attribute name="phpcr" type="xsd:boolean" />
         <xsd:attribute name="orm" type="xsd:boolean" />
     </xsd:complexType>
@@ -128,4 +133,8 @@
         <xsd:attribute name="host" type="xsd:string" />
         <xsd:attribute name="methods" type="xsd:string" />
     </xsd:complexType>
+
+    <xsd:complexType name="persistence_layer">
+        <xsd:attribute name="manager-name" type="xsd:string"/>
+    </xsd:complexType>
 </xsd:schema>
diff --git a/Resources/views/Exception/error.html.twig b/Resources/views/Exception/error.html.twig
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="{{ _charset }}" />
+        <title>An Error Occurred: {{ status_text }}</title>
+    </head>
+    <body>
+        <h1>Oops! An Error Occurred</h1>
+        <h2>The server returned a "{{ status_code }} {{ status_text }}".</h2>
+
+        <p>
+            Something is broken. Please let us know what you were doing when this error occurred.
+            We will fix it as soon as possible. Sorry for any inconvenience caused.
+        </p>
+
+        {% if best_matches not is empty %}
+            <h3>Suggested pages</h3>
+
+            {% for group, matches in best_matches %}
+            <h4>{{ group|capitalize }}</h4>
+            <ul>
+                {% for match in matches %}
+                <li><a href="{{ path(match.name) }}">{{ match.name }}</a></li>
+                {% endfor %}
+            </ul>
+            {% endfor %}
+        {% endif %}
+    </body>
+</html>
diff --git a/Resources/views/Exception/exception.html.twig b/Resources/views/Exception/exception.html.twig
diff --git a/Tests/Unit/DependencyInjection/CmfSeoExtensionTest.php b/Tests/Unit/DependencyInjection/CmfSeoExtensionTest.php
@@ -246,7 +246,7 @@ public function testErrorHandlingPHPCR()
 
         $this->assertContainerBuilderHasParameter(
             'cmf_seo.error.templates',
-            array('html' => 'CmfSeoBundle:Exception:exception.html.twig')
+            array('html' => 'CmfSeoBundle:Exception:error.html.twig')
         );
 
         $this->assertContainerBuilderHasService(
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -185,7 +185,7 @@ public function testErrorHandlingXmlConfigurations()
                     ),
                 ),
                 'templates' => array(
-                    'html' => 'CmfSeoBundle:Exception:exception.html.twig',
+                    'html' => 'CmfSeoBundle:Exception:error.html.twig',
                 ),
             ),
             'translation_domain' => 'messages',
