Merge branch 'master' of https://github.com/kinncj/PHPCI into fix/standards_errors

PHPCI/Command/GenerateCommand.php

@@ -33,7 +33,7 @@ class GenerateCommand extends Command
     /**
     * Generates Model and Store classes by reading database meta data.
     */
-    protected function execute()
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         $gen = new \b8\Database\CodeGenerator(\b8\Database::getConnection(), 'PHPCI', PHPCI_DIR . '/PHPCI/');
         $gen->generateModels();

PHPCI/Command/InstallCommand.php

@@ -35,7 +35,7 @@ class InstallCommand extends Command
     /**
     * Installs PHPCI - Can be run more than once as long as you ^C instead of entering an email address.
     */
-    protected function execute()
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         // Gather initial data from the user:
         $dbHost = $this->ask('Enter your MySQL host: ');

PHPCI/Controller/BuildController.php

@@ -32,7 +32,6 @@ class BuildController extends b8\Controller
     public function view($buildId)
     {
         $build          = $this->_buildStore->getById($buildId);
-
         $view           = new b8\View('Build');
         $view->build    = $build;
         $view->data     = $this->getBuildData($buildId);
@@ -62,6 +61,7 @@ class BuildController extends b8\Controller
         $data['created']    = !is_null($build->getCreated()) ? $build->getCreated()->format('Y-m-d H:i:s') : null;
         $data['started']    = !is_null($build->getStarted()) ? $build->getStarted()->format('Y-m-d H:i:s') : null;
         $data['finished']   = !is_null($build->getFinished()) ? $build->getFinished()->format('Y-m-d H:i:s') : null;
+        $data['plugins']    = $build->getPlugins();
 
         return json_encode($data);
     }

PHPCI/Controller/ProjectController.php

@@ -107,6 +107,8 @@ class ProjectController extends b8\Controller
     */
     public function add()
     {
+        $_SESSION['github_token'] = isset($_SESSION['github_token']) ? $_SESSION['github_token'] : null;
+
         if (!Registry::getInstance()->get('user')->getIsAdmin()) {
             throw new \Exception('You do not have permission to do that.');
         }
@@ -151,7 +153,7 @@ class ProjectController extends b8\Controller
             $view->project  = null;
             $view->form     = $form;
             $view->key      = $pub;
-            $view->token    = $_SESSION['github_token'] ? $_SESSION['github_token'] : null;
+            $view->token    = $_SESSION['github_token'];
 
             return $view->render();
         }

PHPCI/Controller/SessionController.php

@@ -70,8 +70,8 @@ class SessionController extends b8\Controller
     */
     public function logout()
     {
-        unset($_SESSION['user_id']);
+        $_SESSION = array();
-        unset($_SESSION['github_token']);
+        session_destroy();
         header('Location: /');
         die;
     }

PHPCI/View/Build.phtml

@@ -25,7 +25,6 @@
 			</tr>
 			</thead>
 			<tbody id="plugins">
-				<?php print $plugins; ?>
 			</tbody>
 		</table>
 	</div>