Merge branch 'v1.1.0'

Markei · Dec 29, 2017 · fc0243a · fc0243a
2 parents dda5fd4 + a9abadf
commit fc0243a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/Markei/SilexWebsiteFramework/Application.php b/src/Markei/SilexWebsiteFramework/Application.php
@@ -12,6 +12,8 @@
 use Markei\SilexWebsiteFramework\Controllers\ErrorController;
 use Markei\SilexWebsiteFramework\Twig\ImagineExtension;
 use Markei\SilexWebsiteFramework\Twig\ConfigExtension;
+use Silex\Provider\CsrfServiceProvider;
+use Symfony\Component\Form\FormRenderer;
 
 /**
  * @author maartendekeizer
@@ -82,6 +84,7 @@ public function boot()
     {
         parent::boot();
         $this->bootTwig();
+        $this->bootDatabase();
         $this->bootForm();
         $this->bootTranslation();
         $this->bootSwiftmailer();
@@ -100,6 +103,12 @@ protected function bootTwig()
             $options['twig.options']['cache'] = $this['app.cache'] . DIRECTORY_SEPARATOR . 'twig';
         }
         $this->register(new TwigServiceProvider(), $options);
+        // patch for SF 3.4 break / https://github.com/silexphp/Silex/issues/1579
+        $this->extend('twig.runtimes', function ($runtimes, $app) {
+            return array_merge($runtimes, [
+                FormRenderer::class => 'twig.form.renderer',
+            ]);
+        });
         $this->extend('twig', function (\Twig_Environment $twig, Application $app) {
             $twig->addExtension(new ImagineExtension($app));
             $twig->addExtension(new ConfigExtension($app));
@@ -114,6 +123,7 @@ protected function bootForm()
     {
         $this->register(new FormServiceProvider(), array('form.secret' => $this['form.secret']));
         $this->register(new ValidatorServiceProvider(), array());
+        $this->register(new CsrfServiceProvider());
     }
 
     /**
@@ -142,7 +152,16 @@ protected function bootSwiftmailer()
             ));
     }
 
-    /**
+    /**
+     * Boots the Database Service Provider
+     * It's empty by default, please override with your own implementation
+     */
+    protected function bootDatabase()
+    {
+        //
+    }
+
+    /**
      * Get an array of options for Twig configuration
      * @return array
      */

diff --git a/src/Markei/SilexWebsiteFramework/Controllers/ErrorController.php b/src/Markei/SilexWebsiteFramework/Controllers/ErrorController.php
@@ -30,7 +30,8 @@ public function internalServerErrorAction(\Exception $e)
     {
         $parameters = array(
                 'message' => $e->getMessage(),
-                'debug' => $this->app['debug']
+                'debug' => $this->app['debug'],
+                'trace' => $e->getTraceAsString()
             );
 
         return $this->twig->render('Error/internalServerError.html.twig', $parameters);

diff --git a/src/Markei/SilexWebsiteFramework/Resources/views/Error/internalServerError.html.twig b/src/Markei/SilexWebsiteFramework/Resources/views/Error/internalServerError.html.twig
@@ -9,6 +9,7 @@
     <p>An internal server error occurred. Please try again later.</p>
 {% if debug %}
     <h2>Debug information (only available when debug is activated)</h2>
-    <p class="error-message">{{ message }}</p>
+    <p class="error-message"><strong>{{ message }}</strong></p>
+    <p class="error-message">{{ trace|nl2br }}</p>
 {% endif %}
 {% endblock %}