From f2bf4ba440e32c88c0eadfe58f3519c74f5e99a3 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Fri, 9 May 2014 12:11:02 +0100
Subject: [PATCH] Cleaning up exceptions in the Project controller

---
 PHPCI/Controller/ProjectController.php | 59 +++++++++++++++-----------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index eea5a7a8..c06676bd 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -9,17 +9,17 @@
 
 namespace PHPCI\Controller;
 
+use b8;
+use b8\Controller;
+use b8\Form;
+use b8\Exception\HttpException\ForbiddenException;
+use b8\Exception\HttpException\NotFoundException;
+use b8\Store;
 use PHPCI\BuildFactory;
 use PHPCI\Helper\Github;
 use PHPCI\Helper\SshKey;
 use PHPCI\Model\Build;
 use PHPCI\Model\Project;
-use b8;
-use b8\Config;
-use b8\Controller;
-use b8\Store;
-use b8\Form;
-use b8\Exception\HttpException\NotFoundException;
 
 /**
 * Project Controller - Allows users to create, edit and view projects.
@@ -41,8 +41,8 @@ class ProjectController extends \PHPCI\Controller
 
     public function init()
     {
-        $this->buildStore      = Store\Factory::getStore('Build');
-        $this->projectStore    = Store\Factory::getStore('Project');
+        $this->buildStore = Store\Factory::getStore('Build');
+        $this->projectStore = Store\Factory::getStore('Project');
     }
 
     /**
@@ -51,17 +51,18 @@ class ProjectController extends \PHPCI\Controller
     public function view($projectId)
     {
         $project = $this->projectStore->getById($projectId);
-        if (!$project) {
+
+        if (empty($project)) {
             throw new NotFoundException('Project with id: ' . $projectId . ' not found');
         }
 
-        $page           = $this->getParam('p', 1);
-        $builds         = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10));
+        $page = $this->getParam('p', 1);
+        $builds = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10));
 
-        $this->view->builds   = $builds[0];
-        $this->view->total    = $builds[1];
-        $this->view->project  = $project;
-        $this->view->page     = $page;
+        $this->view->builds = $builds[0];
+        $this->view->total = $builds[1];
+        $this->view->project = $project;
+        $this->view->page = $page;
 
         $this->config->set('page_title', $project->getTitle());
 
@@ -76,6 +77,10 @@ class ProjectController extends \PHPCI\Controller
         /* @var \PHPCI\Model\Project $project */
         $project = $this->projectStore->getById($projectId);
 
+        if (empty($project)) {
+            throw new NotFoundException('Project with id: ' . $projectId . ' not found');
+        }
+
         $build = new Build();
         $build->setProjectId($projectId);
         $build->setCommitId('Manual');
@@ -96,7 +101,7 @@ class ProjectController extends \PHPCI\Controller
     public function delete($projectId)
     {
         if (!$_SESSION['user']->getIsAdmin()) {
-            throw new \Exception('You do not have permission to do that.');
+            throw new ForbiddenException('You do not have permission to do that.');
         }
 
         $project = $this->projectStore->getById($projectId);
@@ -120,10 +125,10 @@ class ProjectController extends \PHPCI\Controller
     */
     protected function getLatestBuildsHtml($projectId, $start = 0)
     {
-        $criteria       = array('project_id' => $projectId);
-        $order          = array('id' => 'DESC');
-        $builds         = $this->buildStore->getWhere($criteria, 10, $start, array(), $order);
-        $view           = new b8\View('BuildsTable');
+        $criteria = array('project_id' => $projectId);
+        $order = array('id' => 'DESC');
+        $builds = $this->buildStore->getWhere($criteria, 10, $start, array(), $order);
+        $view = new b8\View('BuildsTable');
 
         foreach ($builds['items'] as &$build) {
             $build = BuildFactory::getBuild($build);
@@ -142,7 +147,7 @@ class ProjectController extends \PHPCI\Controller
         $this->config->set('page_title', 'Add Project');
 
         if (!$_SESSION['user']->getIsAdmin()) {
-            throw new \Exception('You do not have permission to do that.');
+            throw new ForbiddenException('You do not have permission to do that.');
         }
 
         $method = $this->request->getMethod();
@@ -210,11 +215,15 @@ class ProjectController extends \PHPCI\Controller
     public function edit($projectId)
     {
         if (!$_SESSION['user']->getIsAdmin()) {
-            throw new \Exception('You do not have permission to do that.');
+            throw new ForbiddenException('You do not have permission to do that.');
         }
 
-        $method     = $this->request->getMethod();
-        $project    = $this->projectStore->getById($projectId);
+        $method = $this->request->getMethod();
+        $project = $this->projectStore->getById($projectId);
+
+        if (empty($project)) {
+            throw new NotFoundException('Project with id: ' . $projectId . ' not found');
+        }
 
         $this->config->set('page_title', 'Edit: ' . $project->getTitle());
 
@@ -234,7 +243,7 @@ class ProjectController extends \PHPCI\Controller
         }
 
 
-        $form   = $this->projectForm($values, 'edit/' . $projectId);
+        $form = $this->projectForm($values, 'edit/' . $projectId);
 
         if ($method != 'POST' || ($method == 'POST' && !$form->validate())) {
             $view           = new b8\View('ProjectForm');