exception handling, simplified highlighting

l3pp4rd · Jan 19, 2012 · 9e50acf · 9e50acf
1 parent 574ff7e
commit 9e50acf
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/app/Resources/TwigBundle/views/Exception/error404.html.twig b/app/Resources/TwigBundle/views/Exception/error404.html.twig
@@ -7,5 +7,8 @@
 <body>
     <h1>Oops! An Error Occurred</h1>
     <h2>The server returned a "{{ status_code }} {{ status_text }}".</h2>
+    <div class="row" style="text-align:center;">
+        <img alt="404 error" src="{{ asset('img/404camionette.jpg') }}">
+    </div>
 </body>
 </html>
diff --git a/src/Gedmo/BlogBundle/Controller/ArticleController.php b/src/Gedmo/BlogBundle/Controller/ArticleController.php
@@ -11,6 +11,8 @@
 use Gedmo\BlogBundle\Entity\Article;
 use Gedmo\BlogBundle\Entity\Comment;
 use Gedmo\BlogBundle\Entity\EmailMessage;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 class ArticleController extends Controller
 {
@@ -31,11 +33,14 @@ public function indexAction()
 ____SQL;
         $q = $em->createQuery($dql);
 
+        $whitelist = array('a.created');
+        $distinct = false;
         $paginator = $this->get('knp_paginator');
         $articles = $paginator->paginate(
             $q,
             $this->get('request')->query->get('page', 1),
-            20
+            20,
+            compact('whitelist', 'distinct')
         );
         return compact('articles');
     }
@@ -60,10 +65,14 @@ public function viewAction($slug)
         $q = $em->createQuery($dql);
         $q->setMaxResults(1);
         $q->setParameters(compact('slug'));
-        $article = $q->getSingleResult();
+        $article = $q->getResult();
         if (!$article) {
-            throw new \RuntimeException("Article was not found by {$slug}");
+            throw new NotFoundHttpException(sprintf(
+                'Failed to find Article by slug:[%s]',
+                $slug
+            ));
         }
+        $article = current($article);
         $countComments = intval($article['num_comments']);
         $article = $article[0];
 
@@ -114,7 +123,7 @@ public function addAction()
             $params['created'] = $this->get('time.templating.helper.time')->diff(new \DateTime());
             return new Response(json_encode($params));
         }
-        throw new \BadFunctionCallException('Invalid call context');
+        throw new MethodNotAllowedHttpException('Invalid call context');
     }
 
     /**
@@ -145,6 +154,6 @@ public function commentsAction(Article $article, $offset)
             }, $q->getArrayResult());
             return new Response(json_encode($comments));
         }
-        throw new \BadFunctionCallException('Invalid call context');
+        throw new MethodNotAllowedHttpException('Invalid call context');
     }
 }
diff --git a/src/Gedmo/BlogBundle/Resources/public/css/brown_papersq.png b/src/Gedmo/BlogBundle/Resources/public/css/brown_papersq.png
diff --git a/src/Gedmo/BlogBundle/Resources/public/css/school_book.png b/src/Gedmo/BlogBundle/Resources/public/css/school_book.png
diff --git a/src/Gedmo/BlogBundle/Resources/public/js/lib/highlight.pack.js b/src/Gedmo/BlogBundle/Resources/public/js/lib/highlight.pack.js
diff --git a/src/Gedmo/DemoBundle/Controller/CategoryController.php b/src/Gedmo/DemoBundle/Controller/CategoryController.php
@@ -9,6 +9,7 @@
 use Gedmo\DemoBundle\Form\CategoryType;
 use Gedmo\Translatable\TranslationListener;
 use Doctrine\ORM\Query;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CategoryController extends Controller
 {
@@ -273,7 +274,7 @@ private function findNodeOr404($id)
         $this->setTranslatableHints($q);
         $node = $q->getResult();
         if (!$node) {
-            throw $this->createNotFoundException(sprintf(
+            throw new NotFoundHttpException(sprintf(
                 'Failed to find Category by id:[%s]',
                 $id
             ));

diff --git a/web/img/404camionette.jpg b/web/img/404camionette.jpg