Remove objects from request attributes

Exercise · Jan 7, 2012 · 816823d · 816823d
1 parent 3da80f2
commit 816823d
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 25 deletions.
diff --git a/Controller/PostController.php b/Controller/PostController.php
@@ -10,21 +10,30 @@
 
 class PostController extends Controller
 {
-    public function newAction(Topic $topic)
+    public function newAction($categorySlug, $slug)
     {
-        $form = $this->get('herzult_forum.form.post');
-
-        $template = sprintf('%s:new.html.%s', $this->container->getParameter('herzult_forum.templating.location.post'), $this->getRenderer());
-        return $this->get('templating')->renderResponse($template, array(
-            'form'  => $form->createView(),
-            'topic' => $topic,
-        ));
+        $topic    = $this->findTopicOr404($categorySlug, $slug);
+        $form     = $this->get('herzult_forum.form.post');
+        $template = sprintf(
+            '%s:new.html.%s',
+            $this->container->getParameter('herzult_forum.templating.location.post'),
+            $this->getRenderer()
+        );
+
+        return $this->render(
+            $template,
+            array(
+                'form'  => $form->createView(),
+                'topic' => $topic,
+            )
+        );
     }
 
-    public function createAction(Topic $topic)
+    public function createAction($categorySlug, $slug)
     {
-        $form = $this->get('herzult_forum.form.post');
-        $post = $this->get('herzult_forum.repository.post')->createNewPost();
+        $topic = $this->findTopicOr404($categorySlug, $slug);
+        $form  = $this->get('herzult_forum.form.post');
+        $post  = $this->get('herzult_forum.repository.post')->createNewPost();
         $post->setTopic($topic);
         $form->bindRequest($this->get('request'));
 
@@ -65,6 +74,36 @@ public function deleteAction($id)
         return new RedirectResponse($this->get('herzult_forum.router.url_generator')->urlForPost($precedentPost));
     }
 
+    protected function findTopicOr404($categorySlug, $slug)
+    {
+        $category = $this
+            ->get('herzult_forum.repository.category')
+            ->findOneBySlug($categorySlug)
+        ;
+
+        if (null === $category) {
+            throw new NotFoundHttpException(sprintf(
+                'The category with slug "%s" was not found.',
+                $categorySlug
+            ));
+        }
+
+        $topic = $this
+            ->get('herzult_forum.repository.topic')
+            ->findOneByCategoryAndSlug($category, $slug)
+        ;
+
+        if (null === $topic) {
+            throw new NotFoundHttpException(sprintf(
+                'The topic with slug "%s" was not found in category with slug "%s".',
+                $slug,
+                $categorySlug
+            ));
+        }
+
+        return $topic;
+    }
+
     protected function getRenderer()
     {
         return $this->container->getParameter('herzult_forum.templating.engine');

diff --git a/Controller/TopicController.php b/Controller/TopicController.php
@@ -19,7 +19,7 @@ public function newAction(Category $category = null)
             $topic->setCategory($category);
         }
         $form->setData($topic);
-        
+
         $template = sprintf('%s:new.html.%s', $this->container->getParameter('herzult_forum.templating.location.topic'), $this->getRenderer());
         return $this->get('templating')->renderResponse($template, array(
             'form'      => $form->createView(),
@@ -58,12 +58,14 @@ public function createAction(Category $category = null)
         return new RedirectResponse($url);
     }
 
-    public function listAction(Category $category = null, array $pagerOptions)
+    public function listAction($categorySlug, array $pagerOptions)
     {
-        if (null !== $category) {
-            $topics = $this->get('herzult_forum.repository.topic')->findAllByCategory($category, true);
+        if (null === $categorySlug) {
+            $category = null;
+            $topics   = $this->get('herzult_forum.repository.topic')->findAll(true);
         } else {
-            $topics = $this->get('herzult_forum.repository.topic')->findAll(true);
+            $category = $this->findCategoryOr404($categorySlug);
+            $topics   = $this->get('herzult_forum.repository.topic')->findAllByCategory($category, true);
         }
 
         $topics->setCurrentPage($pagerOptions['page']);
@@ -100,16 +102,18 @@ public function showAction($categorySlug, $slug)
 
     public function postNewAction($categorySlug, $slug)
     {
-        $topic = $this->findTopic($categorySlug, $slug);
-
-        return $this->forward('HerzultForumBundle:Post:new', array('topic' => $topic));
+        return $this->forward('HerzultForumBundle:Post:new', array(
+            'categorySlug'  => $categorySlug,
+            'slug'          => $slug
+        ));
     }
 
     public function postCreateAction($categorySlug, $slug)
     {
-        $topic = $this->findTopic($categorySlug, $slug);
-
-        return $this->forward('HerzultForumBundle:Post:create', array('topic' => $topic));
+        return $this->forward('HerzultForumBundle:Post:create', array(
+            'categorySlug' => $categorySlug,
+            'slug'         => $slug
+        ));
     }
 
     public function deleteAction($id)
@@ -148,4 +152,29 @@ public function findTopic($categorySlug, $topicSlug)
 
         return $topic;
     }
+
+    /**
+     * Finds the category having the specified slug or throws a 404 exception
+     *
+     * @param  string $slug
+     *
+     * @return Category
+     * @throws NotFoundHttpException
+     */
+    protected function findCategoryOr404($slug)
+    {
+        $category = $this
+            ->get('herzult_forum.repository.category')
+            ->findOneBySlug($slug)
+        ;
+
+        if (!$category) {
+            throw new NotFoundHttpException(sprintf(
+                'The category with slug "%s" was not found.',
+                $slug
+            ));
+        }
+
+        return $category;
+    }
 }
diff --git a/Resources/views/Category/show.html.twig b/Resources/views/Category/show.html.twig
@@ -9,7 +9,7 @@
     <div class="main topics">
         <h2>{{ category.name }}</h2>
         <a href="{{ forum_urlForCategoryAtomFeed(category) }}" title="Atom feed" class="feed atom">Atom feed</a>
-        {% render 'HerzultForumBundle:Topic:list' with {'category': category, 'pagerOptions': {'page': page, 'routeName': 'herzult_forum_category_show', 'routeParams': {'slug': category.slug}}} %}
+        {% render 'HerzultForumBundle:Topic:list' with {'categorySlug': category.slug, 'pagerOptions': {'page': page, 'routeName': 'herzult_forum_category_show', 'routeParams': {'slug': category.slug}}} %}
     </div>
     <div class="side categories">
         <h2>Categories</h2>

diff --git a/Resources/views/Category/show.xml.twig b/Resources/views/Category/show.xml.twig
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title>{{ category.name }} Last Topics</title>
-    {% render 'HerzultForumBundle:Topic:list' with {'category': category} %}
+    {% render 'HerzultForumBundle:Topic:list' with {'categorySlug': category.slug, 'pagerOptions': {'page': page}} %}
 </feed>
diff --git a/Resources/views/Forum/index.html.twig b/Resources/views/Forum/index.html.twig
@@ -7,7 +7,7 @@
     </ul>
     <div class="main topics">
         <h2>Latest topics</h2>
-        {% render 'HerzultForumBundle:Topic:list' with {'category': null, 'pagerOptions': {'page': page}} %}
+        {% render 'HerzultForumBundle:Topic:list' with {'categorySlug': null, 'pagerOptions': {'page': page}} %}
     </div>
     <div class="side categories">
         <h2>Categories</h2>