Refactored HttpExceptions.

src/B8Framework/Exception/HttpException/ServerErrorException.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace b8\Exception\HttpException;
-
-use b8\Exception\HttpException;
-
-class ServerErrorException extends HttpException
-{
-}

src/PHPCensor/Application.php

@@ -2,11 +2,11 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use b8\Http\Response;
 use b8\Http\Response\RedirectResponse;
 use PHPCensor\Store\Factory;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Http\Request;
 use b8\Http\Router;
 

src/PHPCensor/Controller.php

@@ -2,7 +2,7 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException\ForbiddenException;
+use PHPCensor\Exception\HttpException\ForbiddenException;
 use b8\Http\Request;
 use b8\Http\Response;
 use PHPCensor\Store\Factory;

src/PHPCensor/Controller/BuildController.php

@@ -2,8 +2,7 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Http\Response\JsonResponse;
 use JasonGrimes\Paginator;
 use PHPCensor\BuildFactory;

src/PHPCensor/Controller/BuildStatusController.php

@@ -2,8 +2,9 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use b8\Http\Response;
+use b8\Http\Response\RedirectResponse;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use PHPCensor\Store\Factory;
 use PHPCensor\BuildFactory;
 use PHPCensor\Model\Project;
@@ -76,7 +77,6 @@ class BuildStatusController extends Controller
      * @return bool
      *
      * @throws \Exception
-     * @throws b8\Exception\HttpException
      */
     public function ccxml($projectId)
     {
@@ -131,7 +131,7 @@ class BuildStatusController extends Controller
      *
      * @param $projectId
      *
-     * @return b8\Http\Response|b8\Http\Response\RedirectResponse
+     * @return Response
      */
     public function image($projectId)
     {
@@ -149,7 +149,7 @@ class BuildStatusController extends Controller
         $status = $this->getStatus($projectId);
 
         if (is_null($status)) {
-            $response = new b8\Http\Response\RedirectResponse();
+            $response = new RedirectResponse();
             $response->setHeader('Location', '/');
 
             return $response;
@@ -182,6 +182,7 @@ class BuildStatusController extends Controller
         $this->response->disableLayout();
         $this->response->setHeader('Content-Type', 'image/svg+xml');
         $this->response->setContent($image);
+
         return $this->response;
     }
 
@@ -192,7 +193,7 @@ class BuildStatusController extends Controller
      *
      * @return string
      *
-     * @throws \b8\Exception\HttpException\NotFoundException
+     * @throws NotFoundException
      */
     public function view($projectId)
     {

src/PHPCensor/Controller/ProjectController.php

@@ -2,8 +2,7 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Form;
 use JasonGrimes\Paginator;
 use PHPCensor;

src/PHPCensor/Controller/UserController.php

@@ -3,7 +3,7 @@
 namespace PHPCensor\Controller;
 
 use PHPCensor\Config;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Form;
 use PHPCensor\Controller;
 use PHPCensor\Helper\Lang;

src/PHPCensor/Controller/WebhookController.php

@@ -2,7 +2,6 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
 use Exception;
 use GuzzleHttp\Client;
 use PHPCensor\Helper\Lang;
@@ -13,7 +12,7 @@ use PHPCensor\Store\BuildStore;
 use PHPCensor\Store\ProjectStore;
 use PHPCensor\Controller;
 use PHPCensor\Config;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use PHPCensor\Store\Factory;
 use b8\Http\Request;
 use b8\Http\Response;
@@ -75,7 +74,7 @@ class WebhookController extends Controller
      */
     public function handleAction($action, $actionParams)
     {
-        $response = new b8\Http\Response\JsonResponse();
+        $response = new Response\JsonResponse();
         try {
             $data = call_user_func_array([$this, $action], $actionParams);
             if (isset($data['responseCode'])) {

src/PHPCensor/Exception/HttpException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Exception;
+namespace PHPCensor\Exception;
 
 class HttpException extends \Exception
 {

src/PHPCensor/Exception/HttpException/BadRequestException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class BadRequestException extends HttpException
 {

src/PHPCensor/Exception/HttpException/ForbiddenException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class ForbiddenException extends HttpException
 {

src/PHPCensor/Exception/HttpException/NotAuthorizedException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class NotAuthorizedException extends HttpException
 {

src/PHPCensor/Exception/HttpException/NotFoundException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class NotFoundException extends HttpException
 {

src/PHPCensor/Exception/HttpException/ServerErrorException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPCensor\Exception\HttpException;
+
+use PHPCensor\Exception\HttpException;
+
+class ServerErrorException extends HttpException
+{
+}

src/PHPCensor/Exception/HttpException/ValidationException.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class ValidationException extends HttpException
 {

src/PHPCensor/Model.php

@@ -2,7 +2,7 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException\ValidationException;
 
 class Model
 {
@@ -87,12 +87,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateString($name, $value)
     {
         if (!is_string($value) && !is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must be a string.');
+            throw new ValidationException('Column "' . $name . '" must be a string.');
         }
     }
 
@@ -100,12 +100,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateInt($name, $value)
     {
         if (!is_integer($value) && !is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must be an integer.');
+            throw new ValidationException('Column "' . $name . '" must be an integer.');
         }
     }
 
@@ -113,12 +113,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateNotNull($name, $value)
     {
         if (is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must not be null.');
+            throw new ValidationException('Column "' . $name . '" must not be null.');
         }
     }
 }

src/PHPCensor/Store/BuildErrorStore.php

@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Database;
 use PHPCensor\Model\BuildError;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Store;
 
 class BuildErrorStore extends Store

src/PHPCensor/Store/BuildMetaStore.php

@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\BuildMeta;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class BuildMetaStore extends Store
 {

src/PHPCensor/Store/BuildStore.php

@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Database;
 use PHPCensor\Model\Build;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Model\BuildMeta;
 use PHPCensor\Store;
 

src/PHPCensor/Store/EnvironmentStore.php

@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\Environment;
 use PHPCensor\Store;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class EnvironmentStore extends Store
 {

src/PHPCensor/Store/ProjectGroupStore.php

@@ -3,7 +3,7 @@
 namespace PHPCensor\Store;
 
 use PHPCensor\Database;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Store;
 use PHPCensor\Model\ProjectGroup;
 

src/PHPCensor/Store/ProjectStore.php

@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\Project;
 use PHPCensor\Store;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 /**
  * @author Dan Cryer <dan@block8.co.uk>

src/PHPCensor/Store/UserStore.php

@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Store;
 use PHPCensor\Database;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Model\User;
 
 /**

tests/PHPCensor/DatabaseMysqlTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
 use PHPCensor\Config;
 use PHPCensor\Database;

tests/PHPCensor/DatabasePostgresqlTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
 use PHPCensor\Config;
 use PHPCensor\Database;

tests/PHPCensor/HttpExceptionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class HttpExceptionTest extends \PHPUnit\Framework\TestCase
 {

tests/PHPCensor/Model/BuildTest.php

@@ -2,9 +2,8 @@
 
 namespace Tests\PHPCensor\Model;
 
-use b8\Exception\HttpException\ValidationException;
+use PHPCensor\Exception\HttpException\ValidationException;
 use PHPCensor\Model\Build;
-use PHPCensor\Model;
 
 /**
  * Unit tests for the Build model class.