diff --git a/src/B8Framework/View/Template.php b/src/B8Framework/View/Template.php index e650152b..80aa1465 100755 --- a/src/B8Framework/View/Template.php +++ b/src/B8Framework/View/Template.php @@ -53,7 +53,6 @@ class Template extends View protected function parse($string) { - $lastCond = null; $keywords = ['ifnot', 'if', 'else', 'for', 'loop', '@', '/ifnot', '/if', '/for', '/loop']; foreach (self::$templateFunctions as $function => $handler) { @@ -80,8 +79,7 @@ class Template extends View $cond = trim($this->readUntil('}', $string)); $item['cond'] = $cond; - $lastCond = $cond; - $string = substr($string, 1); + $string = substr($string, 1); if (array_key_exists($keyword, self::$templateFunctions)) { $item['function_name'] = $keyword; diff --git a/src/PHPCI/Application.php b/src/PHPCI/Application.php index ef5823fd..b7ed411e 100644 --- a/src/PHPCI/Application.php +++ b/src/PHPCI/Application.php @@ -80,7 +80,7 @@ class Application extends b8\Application /** * Handle an incoming web request. * - * @return b8\b8\Http\Response|Response + * @return Response */ public function handleRequest() { diff --git a/src/PHPCI/Builder.php b/src/PHPCI/Builder.php index a2bbf2f6..c11e3508 100644 --- a/src/PHPCI/Builder.php +++ b/src/PHPCI/Builder.php @@ -285,7 +285,7 @@ class Builder implements LoggerAwareInterface */ public function findBinary($binary, $quiet = false) { - return $this->commandExecutor->findBinary($binary, $quiet = false); + return $this->commandExecutor->findBinary($binary, $quiet); } /** diff --git a/src/PHPCI/Command/DaemonCommand.php b/src/PHPCI/Command/DaemonCommand.php index 631ccfa7..6318430c 100644 --- a/src/PHPCI/Command/DaemonCommand.php +++ b/src/PHPCI/Command/DaemonCommand.php @@ -192,7 +192,7 @@ class DaemonCommand extends Command $pid = intval(trim(file_get_contents($this->pidFilePath))); - if($this->processControl->isRunning($pid, true)) { + if($this->processControl->isRunning($pid)) { return $pid; } diff --git a/src/PHPCI/Command/InstallCommand.php b/src/PHPCI/Command/InstallCommand.php index aa11ba84..8a8a0991 100644 --- a/src/PHPCI/Command/InstallCommand.php +++ b/src/PHPCI/Command/InstallCommand.php @@ -22,6 +22,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use PHPCI\Service\UserService; use Symfony\Component\Console\Question\ConfirmationQuestion; +use Symfony\Component\Yaml\Dumper; /** * Install console command - Installs PHPCI. @@ -359,8 +360,8 @@ class InstallCommand extends Command */ protected function writeConfigFile(array $config) { - $dumper = new \Symfony\Component\Yaml\Dumper(); - $yaml = $dumper->dump($config, 4); + $dumper = new Dumper(); + $yaml = $dumper->dump($config, 4); file_put_contents($this->configFilePath, $yaml); } diff --git a/src/PHPCI/Command/RebuildQueueCommand.php b/src/PHPCI/Command/RebuildQueueCommand.php index 4b0af6d8..8cf581d1 100644 --- a/src/PHPCI/Command/RebuildQueueCommand.php +++ b/src/PHPCI/Command/RebuildQueueCommand.php @@ -9,7 +9,6 @@ namespace PHPCI\Command; -use b8\Config; use b8\Store\Factory; use Monolog\Logger; use PHPCI\BuildFactory; diff --git a/src/PHPCI/Command/RunCommand.php b/src/PHPCI/Command/RunCommand.php index 6db3cedd..5e6533dd 100644 --- a/src/PHPCI/Command/RunCommand.php +++ b/src/PHPCI/Command/RunCommand.php @@ -120,7 +120,7 @@ class RunCommand extends Command // After execution we no longer want to record the information // back to this specific build so the handler should be removed. - $this->logger->popHandler($buildDbLog); + $this->logger->popHandler(); } catch (\Exception $ex) { $build->setStatus(Build::STATUS_FAILED); $build->setFinished(new \DateTime()); diff --git a/src/PHPCI/Command/UpdateCommand.php b/src/PHPCI/Command/UpdateCommand.php index bd8b18bf..98f5d37e 100644 --- a/src/PHPCI/Command/UpdateCommand.php +++ b/src/PHPCI/Command/UpdateCommand.php @@ -47,7 +47,7 @@ class UpdateCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { - if (!$this->verifyInstalled($output)) { + if (!$this->verifyInstalled()) { return; } @@ -58,7 +58,7 @@ class UpdateCommand extends Command $output->writeln(''.Lang::get('ok').''); } - protected function verifyInstalled(OutputInterface $output) + protected function verifyInstalled() { $config = Config::getInstance(); $phpciUrl = $config->get('phpci.url'); diff --git a/src/PHPCI/Controller.php b/src/PHPCI/Controller.php index 68b1c845..003265c1 100644 --- a/src/PHPCI/Controller.php +++ b/src/PHPCI/Controller.php @@ -85,7 +85,8 @@ class Controller extends \b8\Controller * Handle the incoming request. * @param $action * @param $actionParams - * @return \b8\b8\Http\Response|Response + * + * @return Response */ public function handleAction($action, $actionParams) { diff --git a/src/PHPCI/Controller/BuildController.php b/src/PHPCI/Controller/BuildController.php index 38f018ed..f0c22144 100644 --- a/src/PHPCI/Controller/BuildController.php +++ b/src/PHPCI/Controller/BuildController.php @@ -18,6 +18,7 @@ use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Model\Project; use PHPCI\Service\BuildService; +use PHPCI\Controller; /** * Build Controller - Allows users to run and view builds. @@ -25,7 +26,7 @@ use PHPCI\Service\BuildService; * @package PHPCI * @subpackage Web */ -class BuildController extends \PHPCI\Controller +class BuildController extends Controller { /** * @var \PHPCI\Store\BuildStore diff --git a/src/PHPCI/Controller/BuildStatusController.php b/src/PHPCI/Controller/BuildStatusController.php index 0c069670..25d4cc01 100644 --- a/src/PHPCI/Controller/BuildStatusController.php +++ b/src/PHPCI/Controller/BuildStatusController.php @@ -16,6 +16,7 @@ use PHPCI\BuildFactory; use PHPCI\Model\Project; use PHPCI\Model\Build; use PHPCI\Service\BuildStatusService; +use PHPCI\Controller; /** * Build Status Controller - Allows external access to build status information / images. @@ -23,7 +24,7 @@ use PHPCI\Service\BuildStatusService; * @package PHPCI * @subpackage Web */ -class BuildStatusController extends \PHPCI\Controller +class BuildStatusController extends Controller { /* @var \PHPCI\Store\ProjectStore */ protected $projectStore; diff --git a/src/PHPCI/Controller/HomeController.php b/src/PHPCI/Controller/HomeController.php index 142eeeeb..233171ee 100644 --- a/src/PHPCI/Controller/HomeController.php +++ b/src/PHPCI/Controller/HomeController.php @@ -13,6 +13,7 @@ use b8; use PHPCI\BuildFactory; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Controller; /** * Home Controller - Displays the PHPCI Dashboard. @@ -20,7 +21,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Web */ -class HomeController extends \PHPCI\Controller +class HomeController extends Controller { /** * @var \PHPCI\Store\BuildStore diff --git a/src/PHPCI/Controller/PluginController.php b/src/PHPCI/Controller/PluginController.php index 8f718fda..ad0953b9 100644 --- a/src/PHPCI/Controller/PluginController.php +++ b/src/PHPCI/Controller/PluginController.php @@ -14,6 +14,7 @@ use PHPCI\Helper\Lang; use PHPCI\Plugin\Util\ComposerPluginInformation; use PHPCI\Plugin\Util\FilesPluginInformation; use PHPCI\Plugin\Util\PluginInformationCollection; +use PHPCI\Controller; /** * Plugin Controller - Provides support for installing Composer packages. @@ -21,7 +22,7 @@ use PHPCI\Plugin\Util\PluginInformationCollection; * @package PHPCI * @subpackage Web */ -class PluginController extends \PHPCI\Controller +class PluginController extends Controller { /** * List all enabled plugins, installed and recommend packages. diff --git a/src/PHPCI/Controller/SessionController.php b/src/PHPCI/Controller/SessionController.php index b68d61f7..9973c57d 100644 --- a/src/PHPCI/Controller/SessionController.php +++ b/src/PHPCI/Controller/SessionController.php @@ -12,6 +12,7 @@ namespace PHPCI\Controller; use b8; use PHPCI\Helper\Email; use PHPCI\Helper\Lang; +use PHPCI\Controller; /** * Session Controller - Handles user login / logout. @@ -19,7 +20,7 @@ use PHPCI\Helper\Lang; * @package PHPCI * @subpackage Web */ -class SessionController extends \PHPCI\Controller +class SessionController extends Controller { /** * @var \PHPCI\Store\UserStore diff --git a/src/PHPCI/Controller/WebhookController.php b/src/PHPCI/Controller/WebhookController.php index 77a45b4b..9df92000 100644 --- a/src/PHPCI/Controller/WebhookController.php +++ b/src/PHPCI/Controller/WebhookController.php @@ -12,11 +12,13 @@ namespace PHPCI\Controller; use b8; use b8\Store; use Exception; -use PHPCI\BuildFactory; use PHPCI\Model\Project; use PHPCI\Service\BuildService; use PHPCI\Store\BuildStore; use PHPCI\Store\ProjectStore; +use b8\Controller; +use b8\Config; +use b8\HttpClient; /** * Webhook Controller - Processes webhook pings from BitBucket, Github, Gitlab, etc. @@ -30,7 +32,7 @@ use PHPCI\Store\ProjectStore; * * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ -class WebhookController extends \b8\Controller +class WebhookController extends Controller { /** * @var BuildStore @@ -170,6 +172,8 @@ class WebhookController extends \b8\Controller * Called by POSTing to /webhook/git/?branch=&commit= * * @param string $projectId + * + * @return array */ public function git($projectId) { @@ -272,9 +276,13 @@ class WebhookController extends \b8\Controller /** * Handle the payload when Github sends a Pull Request webhook. - * + * * @param Project $project - * @param array $payload + * @param array $payload + * + * @return array + * + * @throws Exception */ protected function githubPullRequest(Project $project, array $payload) { @@ -284,18 +292,18 @@ class WebhookController extends \b8\Controller } $headers = []; - $token = \b8\Config::getInstance()->get('phpci.github.token'); + $token = Config::getInstance()->get('phpci.github.token'); if (!empty($token)) { $headers[] = 'Authorization: token ' . $token; } $url = $payload['pull_request']['commits_url']; - $http = new \b8\HttpClient(); + $http = new HttpClient(); $http->setHeaders($headers); //for large pull requests, allow grabbing more then the default number of commits - $custom_per_page = \b8\Config::getInstance()->get('phpci.github.per_page'); + $custom_per_page = Config::getInstance()->get('phpci.github.per_page'); $params = []; if ($custom_per_page) { $params["per_page"] = $custom_per_page; diff --git a/src/PHPCI/Helper/BaseCommandExecutor.php b/src/PHPCI/Helper/BaseCommandExecutor.php index 68b2d1e5..4d73ac8e 100644 --- a/src/PHPCI/Helper/BaseCommandExecutor.php +++ b/src/PHPCI/Helper/BaseCommandExecutor.php @@ -68,7 +68,9 @@ abstract class BaseCommandExecutor implements CommandExecutor /** * Executes shell commands. + * * @param array $args + * * @return bool Indicates success */ public function executeCommand($args = []) diff --git a/src/PHPCI/Helper/CommandExecutor.php b/src/PHPCI/Helper/CommandExecutor.php index 4f0028eb..ccce9009 100644 --- a/src/PHPCI/Helper/CommandExecutor.php +++ b/src/PHPCI/Helper/CommandExecutor.php @@ -14,9 +14,12 @@ interface CommandExecutor /** * Executes shell commands. Accepts multiple arguments the first * is the template and everything else is inserted in. c.f. sprintf + * + * @param array $args + * * @return bool Indicates success */ - public function executeCommand(); + public function executeCommand($args = []); /** * Returns the output from the last command run. @@ -25,6 +28,7 @@ interface CommandExecutor /** * Find a binary required by a plugin. + * * @param string $binary * @param bool $quiet Returns null instead of throwing an execption. * diff --git a/src/PHPCI/Helper/Email.php b/src/PHPCI/Helper/Email.php index 1a714efe..f9523007 100644 --- a/src/PHPCI/Helper/Email.php +++ b/src/PHPCI/Helper/Email.php @@ -10,7 +10,6 @@ namespace PHPCI\Helper; use b8\Config; -use PHPCI\Helper\MailerFactory; /** * Helper class for sending emails using PHPCI's email configuration. diff --git a/src/PHPCI/Model/Base/BuildBase.php b/src/PHPCI/Model/Base/BuildBase.php index 7cb8e55c..632f5a69 100644 --- a/src/PHPCI/Model/Base/BuildBase.php +++ b/src/PHPCI/Model/Base/BuildBase.php @@ -8,6 +8,7 @@ namespace PHPCI\Model\Base; use PHPCI\Model; use b8\Store\Factory; +use PHPCI\Model\Project; /** * Build Base Model @@ -598,7 +599,7 @@ class BuildBase extends Model public function setProject($value) { // Is this an instance of Project? - if ($value instanceof \PHPCI\Model\Project) { + if ($value instanceof Project) { return $this->setProjectObject($value); } @@ -614,9 +615,9 @@ class BuildBase extends Model /** * Set Project - Accepts a Project model. * - * @param $value \PHPCI\Model\Project + * @param $value Project */ - public function setProjectObject(\PHPCI\Model\Project $value) + public function setProjectObject(Project $value) { return $this->setProjectId($value->getId()); } diff --git a/src/PHPCI/Model/Base/BuildErrorBase.php b/src/PHPCI/Model/Base/BuildErrorBase.php index 79110499..be79c662 100644 --- a/src/PHPCI/Model/Base/BuildErrorBase.php +++ b/src/PHPCI/Model/Base/BuildErrorBase.php @@ -8,6 +8,7 @@ namespace PHPCI\Model\Base; use PHPCI\Model; use b8\Store\Factory; +use PHPCI\Model\Build; /** * BuildError Base Model @@ -478,7 +479,7 @@ class BuildErrorBase extends Model public function setBuild($value) { // Is this an instance of Build? - if ($value instanceof \PHPCI\Model\Build) { + if ($value instanceof Build) { return $this->setBuildObject($value); } @@ -494,9 +495,9 @@ class BuildErrorBase extends Model /** * Set Build - Accepts a Build model. * - * @param $value \PHPCI\Model\Build + * @param $value Build */ - public function setBuildObject(\PHPCI\Model\Build $value) + public function setBuildObject(Build $value) { return $this->setBuildId($value->getId()); } diff --git a/src/PHPCI/Model/Base/BuildMetaBase.php b/src/PHPCI/Model/Base/BuildMetaBase.php index be653427..4c080e7f 100644 --- a/src/PHPCI/Model/Base/BuildMetaBase.php +++ b/src/PHPCI/Model/Base/BuildMetaBase.php @@ -8,6 +8,8 @@ namespace PHPCI\Model\Base; use PHPCI\Model; use b8\Store\Factory; +use PHPCI\Model\Project; +use PHPCI\Model\Build; /** * BuildMeta Base Model @@ -325,7 +327,7 @@ class BuildMetaBase extends Model public function setProject($value) { // Is this an instance of Project? - if ($value instanceof \PHPCI\Model\Project) { + if ($value instanceof Project) { return $this->setProjectObject($value); } @@ -341,9 +343,9 @@ class BuildMetaBase extends Model /** * Set Project - Accepts a Project model. * - * @param $value \PHPCI\Model\Project + * @param $value Project */ - public function setProjectObject(\PHPCI\Model\Project $value) + public function setProjectObject(Project $value) { return $this->setProjectId($value->getId()); } @@ -382,7 +384,7 @@ class BuildMetaBase extends Model public function setBuild($value) { // Is this an instance of Build? - if ($value instanceof \PHPCI\Model\Build) { + if ($value instanceof Build) { return $this->setBuildObject($value); } @@ -398,9 +400,9 @@ class BuildMetaBase extends Model /** * Set Build - Accepts a Build model. * - * @param $value \PHPCI\Model\Build + * @param $value Build */ - public function setBuildObject(\PHPCI\Model\Build $value) + public function setBuildObject(Build $value) { return $this->setBuildId($value->getId()); } diff --git a/src/PHPCI/Model/Base/ProjectBase.php b/src/PHPCI/Model/Base/ProjectBase.php index 6cb81a8d..c7876508 100644 --- a/src/PHPCI/Model/Base/ProjectBase.php +++ b/src/PHPCI/Model/Base/ProjectBase.php @@ -8,6 +8,7 @@ namespace PHPCI\Model\Base; use PHPCI\Model; use b8\Store\Factory; +use PHPCI\Model\ProjectGroup; /** * Project Base Model @@ -628,7 +629,7 @@ class ProjectBase extends Model public function setGroup($value) { // Is this an instance of ProjectGroup? - if ($value instanceof \PHPCI\Model\ProjectGroup) { + if ($value instanceof ProjectGroup) { return $this->setGroupObject($value); } @@ -644,9 +645,9 @@ class ProjectBase extends Model /** * Set Group - Accepts a ProjectGroup model. * - * @param $value \PHPCI\Model\ProjectGroup + * @param $value ProjectGroup */ - public function setGroupObject(\PHPCI\Model\ProjectGroup $value) + public function setGroupObject(ProjectGroup $value) { return $this->setGroupId($value->getId()); } diff --git a/src/PHPCI/Model/Base/UserBase.php b/src/PHPCI/Model/Base/UserBase.php index c520b53f..8e91b425 100644 --- a/src/PHPCI/Model/Base/UserBase.php +++ b/src/PHPCI/Model/Base/UserBase.php @@ -7,7 +7,6 @@ namespace PHPCI\Model\Base; use PHPCI\Model; -use b8\Store\Factory; /** * User Base Model diff --git a/src/PHPCI/Model/Build/BitbucketBuild.php b/src/PHPCI/Model/Build/BitbucketBuild.php index 3af0d2b5..53db0dcb 100644 --- a/src/PHPCI/Model/Build/BitbucketBuild.php +++ b/src/PHPCI/Model/Build/BitbucketBuild.php @@ -10,7 +10,6 @@ namespace PHPCI\Model\Build; use PHPCI\Model\Build; -use PHPCI\Model\Build\RemoteGitBuild; /** * BitBucket Build Model diff --git a/src/PHPCI/Model/Build/GithubBuild.php b/src/PHPCI/Model/Build/GithubBuild.php index 7d203b5c..63bda477 100644 --- a/src/PHPCI/Model/Build/GithubBuild.php +++ b/src/PHPCI/Model/Build/GithubBuild.php @@ -12,7 +12,9 @@ namespace PHPCI\Model\Build; use PHPCI\Builder; use PHPCI\Helper\Diff; use PHPCI\Helper\Github; -use PHPCI\Model\Build\RemoteGitBuild; +use b8\Config; +use b8\HttpClient; +use PHPCI\Model\BuildError; /** * Github Build Model @@ -43,7 +45,7 @@ class GithubBuild extends RemoteGitBuild */ public function sendStatusPostback() { - $token = \b8\Config::getInstance()->get('phpci.github.token'); + $token = Config::getInstance()->get('phpci.github.token'); if (empty($token) || empty($this->data['id'])) { return; @@ -56,7 +58,7 @@ class GithubBuild extends RemoteGitBuild } $url = 'https://api.github.com/repos/'.$project->getReference().'/statuses/'.$this->getCommitId(); - $http = new \b8\HttpClient(); + $http = new HttpClient(); switch ($this->getStatus()) { case 0: @@ -78,7 +80,7 @@ class GithubBuild extends RemoteGitBuild break; } - $phpciUrl = \b8\Config::getInstance()->get('phpci.url'); + $phpciUrl = Config::getInstance()->get('phpci.url'); $params = [ 'state' => $status, @@ -112,11 +114,12 @@ class GithubBuild extends RemoteGitBuild /** * Get a parsed version of the commit message, with links to issues and commits. + * * @return string */ public function getCommitMessage() { - $rtn = parent::getCommitMessage($this->data['commit_message']); + $rtn = parent::getCommitMessage(); $project = $this->getProject(); diff --git a/src/PHPCI/Model/Build/GitlabBuild.php b/src/PHPCI/Model/Build/GitlabBuild.php index a1e0562c..e3a1a26b 100644 --- a/src/PHPCI/Model/Build/GitlabBuild.php +++ b/src/PHPCI/Model/Build/GitlabBuild.php @@ -9,8 +9,6 @@ namespace PHPCI\Model\Build; -use PHPCI\Model\Build\RemoteGitBuild; - /** * Gitlab Build Model * @author André Cianfarani diff --git a/src/PHPCI/Plugin/Atoum.php b/src/PHPCI/Plugin/Atoum.php index 19033014..c7b04a66 100644 --- a/src/PHPCI/Plugin/Atoum.php +++ b/src/PHPCI/Plugin/Atoum.php @@ -12,12 +12,13 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Atoum plugin, runs Atoum tests within a project. * @package PHPCI\Plugin */ -class Atoum implements \PHPCI\Plugin +class Atoum implements Plugin { private $args; private $config; diff --git a/src/PHPCI/Plugin/Behat.php b/src/PHPCI/Plugin/Behat.php index 104174ea..b5a2b338 100644 --- a/src/PHPCI/Plugin/Behat.php +++ b/src/PHPCI/Plugin/Behat.php @@ -13,6 +13,7 @@ use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Model\BuildError; +use PHPCI\Plugin; /** * Behat BDD Plugin @@ -20,7 +21,7 @@ use PHPCI\Model\BuildError; * @package PHPCI * @subpackage Plugins */ -class Behat implements \PHPCI\Plugin +class Behat implements Plugin { protected $phpci; protected $build; diff --git a/src/PHPCI/Plugin/Campfire.php b/src/PHPCI/Plugin/Campfire.php index e98a68e0..50a862a0 100644 --- a/src/PHPCI/Plugin/Campfire.php +++ b/src/PHPCI/Plugin/Campfire.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Campfire Plugin - Allows Campfire API actions. @@ -20,7 +21,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Campfire implements \PHPCI\Plugin +class Campfire implements Plugin { private $url; private $authToken; diff --git a/src/PHPCI/Plugin/CleanBuild.php b/src/PHPCI/Plugin/CleanBuild.php index 12355264..21ec7ef8 100644 --- a/src/PHPCI/Plugin/CleanBuild.php +++ b/src/PHPCI/Plugin/CleanBuild.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Clean build removes Composer related files and allows PHPCI users to clean up their build directory. @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class CleanBuild implements \PHPCI\Plugin +class CleanBuild implements Plugin { protected $remove; protected $phpci; diff --git a/src/PHPCI/Plugin/Codeception.php b/src/PHPCI/Plugin/Codeception.php index 69958e56..1f08dfa1 100644 --- a/src/PHPCI/Plugin/Codeception.php +++ b/src/PHPCI/Plugin/Codeception.php @@ -14,6 +14,8 @@ use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Plugin\Util\TestResultParsers\Codeception as Parser; use Psr\Log\LogLevel; +use PHPCI\Plugin; +use PHPCI\ZeroConfigPlugin; /** * Codeception Plugin - Enables full acceptance, unit, and functional testing. @@ -23,7 +25,7 @@ use Psr\Log\LogLevel; * @package PHPCI * @subpackage Plugins */ -class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin +class Codeception implements Plugin, ZeroConfigPlugin { /** @var string */ protected $args = ''; diff --git a/src/PHPCI/Plugin/Composer.php b/src/PHPCI/Plugin/Composer.php index e85828fd..f1b89cbc 100644 --- a/src/PHPCI/Plugin/Composer.php +++ b/src/PHPCI/Plugin/Composer.php @@ -12,7 +12,6 @@ namespace PHPCI\Plugin; use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; -use PHPCI\Helper\Lang; /** * Composer Plugin - Provides access to Composer functionality. diff --git a/src/PHPCI/Plugin/CopyBuild.php b/src/PHPCI/Plugin/CopyBuild.php index 9474e29a..6552048f 100644 --- a/src/PHPCI/Plugin/CopyBuild.php +++ b/src/PHPCI/Plugin/CopyBuild.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; use PHPCI\Helper\Lang; +use PHPCI\Plugin; /** * Copy Build Plugin - Copies the entire build to another directory. @@ -19,7 +20,7 @@ use PHPCI\Helper\Lang; * @package PHPCI * @subpackage Plugins */ -class CopyBuild implements \PHPCI\Plugin +class CopyBuild implements Plugin { protected $directory; protected $ignore; diff --git a/src/PHPCI/Plugin/Deployer.php b/src/PHPCI/Plugin/Deployer.php index 41084d51..eb91b623 100644 --- a/src/PHPCI/Plugin/Deployer.php +++ b/src/PHPCI/Plugin/Deployer.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use b8\HttpClient; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Integrates PHPCI with Deployer: https://github.com/rebelinblue/deployer @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Deployer implements \PHPCI\Plugin +class Deployer implements Plugin { protected $webhookUrl; protected $reason; diff --git a/src/PHPCI/Plugin/Email.php b/src/PHPCI/Plugin/Email.php index acc93682..a22ec1fb 100644 --- a/src/PHPCI/Plugin/Email.php +++ b/src/PHPCI/Plugin/Email.php @@ -12,10 +12,10 @@ namespace PHPCI\Plugin; use Exception; use b8\View; use PHPCI\Builder; -use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Helper\Email as EmailHelper; use Psr\Log\LogLevel; +use PHPCI\Plugin; /** * Email Plugin - Provides simple email capability to PHPCI. @@ -23,7 +23,7 @@ use Psr\Log\LogLevel; * @package PHPCI * @subpackage Plugins */ -class Email implements \PHPCI\Plugin +class Email implements Plugin { /** * @var \PHPCI\Builder diff --git a/src/PHPCI/Plugin/Env.php b/src/PHPCI/Plugin/Env.php index c0b4641c..e53d06a9 100644 --- a/src/PHPCI/Plugin/Env.php +++ b/src/PHPCI/Plugin/Env.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Environment variable plugin @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Env implements \PHPCI\Plugin +class Env implements Plugin { protected $phpci; protected $build; diff --git a/src/PHPCI/Plugin/FlowdockNotify.php b/src/PHPCI/Plugin/FlowdockNotify.php index db9de347..a73c955d 100644 --- a/src/PHPCI/Plugin/FlowdockNotify.php +++ b/src/PHPCI/Plugin/FlowdockNotify.php @@ -12,6 +12,7 @@ use PHPCI\Builder; use PHPCI\Model\Build; use Mremi\Flowdock\Api\Push\Push; use Mremi\Flowdock\Api\Push\TeamInboxMessage; +use PHPCI\Plugin; /** * Flowdock Plugin @@ -19,7 +20,7 @@ use Mremi\Flowdock\Api\Push\TeamInboxMessage; * @package PHPCI * @subpackage Plugins */ -class FlowdockNotify implements \PHPCI\Plugin +class FlowdockNotify implements Plugin { private $api_key; private $email; diff --git a/src/PHPCI/Plugin/Git.php b/src/PHPCI/Plugin/Git.php index ce058993..e8952c0d 100644 --- a/src/PHPCI/Plugin/Git.php +++ b/src/PHPCI/Plugin/Git.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Git plugin. @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Git implements \PHPCI\Plugin +class Git implements Plugin { protected $phpci; protected $build; diff --git a/src/PHPCI/Plugin/Grunt.php b/src/PHPCI/Plugin/Grunt.php index 8761d8d5..42ee4f44 100644 --- a/src/PHPCI/Plugin/Grunt.php +++ b/src/PHPCI/Plugin/Grunt.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Grunt Plugin - Provides access to grunt functionality. @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Grunt implements \PHPCI\Plugin +class Grunt implements Plugin { protected $directory; protected $task; diff --git a/src/PHPCI/Plugin/Gulp.php b/src/PHPCI/Plugin/Gulp.php index d69428bf..b58b9798 100644 --- a/src/PHPCI/Plugin/Gulp.php +++ b/src/PHPCI/Plugin/Gulp.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Gulp Plugin - Provides access to gulp functionality. @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Gulp implements \PHPCI\Plugin +class Gulp implements Plugin { protected $directory; protected $task; diff --git a/src/PHPCI/Plugin/HipchatNotify.php b/src/PHPCI/Plugin/HipchatNotify.php index 7c93914b..ff0eb598 100644 --- a/src/PHPCI/Plugin/HipchatNotify.php +++ b/src/PHPCI/Plugin/HipchatNotify.php @@ -12,6 +12,8 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; +use HipChat\HipChat; /** * Hipchat Plugin @@ -19,7 +21,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class HipchatNotify implements \PHPCI\Plugin +class HipchatNotify implements Plugin { protected $authToken; protected $color; @@ -73,7 +75,7 @@ class HipchatNotify implements \PHPCI\Plugin */ public function execute() { - $hipChat = new \HipChat\HipChat($this->authToken); + $hipChat = new HipChat($this->authToken); $message = $this->phpci->interpolate($this->message); $result = true; diff --git a/src/PHPCI/Plugin/Irc.php b/src/PHPCI/Plugin/Irc.php index 44457f9e..4fe37cd7 100644 --- a/src/PHPCI/Plugin/Irc.php +++ b/src/PHPCI/Plugin/Irc.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * IRC Plugin - Sends a notification to an IRC channel @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Irc implements \PHPCI\Plugin +class Irc implements Plugin { protected $phpci; protected $build; diff --git a/src/PHPCI/Plugin/Mysql.php b/src/PHPCI/Plugin/Mysql.php index dd110108..41412a6a 100644 --- a/src/PHPCI/Plugin/Mysql.php +++ b/src/PHPCI/Plugin/Mysql.php @@ -13,6 +13,8 @@ use PDO; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; +use b8\Database; /** * MySQL Plugin - Provides access to a MySQL database. @@ -21,7 +23,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Mysql implements \PHPCI\Plugin +class Mysql implements Plugin { /** * @var \PHPCI\Builder @@ -65,7 +67,7 @@ class Mysql implements \PHPCI\Plugin $this->queries = $options; - $config = \b8\Database::getConnection('write')->getDetails(); + $config = Database::getConnection('write')->getDetails(); $this->host =(defined('PHPCI_DB_HOST')) ? PHPCI_DB_HOST : null; $this->user = $config['user']; diff --git a/src/PHPCI/Plugin/PackageBuild.php b/src/PHPCI/Plugin/PackageBuild.php index 4db8c67a..5a4ccf73 100644 --- a/src/PHPCI/Plugin/PackageBuild.php +++ b/src/PHPCI/Plugin/PackageBuild.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Create a ZIP or TAR.GZ archive of the entire build. @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PackageBuild implements \PHPCI\Plugin +class PackageBuild implements Plugin { protected $directory; protected $filename; diff --git a/src/PHPCI/Plugin/Pdepend.php b/src/PHPCI/Plugin/Pdepend.php index 2c6e28cd..bb35ec4a 100644 --- a/src/PHPCI/Plugin/Pdepend.php +++ b/src/PHPCI/Plugin/Pdepend.php @@ -10,8 +10,8 @@ namespace PHPCI\Plugin; use PHPCI\Builder; -use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Pdepend Plugin - Allows Pdepend report @@ -19,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Pdepend implements \PHPCI\Plugin +class Pdepend implements Plugin { protected $args; /** diff --git a/src/PHPCI/Plugin/Pgsql.php b/src/PHPCI/Plugin/Pgsql.php index cad65da0..0594e46a 100644 --- a/src/PHPCI/Plugin/Pgsql.php +++ b/src/PHPCI/Plugin/Pgsql.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PDO; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * PgSQL Plugin - Provides access to a PgSQL database. @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Pgsql implements \PHPCI\Plugin +class Pgsql implements Plugin { /** * @var \PHPCI\Builder diff --git a/src/PHPCI/Plugin/Phar.php b/src/PHPCI/Plugin/Phar.php index 731100cd..8e1a4a22 100644 --- a/src/PHPCI/Plugin/Phar.php +++ b/src/PHPCI/Plugin/Phar.php @@ -1,4 +1,5 @@ phpci->interpolate($this->message); - $client = new \Maknz\Slack\Client($this->webHook); + $client = new Client($this->webHook); $message = $client->createMessage(); @@ -112,12 +116,12 @@ class SlackNotify implements \PHPCI\Plugin } // Build up the attachment data - $attachment = new \Maknz\Slack\Attachment([ + $attachment = new Attachment([ 'fallback' => $body, 'pretext' => $body, 'color' => $color, 'fields' => [ - new \Maknz\Slack\AttachmentField([ + new AttachmentField([ 'title' => 'Status', 'value' => $status, 'short' => false diff --git a/src/PHPCI/Plugin/Sqlite.php b/src/PHPCI/Plugin/Sqlite.php index 3b0c267a..52482fe5 100644 --- a/src/PHPCI/Plugin/Sqlite.php +++ b/src/PHPCI/Plugin/Sqlite.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PDO; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * SQLite Plugin — Provides access to a SQLite database. @@ -19,7 +20,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Sqlite implements \PHPCI\Plugin +class Sqlite implements Plugin { /** * @var \PHPCI\Builder diff --git a/src/PHPCI/Plugin/Util/Executor.php b/src/PHPCI/Plugin/Util/Executor.php index b4af0765..20c51f3f 100644 --- a/src/PHPCI/Plugin/Util/Executor.php +++ b/src/PHPCI/Plugin/Util/Executor.php @@ -236,7 +236,7 @@ class Executor /** * Sets the summary data of the current build. * - * @param array summary + * @param array $summary */ private function setBuildSummary($summary) { diff --git a/src/PHPCI/Plugin/Wipe.php b/src/PHPCI/Plugin/Wipe.php index e448a939..8b53d2cd 100644 --- a/src/PHPCI/Plugin/Wipe.php +++ b/src/PHPCI/Plugin/Wipe.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * Wipe Plugin - Wipes a folder @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Wipe implements \PHPCI\Plugin +class Wipe implements Plugin { /** * @var \PHPCI\Builder diff --git a/src/PHPCI/Plugin/Xmpp.php b/src/PHPCI/Plugin/Xmpp.php index fc702bf8..2431911a 100644 --- a/src/PHPCI/Plugin/Xmpp.php +++ b/src/PHPCI/Plugin/Xmpp.php @@ -11,6 +11,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin; /** * XMPP Notification - Send notification for successful or failure build @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class XMPP implements \PHPCI\Plugin +class XMPP implements Plugin { protected $directory; protected $phpci; diff --git a/src/PHPCI/ProcessControl/WindowsProcessControl.php b/src/PHPCI/ProcessControl/WindowsProcessControl.php index e750d321..4eb6656c 100644 --- a/src/PHPCI/ProcessControl/WindowsProcessControl.php +++ b/src/PHPCI/ProcessControl/WindowsProcessControl.php @@ -19,7 +19,8 @@ class WindowsProcessControl implements ProcessControlInterface /** * Check if the process is running using the "tasklist" command. * - * @param type $pid + * @param integer $pid + * * @return bool */ public function isRunning($pid) @@ -32,7 +33,8 @@ class WindowsProcessControl implements ProcessControlInterface /** * Terminate the process using the "taskkill" command. * - * @param type $pid + * @param integer $pid + * * @param bool $forcefully */ public function kill($pid, $forcefully = false) diff --git a/src/PHPCI/Store/BuildMetaStore.php b/src/PHPCI/Store/BuildMetaStore.php index 019b44fd..556a7fb4 100644 --- a/src/PHPCI/Store/BuildMetaStore.php +++ b/src/PHPCI/Store/BuildMetaStore.php @@ -21,8 +21,9 @@ class BuildMetaStore extends BuildMetaStoreBase { /** * Only used by an upgrade migration to move errors from build_meta to build_error - * @param $start + * * @param $limit + * * @return array */ public function getErrorsForUpgrade($limit) diff --git a/src/PHPCI/Store/BuildStore.php b/src/PHPCI/Store/BuildStore.php index 6321ae19..4ae23b71 100644 --- a/src/PHPCI/Store/BuildStore.php +++ b/src/PHPCI/Store/BuildStore.php @@ -47,7 +47,7 @@ class BuildStore extends BuildStoreBase $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); $map = function ($item) { - return new \PHPCI\Model\Build($item); + return new Build($item); }; $rtn = array_map($map, $res); diff --git a/src/PHPCI/View/Session.phtml b/src/PHPCI/View/Session.phtml index 4597e43e..768672b8 100644 --- a/src/PHPCI/View/Session.phtml +++ b/src/PHPCI/View/Session.phtml @@ -90,7 +90,7 @@
diff --git a/src/PHPCI/View/SummaryTable.phtml b/src/PHPCI/View/SummaryTable.phtml index c6c84860..670dde1f 100644 --- a/src/PHPCI/View/SummaryTable.phtml +++ b/src/PHPCI/View/SummaryTable.phtml @@ -90,22 +90,7 @@ foreach($projects as $project): ?>
- - 5): ?> - -
-

- - - getTitle(); ?> - - - - -

-
- - - +

@@ -125,8 +110,6 @@ foreach($projects as $project): (getId()]; ?>) - - getId()][$idx])) { echo ''; diff --git a/src/PHPCI/Worker/BuildWorker.php b/src/PHPCI/Worker/BuildWorker.php index 92ee4ced..42c45be7 100644 --- a/src/PHPCI/Worker/BuildWorker.php +++ b/src/PHPCI/Worker/BuildWorker.php @@ -116,8 +116,7 @@ class BuildWorker if (!empty($jobData['config'])) { $this->logger->addDebug('Using job-specific config.'); $currentConfig = Config::getInstance()->getArray(); - $config = new Config($jobData['config']); - Database::reset($config); + Database::reset(); } try { @@ -138,7 +137,7 @@ class BuildWorker // After execution we no longer want to record the information // back to this specific build so the handler should be removed. - $this->logger->popHandler($buildDbLog); + $this->logger->popHandler(); } catch (\PDOException $ex) { // If we've caught a PDO Exception, it is probably not the fault of the build, but of a failed // connection or similar. Release the job and kill the worker. @@ -154,8 +153,7 @@ class BuildWorker // Reset the config back to how it was prior to running this job: if (!empty($currentConfig)) { - $config = new Config($currentConfig); - Database::reset($config); + Database::reset(); } // Delete the job when we're done: diff --git a/tests/B8Framework/data/view/Form/form.phtml b/tests/B8Framework/data/view/Form/form.phtml index 1473e2fa..16bfb502 100755 --- a/tests/B8Framework/data/view/Form/form.phtml +++ b/tests/B8Framework/data/view/Form/form.phtml @@ -1 +1 @@ - \ No newline at end of file + diff --git a/tests/B8Framework/data/view/format.phtml b/tests/B8Framework/data/view/format.phtml index e646a066..c87199a6 100755 --- a/tests/B8Framework/data/view/format.phtml +++ b/tests/B8Framework/data/view/format.phtml @@ -1 +1 @@ -Format()->Currency($number, $symbol); ?> \ No newline at end of file +Format()->Currency($number, $symbol); ?> diff --git a/tests/PHPCI/Service/BuiltStatusServiceTest.php b/tests/PHPCI/Service/BuiltStatusServiceTest.php index 91e115e4..d9a1320c 100644 --- a/tests/PHPCI/Service/BuiltStatusServiceTest.php +++ b/tests/PHPCI/Service/BuiltStatusServiceTest.php @@ -11,7 +11,6 @@ namespace PHPCI\Service\Tests; use PHPCI\Model\Build; use PHPCI\Model\Project; -use PHPCI\Service\BuildService; use PHPCI\Service\BuildStatusService; /**