Lots of cleanup.

PHPCI/Application.php

@@ -14,7 +14,6 @@ use b8\Exception\HttpException;
 use b8\Http\Response;
 use b8\Http\Response\RedirectResponse;
 use b8\View;
-use PHPCI\Model\Build;
 
 /**
 * PHPCI Front Controller
@@ -58,7 +57,7 @@ class Application extends b8\Application
         $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession, $skipAuth) {
             $skipValidation = in_array($route['controller'], array('session', 'webhook', 'build-status'));
 
-            if (!$skipValidation && !$validateSession() && !$skipAuth()) {
+            if (!$skipValidation && !$validateSession() && (!is_callable($skipAuth) || !$skipAuth())) {
                 if ($request->isAjax()) {
                     $response->setResponseCode(401);
                     $response->setContent('');

PHPCI/Command/CreateAdminCommand.php

@@ -12,12 +12,9 @@ namespace PHPCI\Command;
 use PHPCI\Helper\Lang;
 use PHPCI\Service\UserService;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use b8\Store\Factory;
-use PHPCI\Builder;
 
 /**
 * Create admin command - creates an admin user
@@ -77,7 +74,7 @@ class CreateAdminCommand extends Command
 
         if (!$emptyOk && empty($rtn)) {
             $rtn = $this->ask($question, $emptyOk, $validationFilter);
-        } elseif ($validationFilter != null  && ! empty($rtn)) {
+        } elseif (!is_null($validationFilter) && ! empty($rtn)) {
             if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) {
                 print $statusMessage;
                 $rtn = $this->ask($question, $emptyOk, $validationFilter);

PHPCI/Command/DaemonCommand.php

@@ -12,13 +12,8 @@ namespace PHPCI\Command;
 use Monolog\Logger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use b8\Store\Factory;
-use PHPCI\Builder;
-use PHPCI\BuildFactory;
 
 /**
 * Daemon that loops and call the run-command.

PHPCI/Command/DaemoniseCommand.php

@@ -12,9 +12,7 @@ namespace PHPCI\Command;
 use Monolog\Logger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -76,7 +74,7 @@ class DaemoniseCommand extends Command
         $this->sleep = 0;
         $runner      = new RunCommand($this->logger);
         $runner->setMaxBuilds(1);
-        $runner->setIsDaemon(true);
+        $runner->setDaemon(true);
 
         $emptyInput = new ArgvInput(array());
 

PHPCI/Command/GenerateCommand.php

@@ -10,9 +10,7 @@
 namespace PHPCI\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use b8\Database;
 use b8\Database\CodeGenerator;

PHPCI/Command/InstallCommand.php

@@ -17,11 +17,9 @@ use b8\Database;
 use b8\Store\Factory;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Helper\DialogHelper;
 use PHPCI\Service\UserService;
 
 /**
@@ -298,6 +296,8 @@ class InstallCommand extends Command
                 )
             );
 
+            unset($pdo);
+
             return true;
 
         } catch (Exception $ex) {

PHPCI/Command/PollCommand.php

@@ -14,9 +14,7 @@ use b8\HttpClient;
 use Monolog\Logger;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Parser;
 use PHPCI\Model\Build;

PHPCI/Command/RunCommand.php

@@ -15,11 +15,8 @@ use PHPCI\Helper\Lang;
 use PHPCI\Logging\BuildDBLogHandler;
 use PHPCI\Logging\LoggedBuildContextTidier;
 use PHPCI\Logging\OutputLogHandler;
-use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use b8\Store\Factory;
 use PHPCI\Builder;
@@ -143,7 +140,7 @@ class RunCommand extends Command
         $this->maxBuilds = (int)$numBuilds;
     }
 
-    public function setIsDaemon($fromDaemon)
+    public function setDaemon($fromDaemon)
     {
         $this->isFromDaemon = (bool)$fromDaemon;
     }

PHPCI/Command/UpdateCommand.php

@@ -12,10 +12,7 @@ namespace PHPCI\Command;
 use Monolog\Logger;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**

PHPCI/Controller/PluginController.php

@@ -11,7 +11,6 @@ namespace PHPCI\Controller;
 
 use b8;
 use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
 use PHPCI\Plugin\Util\ComposerPluginInformation;
 use PHPCI\Plugin\Util\FilesPluginInformation;
 use PHPCI\Plugin\Util\PluginInformationCollection;

PHPCI/Controller/ProjectController.php

@@ -10,17 +10,14 @@
 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;
 use PHPCI\BuildFactory;
 use PHPCI\Helper\Github;
 use PHPCI\Helper\Lang;
 use PHPCI\Helper\SshKey;
-use PHPCI\Model\Build;
-use PHPCI\Model\Project;
 use PHPCI\Service\BuildService;
 use PHPCI\Service\ProjectService;
 
@@ -30,7 +27,7 @@ use PHPCI\Service\ProjectService;
 * @package      PHPCI
 * @subpackage   Web
 */
