From bb76952e6aac3d8099e3947b1a7ce077e46a40e8 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 26 Feb 2014 11:16:09 +0000 Subject: [PATCH 1/5] Update phpci.yml --- phpci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpci.yml b/phpci.yml index 8d962dca..ec5b056a 100644 --- a/phpci.yml +++ b/phpci.yml @@ -8,9 +8,7 @@ build_settings: test: php_mess_detector: - allow_failures: true # Temporarily allowing failures, remove this! php_code_sniffer: - allow_failures: true # Temporarily allowing failures, remove this! standard: "PSR2" php_loc: From b421b2093592ed0abee7bf271d800b4c6dfd7102 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Wed, 26 Feb 2014 14:35:14 +0000 Subject: [PATCH 2/5] fix code sniff violations. --- PHPCI/Application.php | 3 +-- PHPCI/Builder.php | 14 ++++++-------- PHPCI/Model.php | 2 +- PHPCI/Store.php | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 3f20c3ed..03e878d7 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -27,8 +27,7 @@ class Application extends b8\Application $opts = ['controller' => 'Home', 'action' => 'index']; $this->router->clearRoutes(); - $this->router->register($route, $opts, function (&$route, Response &$response) use (&$request) - { + $this->router->register($route, $opts, function (&$route, Response &$response) use (&$request) { $skipValidation = in_array($route['controller'], array('session', 'webhook', 'build-status')); if (!$skipValidation && !$this->validateSession()) { diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index eb3e08e9..e7ea97e3 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -197,8 +197,7 @@ class Builder implements LoggerAwareInterface // stages. if ($this->success) { $this->build->setStatus(Build::STATUS_SUCCESS); - } - else { + } else { $this->build->setStatus(Build::STATUS_FAILED); } @@ -208,8 +207,7 @@ class Builder implements LoggerAwareInterface if ($this->success) { $this->pluginExecutor->executePlugins($this->config, 'success'); $this->buildLogger->logSuccess('BUILD SUCCESSFUL!'); - } - else { + } else { $this->pluginExecutor->executePlugins($this->config, 'failure'); $this->buildLogger->logFailure("BUILD FAILURE"); } @@ -266,8 +264,8 @@ class Builder implements LoggerAwareInterface */ protected function setupBuild() { - $buildId = 'project' . $this->build->getProject()->getId( - ) . '-build' . $this->build->getId(); + $buildId = 'project' . $this->build->getProject()->getId() + . '-build' . $this->build->getId(); $this->ciDir = dirname(dirname(__FILE__) . '/../') . '/'; $this->buildPath = $this->ciDir . 'build/' . $buildId . '/'; $this->build->currentBuildPath = $this->buildPath; @@ -338,7 +336,7 @@ class Builder implements LoggerAwareInterface $self = $this; $pluginFactory->registerResource( - function () use($self) { + function () use ($self) { return $self; }, null, @@ -346,7 +344,7 @@ class Builder implements LoggerAwareInterface ); $pluginFactory->registerResource( - function () use($build) { + function () use ($build) { return $build; }, null, diff --git a/PHPCI/Model.php b/PHPCI/Model.php index 392df656..7e314693 100644 --- a/PHPCI/Model.php +++ b/PHPCI/Model.php @@ -4,4 +4,4 @@ namespace PHPCI; abstract class Model extends \b8\Model { -} \ No newline at end of file +} diff --git a/PHPCI/Store.php b/PHPCI/Store.php index f0352680..6806a097 100644 --- a/PHPCI/Store.php +++ b/PHPCI/Store.php @@ -4,4 +4,4 @@ namespace PHPCI; abstract class Store extends \b8\Store { -} \ No newline at end of file +} From 112adba3325b824855249a853a88d21efbadf9d0 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Thu, 27 Feb 2014 14:02:21 +0000 Subject: [PATCH 3/5] fix psr2 violations in Plugin/Util --- .../Plugin/Util/ComposerPluginInformation.php | 32 +++++++++---------- PHPCI/Plugin/Util/Executor.php | 7 ++-- PHPCI/Plugin/Util/Factory.php | 23 ++++++------- PHPCI/Plugin/Util/FilesPluginInformation.php | 15 ++++----- .../Util/InstalledPluginInformation.php | 2 +- .../Util/PluginInformationCollection.php | 6 ++-- 6 files changed, 41 insertions(+), 44 deletions(-) diff --git a/PHPCI/Plugin/Util/ComposerPluginInformation.php b/PHPCI/Plugin/Util/ComposerPluginInformation.php index 0ce76e6f..c870514e 100644 --- a/PHPCI/Plugin/Util/ComposerPluginInformation.php +++ b/PHPCI/Plugin/Util/ComposerPluginInformation.php @@ -23,8 +23,7 @@ class ComposerPluginInformation implements InstalledPluginInformation { if (file_exists($filePath)) { $installed = json_decode(file_get_contents($filePath)); - } - else { + } else { $installed = array(); } return new self($installed); @@ -60,12 +59,12 @@ class ComposerPluginInformation implements InstalledPluginInformation */ public function getPluginClasses() { - return array_map( - function($plugin) { - return $plugin->class; - }, - $this->getInstalledPlugins() - ); + return array_map( + function ($plugin) { + return $plugin->class; + }, + $this->getInstalledPlugins() + ); } protected function loadPluginInfo() @@ -74,7 +73,7 @@ class ComposerPluginInformation implements InstalledPluginInformation return; } $this->pluginInfo = array(); - foreach($this->composerPackages as $package) { + foreach ($this->composerPackages as $package) { $this->addPluginsFromPackage($package); } } @@ -89,8 +88,7 @@ class ComposerPluginInformation implements InstalledPluginInformation if (isset($phpciData->pluginNamespace)) { $rootNamespace = $phpciData->pluginNamespace; - } - else { + } else { $rootNamespace = ""; } @@ -112,9 +110,9 @@ class ComposerPluginInformation implements InstalledPluginInformation protected function addPlugins( array $plugins, $sourcePackageName, - $rootNamespace = "") - { - foreach($plugins as $plugin) { + $rootNamespace = "" + ) { + foreach ($plugins as $plugin) { if (!isset($plugin->class)) { continue; } @@ -130,8 +128,8 @@ class ComposerPluginInformation implements InstalledPluginInformation protected function addPlugin( $plugin, $sourcePackageName, - $rootNamespace = "") - { + $rootNamespace = "" + ) { $newPlugin = clone $plugin; $newPlugin->class = $rootNamespace . $newPlugin->class; @@ -144,4 +142,4 @@ class ComposerPluginInformation implements InstalledPluginInformation $this->pluginInfo[] = $newPlugin; } -} \ No newline at end of file +} diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index ceb1de55..39a5d35e 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -17,7 +17,7 @@ class Executor */ protected $pluginFactory; - function __construct(Factory $pluginFactory,BuildLogger $logger) + public function __construct(Factory $pluginFactory, BuildLogger $logger) { $this->pluginFactory = $pluginFactory; $this->logger = $logger; @@ -78,8 +78,7 @@ class Executor $class = str_replace('_', ' ', $plugin); $class = ucwords($class); $class = 'PHPCI\\Plugin\\' . str_replace(' ', '', $class); - } - else { + } else { $class = $plugin; } @@ -105,4 +104,4 @@ class Executor return $rtn; } -} \ No newline at end of file +} diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 0e526023..781b6d5a 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -29,7 +29,7 @@ class Factory { $self = $this; $this->registerResource( - function() use ($self) { + function () use ($self) { return $self->getLastOptions(); }, 'options', @@ -37,7 +37,8 @@ class Factory { ); } - public function getLastOptions() { + public function getLastOptions() + { return $this->currentPluginOptions; } @@ -66,7 +67,7 @@ class Factory { if ($constructor) { $argsToUse = array(); - foreach($constructor->getParameters() as $param) { + foreach ($constructor->getParameters() as $param) { $argsToUse = $this->addArgFromParam($argsToUse, $param); } $plugin = $reflectedPlugin->newInstanceArgs($argsToUse); @@ -84,11 +85,11 @@ class Factory { * @throws \InvalidArgumentException * @internal param mixed $resource */ - public function registerResource($loader, - $name = null, - $type = null - ) - { + public function registerResource( + $loader, + $name = null, + $type = null + ) { if ($name === null && $type === null) { throw new \InvalidArgumentException( "Type or Name must be specified" @@ -138,9 +139,9 @@ class Factory { $class = $param->getClass(); if ($class) { return $class->getName(); - } elseif($param->isArray()) { + } elseif ($param->isArray()) { return self::TYPE_ARRAY; - } elseif($param->isCallable()) { + } elseif ($param->isCallable()) { return self::TYPE_CALLABLE; } else { return null; @@ -165,4 +166,4 @@ class Factory { return $existingArgs; } -} \ No newline at end of file +} diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php index 3d8b6f47..8366c4cb 100644 --- a/PHPCI/Plugin/Util/FilesPluginInformation.php +++ b/PHPCI/Plugin/Util/FilesPluginInformation.php @@ -26,7 +26,7 @@ class FilesPluginInformation implements InstalledPluginInformation return new self(new \DirectoryIterator($dirPath)); } - function __construct(\Iterator $files) + public function __construct(\Iterator $files) { $this->files = $files; } @@ -55,17 +55,17 @@ class FilesPluginInformation implements InstalledPluginInformation public function getPluginClasses() { return array_map( - function($plugin) { + function ($plugin) { return $plugin->class; - }, - $this->getInstalledPlugins() - ); + }, + $this->getInstalledPlugins() + ); } protected function loadPluginInfo() { $this->pluginInfo = array(); - foreach($this->files as $fileInfo) { + foreach ($this->files as $fileInfo) { if ($fileInfo instanceof \SplFileInfo) { if ($fileInfo->isFile()) { $this->addPluginFromFile($fileInfo); @@ -101,5 +101,4 @@ class FilesPluginInformation implements InstalledPluginInformation return $namespace . '\\' . $className; } - -} \ No newline at end of file +} diff --git a/PHPCI/Plugin/Util/InstalledPluginInformation.php b/PHPCI/Plugin/Util/InstalledPluginInformation.php index f63c432a..133b8de8 100644 --- a/PHPCI/Plugin/Util/InstalledPluginInformation.php +++ b/PHPCI/Plugin/Util/InstalledPluginInformation.php @@ -20,4 +20,4 @@ interface InstalledPluginInformation * @return string[] */ public function getPluginClasses(); -} \ No newline at end of file +} diff --git a/PHPCI/Plugin/Util/PluginInformationCollection.php b/PHPCI/Plugin/Util/PluginInformationCollection.php index 23245a8d..9017ba72 100644 --- a/PHPCI/Plugin/Util/PluginInformationCollection.php +++ b/PHPCI/Plugin/Util/PluginInformationCollection.php @@ -24,7 +24,7 @@ class PluginInformationCollection implements InstalledPluginInformation public function getInstalledPlugins() { $arr = array(); - foreach($this->pluginInformations as $single) { + foreach ($this->pluginInformations as $single) { $arr = array_merge($arr, $single->getInstalledPlugins()); } return $arr; @@ -39,10 +39,10 @@ class PluginInformationCollection implements InstalledPluginInformation public function getPluginClasses() { $arr = array(); - foreach($this->pluginInformations as $single) { + foreach ($this->pluginInformations as $single) { $arr = array_merge($arr, $single->getPluginClasses()); } return $arr; } -} \ No newline at end of file +} From 6431ef501ed07afc0f93f889613607939b616023 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Thu, 27 Feb 2014 14:04:08 +0000 Subject: [PATCH 4/5] fix psr2 violations in EmailPlugin --- PHPCI/Plugin/Email.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 5d29de65..f6317197 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -41,13 +41,13 @@ class Email implements \PHPCI\Plugin */ protected $fromAddress; - public function __construct(Builder $phpci, - Build $build, - \Swift_Mailer $mailer, - array $options = array() + public function __construct( + Builder $phpci, + Build $build, + \Swift_Mailer $mailer, + array $options = array() - ) - { + ) { $this->phpci = $phpci; $this->build = $build; $this->options = $options; @@ -168,14 +168,14 @@ class Email implements \PHPCI\Plugin protected function getCcAddresses() { - $cc = array(); + $ccAddresses = array(); if (isset($this->options['cc'])) { foreach ($this->options['cc'] as $address) { - $cc[] = $address; + $ccAddresses[] = $address; } } - return $cc; + return $ccAddresses; } -} \ No newline at end of file +} From 5178c4c2299b2d86185476a710fdca18a35b7e84 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Thu, 27 Feb 2014 14:12:19 +0000 Subject: [PATCH 5/5] tidy up code in Command namespace --- PHPCI/Command/CreateAdminCommand.php | 4 ++-- PHPCI/Command/DaemoniseCommand.php | 14 ++++++++++++-- PHPCI/Command/PollCommand.php | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php index 6122a108..647dffca 100644 --- a/PHPCI/Command/CreateAdminCommand.php +++ b/PHPCI/Command/CreateAdminCommand.php @@ -46,7 +46,7 @@ class CreateAdminCommand extends Command if (empty($adminEmail)) { return; } - + $adminPass = $this->ask('Admin password: '); $adminName = $this->ask('Admin name: '); @@ -64,7 +64,7 @@ class CreateAdminCommand extends Command } catch (\Exception $ex) { print 'There was a problem creating your account. :(' . PHP_EOL; print $ex->getMessage(); - print PHP_EOL; + print PHP_EOL; } } diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index 5d2f003a..f8cbc45b 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -36,6 +36,16 @@ class DaemoniseCommand extends Command */ protected $output; + /** + * @var boolean + */ + protected $run; + + /** + * @var int + */ + protected $sleep; + /** * @param \Monolog\Logger $logger * @param string $name @@ -67,14 +77,14 @@ class DaemoniseCommand extends Command $this->sleep = 0; $runner = new RunCommand($this->logger); - $in = new ArgvInput(array()); + $emptyInput = new ArgvInput(array()); while ($this->run) { $buildCount = 0; try { - $buildCount = $runner->run($in, $output); + $buildCount = $runner->run($emptyInput, $output); } catch (\Exception $e) { var_dump($e); } diff --git a/PHPCI/Command/PollCommand.php b/PHPCI/Command/PollCommand.php index 8bbe83cf..503e83a8 100644 --- a/PHPCI/Command/PollCommand.php +++ b/PHPCI/Command/PollCommand.php @@ -80,7 +80,9 @@ class PollCommand extends Command $this->logger->info("Last commit to github for " . $project->getTitle() . " is " . $last_commit); if ($project->getLastCommit() != $last_commit && $last_commit != "") { - $this->logger->info("Last commit is different from database, adding new build for " . $project->getTitle()); + $this->logger->info( + "Last commit is different from database, adding new build for " . $project->getTitle() + ); $build = new Build(); $build->setProjectId($project->getId()); @@ -101,4 +103,3 @@ class PollCommand extends Command $this->logger->addInfo("Finished processing builds"); } } -