Get rid of some more validation exceptions.

fluxbb · Sep 11, 2014 · 82d3058 · 82d3058
1 parent 2273af8
commit 82d3058
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/src/FluxBB/Actions/EditPost.php b/src/FluxBB/Actions/EditPost.php
@@ -3,7 +3,6 @@
 namespace FluxBB\Actions;
 
 use Carbon\Carbon;
-use FluxBB\Actions\Exception\ValidationException;
 use FluxBB\Validator\PostValidator;
 use FluxBB\Server\Request;
 use FluxBB\Models\User;
@@ -24,7 +23,6 @@ public function __construct(PostValidator $validator)
     /**
      * Run the action and return a response for the user.
      *
-     * @throws Exception\ValidationException
      * @return void
      */
     protected function run()
@@ -41,9 +39,7 @@ protected function run()
             'edited_by' => $creator->username,
         ]);
 
-        if (! $this->validator->isValid($this->post)) {
-            throw new ValidationException();
-        }
+        $this->validator->validate($this->post);
 
         $this->post->save();
         $this->trigger('post.edited', [$this->post, $creator]);

diff --git a/src/FluxBB/Actions/NewTopic.php b/src/FluxBB/Actions/NewTopic.php
@@ -3,7 +3,6 @@
 namespace FluxBB\Actions;
 
 use Carbon\Carbon;
-use FluxBB\Actions\Exception\ValidationException;
 use FluxBB\Validator\PostValidator;
 use FluxBB\Server\Request;
 use FluxBB\Models\User;
@@ -30,7 +29,6 @@ public function __construct(PostValidator $validator)
     /**
      * Run the action and return a response for the user.
      *
-     * @throws Exception\ValidationException
      * @return void
      */
     protected function run()
@@ -58,7 +56,6 @@ protected function run()
         ]);
 
         $this->onErrorRedirectTo(new Request('new_topic', ['id' => $this->forum->id]));
-
         $this->validator->validate($this->post);
 
         $this->topic->save();

diff --git a/src/FluxBB/Actions/Reply.php b/src/FluxBB/Actions/Reply.php
@@ -3,7 +3,6 @@
 namespace FluxBB\Actions;
 
 use Carbon\Carbon;
-use FluxBB\Actions\Exception\ValidationException;
 use FluxBB\Validator\PostValidator;
 use FluxBB\Server\Request;
 use FluxBB\Models\User;
@@ -27,7 +26,6 @@ public function __construct(PostValidator $validator)
     /**
      * Run the action and return a response for the user.
      *
-     * @throws Exception\ValidationException
      * @return void
      */
     protected function run()
@@ -45,9 +43,7 @@ protected function run()
         ]);
 
         $this->onErrorRedirectTo(new Request('viewtopic', ['id' => $this->topic->id]));
-        if (! $this->validator->isValid($this->post)) {
-            throw new ValidationException();
-        }
+        $this->validator->validate($this->post);
 
         $this->topic->addReply($this->post);
         $this->post->save();