-class ProjectController extends \PHPCI\Controller
+class ProjectController extends Controller
 {
     /**
      * @var \PHPCI\Store\ProjectStore

PHPCI/Controller/SettingsController.php

@@ -14,7 +14,6 @@ use b8\Form;
 use b8\HttpClient;
 use PHPCI\Controller;
 use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
 

PHPCI/Controller/UserController.php

@@ -10,12 +10,10 @@
 namespace PHPCI\Controller;
 
 use b8;
-use b8\Exception\HttpException\ForbiddenException;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Form;
 use PHPCI\Controller;
 use PHPCI\Helper\Lang;
-use PHPCI\Model\User;
 use PHPCI\Service\UserService;
 
 /**

PHPCI/Controller/WebhookController.php

@@ -12,7 +12,6 @@ namespace PHPCI\Controller;
 use b8;
 use b8\Store;
 use PHPCI\BuildFactory;
-use PHPCI\Model\Build;
 use PHPCI\Service\BuildService;
 
 /**

PHPCI/Helper/Email.php

@@ -90,7 +90,7 @@ class Email
      * @param bool $isHtml
      * @return $this
      */
-    public function setIsHtml($isHtml = false)
+    public function setHtml($isHtml = false)
     {
         $this->isHtml = $isHtml;
 

PHPCI/Plugin.php

@@ -9,8 +9,6 @@
 
 namespace PHPCI;
 
-use PHPCI\Model\Build;
-
 /**
 * PHPCI Plugin Interface - Used by all build plugins.
 * @author   Dan Cryer <dan@block8.co.uk>

PHPCI/Plugin/Campfire.php

@@ -148,7 +148,6 @@ class Campfire implements \PHPCI\Plugin
             return json_decode($output);
         }
         // Simple 200 OK response (such as for joining a room)
-        // TODO: check for other result codes here
         return true;
     }
 }

PHPCI/Plugin/CopyBuild.php

@@ -74,7 +74,7 @@ class CopyBuild implements \PHPCI\Plugin
      */
     protected function wipeExistingDirectory()
     {
-        if ($this->wipe == true && $this->directory != '/' && is_dir($this->directory)) {
+        if ($this->wipe === true && $this->directory != '/' && is_dir($this->directory)) {
             $cmd = 'rm -Rf "%s*"';
             $success = $this->phpci->executeCommand($cmd, $this->directory);
 

PHPCI/Plugin/HipchatNotify.php

@@ -21,11 +21,9 @@ use PHPCI\Model\Build;
  */
 class HipchatNotify implements \PHPCI\Plugin
 {
-    private $authToken;
+    protected $authToken;
-    private $userAgent;
+    protected $color;
-    private $cookie;
+    protected $notify;
-    private $color;
-    private $notify;
 
     /**
      * Set up the plugin, configure options, etc.

PHPCI/Plugin/Util/ComposerPluginInformation.php

@@ -2,6 +2,8 @@
 
 namespace PHPCI\Plugin\Util;
 
+use PHPCI\Plugin;
+
 /**
  * Class ComposerPluginInformation
  * @package PHPCI\Plugin\Util
@@ -63,7 +65,7 @@ class ComposerPluginInformation implements InstalledPluginInformation
     public function getPluginClasses()
     {
         return array_map(
-            function ($plugin) {
+            function (Plugin $plugin) {
                 return $plugin->class;
             },
             $this->getInstalledPlugins()

PHPCI/Plugin/Util/FilesPluginInformation.php

@@ -2,6 +2,8 @@
 
 namespace PHPCI\Plugin\Util;
 
+use PHPCI\Plugin;
+
 /**
  * Class FilesPluginInformation
  * @package PHPCI\Plugin\Util
@@ -66,7 +68,7 @@ class FilesPluginInformation implements InstalledPluginInformation
     public function getPluginClasses()
     {
         return array_map(
-            function ($plugin) {
+            function (Plugin $plugin) {
                return $plugin->class;
             },
             $this->getInstalledPlugins()
@@ -114,8 +116,6 @@ class FilesPluginInformation implements InstalledPluginInformation
      */
     protected function getFullClassFromFile(\SplFileInfo $fileInfo)
     {
-        //TODO: Something less horrible than a regular expression
-        //      on the contents of a file
         $contents = file_get_contents($fileInfo->getRealPath());
         $matches = array();
 

PHPCI/Store/BuildStore.php

@@ -10,7 +10,6 @@
 namespace PHPCI\Store;
 
 use b8\Database;
-use PHPCI\BuildFactory;
 use PHPCI\Model\Build;
 use PHPCI\Store\Base\BuildStoreBase;