From 5cd2e21e07c0573e6b59a00198699f673def10f4 Mon Sep 17 00:00:00 2001 From: Armen Markossyan Date: Fri, 2 May 2014 23:47:08 +0600 Subject: [PATCH 01/83] Fix #217 --- PHPCI/Plugin/PhpLoc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php index 000b82cc..a00e6668 100644 --- a/PHPCI/Plugin/PhpLoc.php +++ b/PHPCI/Plugin/PhpLoc.php @@ -68,7 +68,7 @@ class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->phpci->buildPath); + $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->directory); $output = $this->phpci->getLastOutput(); if (preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) { From 067aa858760a1ad2f6ffef7b4c41604c95e5e136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jari=20Ylim=C3=A4inen?= Date: Fri, 2 May 2014 22:58:22 +0300 Subject: [PATCH 02/83] Interpolate PHPUnit arguments --- PHPCI/Plugin/PhpUnit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 16de7aa0..76f321b1 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -101,7 +101,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (isset($options['args'])) { - $this->args = $options['args']; + $this->args = $this->phpci->interpolate($options['args']); } if (isset($options['path'])) { From 77daef3a5fe6a3438fd2863fb1b67758282ed1fd Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 6 May 2014 16:43:47 +0100 Subject: [PATCH 03/83] Fixing daemonise mode, forcing RunCommand to only get one build at a time when running under daemon mode --- PHPCI/Command/DaemoniseCommand.php | 1 + PHPCI/Command/RunCommand.php | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index f8cbc45b..b4d0295c 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -76,6 +76,7 @@ class DaemoniseCommand extends Command $this->run = true; $this->sleep = 0; $runner = new RunCommand($this->logger); + $runner->setBaxBuilds(1); $emptyInput = new ArgvInput(array()); diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index 318f9247..dc64aef9 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -42,6 +42,11 @@ class RunCommand extends Command */ protected $logger; + /** + * @var int + */ + protected $maxBuilds = null; + /** * @param \Monolog\Logger $logger * @param string $name @@ -52,7 +57,6 @@ class RunCommand extends Command $this->logger = $logger; } - protected function configure() { $this @@ -69,7 +73,7 @@ class RunCommand extends Command // For verbose mode we want to output all informational and above // messages to the symphony output interface. - if ($input->getOption('verbose')) { + if ($input->hasOption('verbose')) { $this->logger->pushHandler( new OutputLogHandler($this->output, Logger::INFO) ); @@ -79,7 +83,7 @@ class RunCommand extends Command $this->logger->addInfo("Finding builds to process"); $store = Factory::getStore('Build'); - $result = $store->getByStatus(0); + $result = $store->getByStatus(0, $this->maxBuilds); $this->logger->addInfo(sprintf("Found %d builds", count($result['items']))); $builds = 0; @@ -113,4 +117,9 @@ class RunCommand extends Command return $builds; } + + public function setBaxBuilds($numBuilds) + { + $this->maxBuilds = (int)$numBuilds; + } } From b9397414c38dbf3e80d7ff8f94f7f743f86a0a61 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 6 May 2014 16:44:23 +0100 Subject: [PATCH 04/83] Enable setting config file path via env rather than assuming PHPCI/config.yml (both work) --- bootstrap.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index ee819c49..02e8c820 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -33,10 +33,24 @@ $autoload = function ($class) { spl_autoload_register($autoload, true, true); -if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { +// If the PHPCI config file is not where we expect it, try looking in +// env for an alternative config path. +$configFile = dirname(__FILE__) . '/PHPCI/config.yml'; + +if (!file_exists($configFile)) { + $configEnv = getenv('phpci_config_file'); + + if (!empty($configEnv)) { + $configFile = $configEnv; + } +} + +// If we don't have a config file at all, fail at this point and tell the user to install: +if (!file_exists($configFile) && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { die('PHPCI has not yet been installed - Please use the command ./console phpci:install to install it.'); } +// If composer has not been run, fail at this point and tell the user to install: if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) { file_put_contents('php://stderr', 'Please install PHPCI with "composer install" before using console'); exit(1); @@ -54,9 +68,7 @@ $conf['b8']['app']['namespace'] = 'PHPCI'; $conf['b8']['app']['default_controller'] = 'Home'; $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/'; -if (file_exists(dirname(__FILE__) . '/PHPCI/config.yml')) { - $config = new b8\Config($conf); - $config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml'); -} +$config = new b8\Config($conf); +$config->loadYaml($configFile); require_once(dirname(__FILE__) . '/vars.php'); From 9eefc7bf8ec4975e3401953a61007f21d957e615 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 7 May 2014 10:20:21 +0100 Subject: [PATCH 05/83] Making phpunit plugin log the TAP string in the event it fails to process it. --- PHPCI/Plugin/PhpUnit.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 16de7aa0..327e41f3 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -132,9 +132,16 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $success &= $this->runDir($this->directory); } - $output = $this->phpci->getLastOutput(); - $tapParser = new TapParser($output); - $output = $tapParser->parse(); + $tapString = $this->phpci->getLastOutput(); + + try { + $tapParser = new TapParser($tapString); + $output = $tapParser->parse(); + } catch (\Exception $ex) { + $this->phpci->logFailure($tapString); + throw $ex; + } + $failures = $tapParser->getTotalFailures(); $this->build->storeMeta('phpunit-errors', $failures); From 033301682858c796924169671f7ded6432c78dee Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 7 May 2014 16:09:56 +0100 Subject: [PATCH 06/83] Converting build meta to use longtext instead of text, for builds with a lot of errors. --- PHPCI/Model/Base/BuildMetaBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index b7f85490..fc9183b2 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -98,7 +98,7 @@ class BuildMetaBase extends Model 'default' => null, ), 'meta_value' => array( - 'type' => 'text', + 'type' => 'longtext', 'nullable' => true, 'default' => null, ), From b1885a07fd3a25c962db4cb1c472d97f550dccd1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 12:16:09 +0000 Subject: [PATCH 07/83] Fixing bootstrap for ./console phpci:install --- bootstrap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 02e8c820..2a271503 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -69,6 +69,9 @@ $conf['b8']['app']['default_controller'] = 'Home'; $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/'; $config = new b8\Config($conf); -$config->loadYaml($configFile); + +if (file_exists($configFile)) { + $config->loadYaml($configFile); +} require_once(dirname(__FILE__) . '/vars.php'); From 43ce5554a60c56f949d92eed4056e0bf3072d39c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:02:24 +0000 Subject: [PATCH 08/83] Adding PHP Docblock Checker plugin --- PHPCI/Plugin/PhpDocblockChecker.php | 138 ++++++++++++++++++ phpci.yml | 2 + public/assets/js/build-plugins/phpdoccheck.js | 78 ++++++++++ public/assets/js/build-plugins/warnings.js | 5 +- 4 files changed, 221 insertions(+), 2 deletions(-) create mode 100755 PHPCI/Plugin/PhpDocblockChecker.php create mode 100644 public/assets/js/build-plugins/phpdoccheck.js diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php new file mode 100755 index 00000000..b41b8434 --- /dev/null +++ b/PHPCI/Plugin/PhpDocblockChecker.php @@ -0,0 +1,138 @@ + +* @package PHPCI +* @subpackage Plugins +*/ +class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin +{ + /** + * @var \PHPCI\Builder + */ + protected $phpci; + + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + /** + * @var string Based on the assumption the root may not hold the code to be + * tested, extends the build path. + */ + protected $path; + + /** + * @var array - paths to ignore + */ + protected $ignore; + + protected $skipClasses = false; + protected $skipMethods = false; + + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + + + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + $this->ignore = $phpci->ignore; + $this->path = ''; + $this->allowed_warnings = 0; + + if (isset($options['zero_config']) && $options['zero_config']) { + $this->allowed_warnings = -1; + } + + if (array_key_exists('skip_classes', $options)) { + $this->skipClasses = true; + } + + if (array_key_exists('skip_methods', $options)) { + $this->skipMethods = true; + } + + if (!empty($options['path'])) { + $this->path = $options['path']; + } + + if (array_key_exists('allowed_warnings', $options)) { + $this->allowed_warnings = (int)$options['allowed_warnings']; + } + } + + /** + * Runs PHP Mess Detector in a specified directory. + */ + public function execute() + { + $ignore = ''; + if (count($this->ignore)) { + $ignore = ' --exclude="' . implode(',', $this->ignore) . '"'; + } + + var_dump($ignore); + + $checker = $this->phpci->findBinary('phpdoccheck'); + + if (!$checker) { + $this->phpci->logFailure('Could not find phpdoccheck.'); + return false; + } + + $path = $this->phpci->buildPath . $this->path; + + $cmd = $checker . ' --json --directory="%s"%s%s%s'; + + // Disable exec output logging, as we don't want the XML report in the log: + $this->phpci->logExecOutput(false); + + // Run checker: + $this->phpci->executeCommand( + $cmd, + $path, + $ignore, + ($this->skipClasses ? ' --skip-classes' : ''), + ($this->skipMethods ? ' --skip-methods' : '') + ); + + // Re-enable exec output logging: + $this->phpci->logExecOutput(true); + + $output = json_decode($this->phpci->getLastOutput()); + $errors = count($output); + $success = true; + + $this->build->storeMeta('phpdoccheck-warnings', $errors); + $this->build->storeMeta('phpdoccheck-data', $output); + + if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { + $success = false; + } + + return $success; + } +} diff --git a/phpci.yml b/phpci.yml index 9dda1fa4..24121476 100644 --- a/phpci.yml +++ b/phpci.yml @@ -17,6 +17,8 @@ test: standard: "PSR2" php_loc: php_unit: + php_docblock_checker: + allowed_warnings: -1 # Allow unlimited warnings for now. failure: email: diff --git a/public/assets/js/build-plugins/phpdoccheck.js b/public/assets/js/build-plugins/phpdoccheck.js new file mode 100644 index 00000000..89d8b449 --- /dev/null +++ b/public/assets/js/build-plugins/phpdoccheck.js @@ -0,0 +1,78 @@ +var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ + id: 'build-phpdoccheck-warnings', + css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', + title: 'PHP Docblock Checker', + lastData: null, + displayOnUpdate: false, + box: true, + + register: function() { + var self = this; + var query = PHPCI.registerQuery('phpdoccheck-data', -1, {key: 'phpdoccheck-data'}) + + $(window).on('phpdoccheck-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function(data) { + if (data.queryData.status > 1) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('' + + '' + + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + '' + + '
TypeFileLineClassMethod
'); + }, + + onUpdate: function(e) { + if (this.lastData && this.lastData[0]) { + return; + } + + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#phpdoccheck-data tbody'); + tbody.empty(); + + for (var i in errors) { + var file = errors[i].file; + + if (PHPCI.fileLinkTemplate) { + var fileLink = PHPCI.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line); + + file = '' + file + ''; + } + + var row = $('' + + ''+errors[i].type+'' + + ''+file+'' + + ''+errors[i].line+'' + + ''+errors[i].class+'' + + ''+errors[i].method+''); + + if (errors[i].type == 'method') { + row.addClass('danger'); + } else { + row.addClass('warning'); + } + + tbody.append(row); + } + } +}); + +PHPCI.registerPlugin(new phpdoccheckPlugin()); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index cc2db78f..70d2b4b2 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -7,7 +7,8 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ 'phpcs-warnings': 'PHPCS Warnings', 'phpcs-errors': 'PHPCS Errors', 'phplint-errors': 'PHPLint Errors', - 'phpunit-errors': 'PHPUnit Errors' + 'phpunit-errors': 'PHPUnit Errors', + 'phpdoccheck-warnings': 'PHP Docblock Checker Warnings' }, data: {}, displayOnUpdate: false, @@ -20,7 +21,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ queries.push(PHPCI.registerQuery(key, -1, {num_builds: 10, key: key})); } - $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors phpunit-errors', function(data) { + $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors phpunit-errors phpdoccheck-errors', function(data) { self.onUpdate(data); }); From e297f60273c4eb43f01b1ba75b5cd49e892ec385 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:02:51 +0000 Subject: [PATCH 09/83] Fixing zero config ignore setting --- PHPCI/Model/Build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index e8b8cd5a..174126fa 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -122,7 +122,7 @@ class Build extends BuildBase $config = array( 'build_settings' => array( 'ignore' => array( - 'vendor/', + 'vendor', ) ) ); From b381b7864ab86e2776695e2d62b43e6db0c4816e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:03:17 +0000 Subject: [PATCH 10/83] Updating license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 7d8d2f31..60a3727d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013, Block 8 Limited +Copyright (c) 2014, Block 8 Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From b950e4d66215af02f7b5b16c271a195ae2913aa1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:03:29 +0000 Subject: [PATCH 11/83] Updating license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 60a3727d..1df52b9c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2014, Block 8 Limited +Copyright (c) 2013-2014, Block 8 Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From efd207377948fe840f5d5e28fe314a17cdb12b6f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:04:37 +0000 Subject: [PATCH 12/83] Updating composer.json --- composer.json | 1 + composer.lock | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index a6dec175..6cb24ba1 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ }, "suggest": { + "block8/php-docblock-checker": "PHP Docblock Checker", "phpmd/phpmd": "PHP Mess Detector", "sebastian/phpcpd": "PHP Copy/Paste Detector", "squizlabs/php_codesniffer": "PHP Code Sniffer", diff --git a/composer.lock b/composer.lock index 1110c4b5..d8f78d4c 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "d6834b50e3ea80f4c6f0a05707d0e5f1", + "hash": "0692857385ac27090b3000cbc680ced8", "packages": [ { "name": "block8/b8framework", @@ -247,25 +247,28 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.1.0", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "748c01c1144713ac0118396935d10b6ceec91b68" + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/748c01c1144713ac0118396935d10b6ceec91b68", - "reference": "748c01c1144713ac0118396935d10b6ceec91b68", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/043e336b871f17a117f76ef8e190eddfc04c8d48", + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48", "shasum": "" }, "require": { "php": ">=5.2.4" }, + "require-dev": { + "mockery/mockery": "~0.9.1" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -294,7 +297,7 @@ "mail", "mailer" ], - "time": "2014-03-18 09:03:27" + "time": "2014-05-08 08:11:19" }, { "name": "symfony/console", From 0654bcccee396cc39dc600c48d9a3e7045597f4b Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 17:59:08 +0000 Subject: [PATCH 13/83] Adding edit profile (and change password) option for users. --- PHPCI/Controller/UserController.php | 57 ++++++++++++++++++++++++++++- PHPCI/View/User/profile.phtml | 15 ++++++++ PHPCI/View/layout.phtml | 18 ++++++++- 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 PHPCI/View/User/profile.phtml diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index c8fade0c..817cb5e8 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -29,7 +29,7 @@ class UserController extends Controller public function init() { - $this->userStore = b8\Store\Factory::getStore('User'); + $this->userStore = b8\Store\Factory::getStore('User'); } /** @@ -45,6 +45,61 @@ class UserController extends Controller return $this->view->render(); } + public function profile() + { + $user = $_SESSION['user']; + $values = $user->getDataArray(); + + if ($this->request->getMethod() == 'POST') { + $values = $this->getParams(); + + if (!empty($values['password'])) { + $values['hash'] = password_hash($values['password'], PASSWORD_DEFAULT); + } + + $this->view->updated = true; + + $user->setValues($values); + $_SESSION['user'] = $this->userStore->save($user); + } + + $form = new Form(); + $form->setAction(PHPCI_URL.'user/profile'); + $form->setMethod('POST'); + + $name = new Form\Element\Text('name'); + $name->setClass('form-control'); + $name->setContainerClass('form-group'); + $name->setLabel('Name'); + $name->setRequired(true); + $form->addField($name); + + $email = new Form\Element\Email('email'); + $email->setClass('form-control'); + $email->setContainerClass('form-group'); + $email->setLabel('Email Address'); + $email->setRequired(true); + $form->addField($email); + + $password = new Form\Element\Password('password'); + $password->setClass('form-control'); + $password->setContainerClass('form-group'); + $password->setLabel('Password (leave blank if you don\'t want to change it)'); + $password->setRequired(false); + $form->addField($password); + + $submit = new Form\Element\Submit(); + $submit->setClass('btn btn-success'); + $submit->setValue('Save »'); + $form->addField($submit); + + $form->setValues($values); + + $this->view->form = $form; + + return $this->view->render(); + } + /** * Add a user - handles both form and processing. */ diff --git a/PHPCI/View/User/profile.phtml b/PHPCI/View/User/profile.phtml new file mode 100644 index 00000000..5e006738 --- /dev/null +++ b/PHPCI/View/User/profile.phtml @@ -0,0 +1,15 @@ +

User()->getName(); ?>

+ + +

Your details have been updated.

+ + +
+
+

Update your details

+
+
+ +
+
+ diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 58b78cc2..ed3e539e 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -37,13 +37,27 @@
    -

  • User()->getName()); ?>

    • -
  • Log out
    • + +
  • + + + + User()->getName()); ?> + + +
    • + User()->getIsAdmin()): ?>
  • Add Project +
    +
    From dac83fa24b7ffbc2f5b10e32e23cfcc1305ae0ae Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 19:00:50 +0100 Subject: [PATCH 14/83] Updating README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 77d9ef0c..686b4c12 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ PHPCI PHPCI is a free and open source continuous integration tool specifically designed for PHP. We've built it with simplicity in mind, so whilst it doesn't do *everything* Jenkins can do, it is a breeze to set up and use. -_**Please be aware that PHPCI is a beta-release project, so whilst it is very stable, there may be bugs and/or missing features.**_ - **Current Build Status** [![Build Status](http://phpci.block8.net/build-status/image/2)](http://phpci.block8.net/build-status/view/2) From 6b0d21034451beaadf9d750fe129f881fc2bf877 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 21:38:32 +0100 Subject: [PATCH 15/83] Adding forgot password functionality. --- PHPCI/Controller/SessionController.php | 71 +++++++++++++ PHPCI/Helper/Email.php | 127 ++++++++++++++++++++++++ PHPCI/View/Session.phtml | 88 ++++++++++++++++ PHPCI/View/Session/forgotPassword.phtml | 33 ++++++ PHPCI/View/Session/login.phtml | 95 +----------------- PHPCI/View/Session/resetPassword.phtml | 27 +++++ 6 files changed, 351 insertions(+), 90 deletions(-) create mode 100644 PHPCI/Helper/Email.php create mode 100644 PHPCI/View/Session.phtml create mode 100644 PHPCI/View/Session/forgotPassword.phtml create mode 100644 PHPCI/View/Session/resetPassword.phtml diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 15563b19..2c4712ab 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -10,6 +10,7 @@ namespace PHPCI\Controller; use b8; +use PHPCI\Helper\Email; /** * Session Controller - Handles user login / logout. @@ -88,4 +89,74 @@ class SessionController extends \PHPCI\Controller header('Location: ' . PHPCI_URL); die; } + + public function forgotPassword() + { + if ($this->request->getMethod() == 'POST') { + $email = $this->getParam('email', null); + $user = $this->userStore->getByEmail($email); + + if (empty($user)) { + $this->view->error = 'No user exists with that email address, please try again.'; + return $this->view->render(); + } + + $key = md5(date('Y-m-d') . $user->getHash()); + $url = PHPCI_URL; + $name = $user->getName(); + $id = $user->getId(); + + $message = <<setTo($user->getEmail(), $user->getName()); + $email->setSubject('Password reset'); + $email->setBody($message); + $email->send(); + + $this->view->emailed = true; + } + + return $this->view->render(); + } + + public function resetPassword($id, $key) + { + $user = $this->userStore->getById($id); + $userKey = md5(date('Y-m-d') . $user->getHash()); + + if (empty($user) || $key != $userKey) { + $this->view->error = 'Invalid password reset request.'; + return $this->view->render(); + } + + if ($this->request->getMethod() == 'POST') { + $hash = password_hash($this->getParam('password'), PASSWORD_DEFAULT); + $user->setHash($hash); + + $_SESSION['user'] = $this->userStore->save($user); + $_SESSION['user_id'] = $user->getId(); + + header('Location: ' . PHPCI_URL); + die; + } + + $this->view->id = $id; + $this->view->key = $key; + + return $this->view->render(); + } } diff --git a/PHPCI/Helper/Email.php b/PHPCI/Helper/Email.php new file mode 100644 index 00000000..32cbe4f4 --- /dev/null +++ b/PHPCI/Helper/Email.php @@ -0,0 +1,127 @@ +'; + + protected $to = array(); + protected $cc = array(); + protected $subject = 'Email from PHPCI'; + protected $body = ''; + protected $isHtml = false; + protected $config; + + public function __construct() + { + $this->config = Config::getInstance(); + } + + public function setTo($email, $name = null) + { + $this->to[$email] = $name; + + return $this; + } + + public function addCc($email, $name = null) + { + $this->cc[$email] = $name; + + return $this; + } + + public function setSubject($subject) + { + $this->subject = $subject; + + return $this; + } + + public function setBody($body) + { + $this->body = $body; + + return $this; + } + + public function setIsHtml($isHtml = false) + { + $this->isHtml = $isHtml; + + return $this; + } + + public function send() + { + $smtpServer = $this->config->get('phpci.email_settings.smtp_address'); + + if (empty($smtpServer)) { + return $this->sendViaMail(); + } else { + return $this->sendViaSwiftMailer(); + } + } + + protected function sendViaMail() + { + $headers = ''; + + if ($this->isHtml) { + $headers = 'Content-Type: text/html' . PHP_EOL; + } + + $headers .= 'From: ' . $this->getFrom() . PHP_EOL; + + $to = array(); + foreach ($this->to as $email => $name) { + $thisTo = $email; + + if (!is_null($name)) { + $thisTo = '"' . $name . '" <' . $thisTo . '>'; + } + + $to[] = $thisTo; + } + + $to = implode(', ', $to); + + return mail($to, $this->subject, $this->body, $headers); + } + + protected function sendViaSwiftMailer() + { + $factory = new MailerFactory($this->config->get('phpci')); + $mailer = $factory->getSwiftMailerFromConfig(); + + $message = \Swift_Message::newInstance($this->subject) + ->setFrom($this->getFrom()) + ->setTo($this->to) + ->setBody($this->body); + + if ($this->isHtml) { + $message->setContentType('text/html'); + } + + if (is_array($this->cc) && count($this->cc)) { + $message->setCc($this->cc); + } + + return $mailer->send($message); + } + + protected function getFrom() + { + $email = $this->config->get('phpci.email_settings.from_address', self::DEFAULT_FROM); + + if (empty($email)) { + $email = self::DEFAULT_FROM; + } + + return $email; + } +} \ No newline at end of file diff --git a/PHPCI/View/Session.phtml b/PHPCI/View/Session.phtml new file mode 100644 index 00000000..ed75d2b4 --- /dev/null +++ b/PHPCI/View/Session.phtml @@ -0,0 +1,88 @@ + + + + Log in to PHPCI + + + + + + + + + + +
    +
    + +
    + +
    + + +
    +
    + + \ No newline at end of file diff --git a/PHPCI/View/Session/forgotPassword.phtml b/PHPCI/View/Session/forgotPassword.phtml new file mode 100644 index 00000000..a9897bbd --- /dev/null +++ b/PHPCI/View/Session/forgotPassword.phtml @@ -0,0 +1,33 @@ + +

    + We've emailed you a link to reset your password. +

    + + +
    +
    + Don't worry!
    Just enter your email address below and we'll email you a link to reset your password. +
    + +
    +
    + +
    + + +
    +
    +
    + + +
    + +
    + +
    +
    +
    +
    + + + \ No newline at end of file diff --git a/PHPCI/View/Session/login.phtml b/PHPCI/View/Session/login.phtml index 2314a639..bc2f16e1 100644 --- a/PHPCI/View/Session/login.phtml +++ b/PHPCI/View/Session/login.phtml @@ -1,91 +1,6 @@ - - - - Log in to PHPCI + +

    Incorrect email address or password

    + + - - - - - - - - - -
    -
    - -
    - -

    Incorrect email address or password

    - - -
    - - -
    -
    - - +Forgotten your password? \ No newline at end of file diff --git a/PHPCI/View/Session/resetPassword.phtml b/PHPCI/View/Session/resetPassword.phtml new file mode 100644 index 00000000..9544879e --- /dev/null +++ b/PHPCI/View/Session/resetPassword.phtml @@ -0,0 +1,27 @@ + + +
    +
    + Please enter a new password +
    + +
    +
    +
    + + +
    + +
    + +
    +
    +
    +
    + +
    + +
    + + + From 45b7dec478635ae5080636cb690c2be5a15b0620 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 21:43:06 +0100 Subject: [PATCH 16/83] Fixing PHPCS and PHPMD errors --- PHPCI/Controller/SessionController.php | 12 +++++------ PHPCI/Helper/Email.php | 28 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 2c4712ab..def6d4c4 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -104,14 +104,14 @@ class SessionController extends \PHPCI\Controller $key = md5(date('Y-m-d') . $user->getHash()); $url = PHPCI_URL; $name = $user->getName(); - $id = $user->getId(); + $userId = $user->getId(); $message = <<setTo($user->getEmail(), $user->getName()); + $email->setEmailTo($user->getEmail(), $user->getName()); $email->setSubject('Password reset'); $email->setBody($message); $email->send(); @@ -133,9 +133,9 @@ MSG; return $this->view->render(); } - public function resetPassword($id, $key) + public function resetPassword($userId, $key) { - $user = $this->userStore->getById($id); + $user = $this->userStore->getById($userId); $userKey = md5(date('Y-m-d') . $user->getHash()); if (empty($user) || $key != $userKey) { @@ -154,7 +154,7 @@ MSG; die; } - $this->view->id = $id; + $this->view->id = $userId; $this->view->key = $key; return $this->view->render(); diff --git a/PHPCI/Helper/Email.php b/PHPCI/Helper/Email.php index 32cbe4f4..3ab57b95 100644 --- a/PHPCI/Helper/Email.php +++ b/PHPCI/Helper/Email.php @@ -9,8 +9,8 @@ class Email { const DEFAULT_FROM = 'PHPCI '; - protected $to = array(); - protected $cc = array(); + protected $emailTo = array(); + protected $emailCc = array(); protected $subject = 'Email from PHPCI'; protected $body = ''; protected $isHtml = false; @@ -21,16 +21,16 @@ class Email $this->config = Config::getInstance(); } - public function setTo($email, $name = null) + public function setEmailTo($email, $name = null) { - $this->to[$email] = $name; + $this->emailTo[$email] = $name; return $this; } public function addCc($email, $name = null) { - $this->cc[$email] = $name; + $this->emailCc[$email] = $name; return $this; } @@ -77,20 +77,20 @@ class Email $headers .= 'From: ' . $this->getFrom() . PHP_EOL; - $to = array(); - foreach ($this->to as $email => $name) { + $emailTo = array(); + foreach ($this->emailTo as $email => $name) { $thisTo = $email; if (!is_null($name)) { $thisTo = '"' . $name . '" <' . $thisTo . '>'; } - $to[] = $thisTo; + $emailTo[] = $thisTo; } - $to = implode(', ', $to); + $emailTo = implode(', ', $emailTo); - return mail($to, $this->subject, $this->body, $headers); + return mail($emailTo, $this->subject, $this->body, $headers); } protected function sendViaSwiftMailer() @@ -100,15 +100,15 @@ class Email $message = \Swift_Message::newInstance($this->subject) ->setFrom($this->getFrom()) - ->setTo($this->to) + ->setTo($this->emailTo) ->setBody($this->body); if ($this->isHtml) { $message->setContentType('text/html'); } - if (is_array($this->cc) && count($this->cc)) { - $message->setCc($this->cc); + if (is_array($this->emailCc) && count($this->emailCc)) { + $message->setCc($this->emailCc); } return $mailer->send($message); @@ -124,4 +124,4 @@ class Email return $email; } -} \ No newline at end of file +} From 63298f2a2310b10dce3b676d6656ba50c1b443d8 Mon Sep 17 00:00:00 2001 From: Jimmy Cleuren Date: Thu, 8 May 2014 23:03:13 +0200 Subject: [PATCH 17/83] remove coverage log line --- PHPCI/Plugin/Util/TapParser.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 595e83ef..5b099b03 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -7,12 +7,12 @@ class TapParser const TEST_COUNTS_PATTERN = '/([0-9]+)\.\.([0-9]+)/'; const TEST_LINE_PATTERN = '/(ok|not ok)\s+[0-9]+\s+\-\s+([^\n]+)::([^\n]+)/'; const TEST_MESSAGE_PATTERN = '/message\:\s+\'([^\']+)\'/'; + const TEST_COVERAGE_PATTERN = '/Generating code coverage report/'; /** * @var string */ protected $tapString; - protected $failures = 0; /** @@ -43,16 +43,23 @@ class TapParser throw new \Exception('TapParser only supports TAP version 13'); } + if (preg_match(self::TEST_COVERAGE_PATTERN, $lines[count($lines) - 1])) { + array_pop($lines); + if ($lines[count($lines) - 1] == "") { + array_pop($lines); + } + } + $matches = array(); $totalTests = 0; if (preg_match(self::TEST_COUNTS_PATTERN, $lines[0], $matches)) { array_shift($lines); - $totalTests = (int)$matches[2]; + $totalTests = (int) $matches[2]; } if (preg_match(self::TEST_COUNTS_PATTERN, $lines[count($lines) - 1], $matches)) { array_pop($lines); - $totalTests = (int)$matches[2]; + $totalTests = (int) $matches[2]; } $rtn = $this->processTestLines($lines); From f6c7f65f01350c442f462265db766e6111ebdff1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 07:01:03 +0100 Subject: [PATCH 18/83] Removing 5.4+ array syntax from GenerateCommand --- PHPCI/Command/GenerateCommand.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PHPCI/Command/GenerateCommand.php b/PHPCI/Command/GenerateCommand.php index 44a499de..82c41531 100644 --- a/PHPCI/Command/GenerateCommand.php +++ b/PHPCI/Command/GenerateCommand.php @@ -37,7 +37,13 @@ class GenerateCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { - $gen = new CodeGenerator(Database::getConnection(), ['default' => 'PHPCI'], ['default' => PHPCI_DIR], false); + $gen = new CodeGenerator( + Database::getConnection(), + array('default' => 'PHPCI'), + array('default' => PHPCI_DIR), + false + ); + $gen->generateModels(); $gen->generateStores(); } From a42dc67fad5f6cd0969f86f8a29e5e1a77b75141 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 14:25:24 +0700 Subject: [PATCH 19/83] Fixed duplicate methods of CommandExecutor helper: executeCommand and buildAndExecuteCommand --- PHPCI/Builder.php | 2 +- PHPCI/Helper/CommandExecutor.php | 12 +----------- Tests/PHPCI/Helper/CommandExecutorTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index ccb78c6b..69db31e1 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -242,7 +242,7 @@ class Builder implements LoggerAwareInterface */ public function executeCommand() { - return $this->commandExecutor->buildAndExecuteCommand(func_get_args()); + return $this->commandExecutor->executeCommand(func_get_args()); } /** diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index dc284b6a..438829af 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -51,22 +51,12 @@ class CommandExecutor $this->rootDir = $rootDir; } - /** - * Executes shell commands. Accepts multiple arguments the first - * is the template and everything else is inserted in. c.f. sprintf - * @return bool Indicates success - */ - public function executeCommand() - { - return $this->buildAndExecuteCommand(func_get_args()); - } - /** * Executes shell commands. * @param array $args * @return bool Indicates success */ - public function buildAndExecuteCommand($args = array()) + public function executeCommand($args = array()) { $this->lastOutput = array(); diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index 4925e639..ae6809d5 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -21,28 +21,28 @@ class CommandExecutorTest extends ProphecyTestCase public function testGetLastOutput_ReturnsOutputOfCommand() { - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); $output = $this->testedExecutor->getLastOutput(); $this->assertEquals("Hello World", $output); } public function testGetLastOutput_ForgetsPreviousCommandOutput() { - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello Tester')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello Tester')); $output = $this->testedExecutor->getLastOutput(); $this->assertEquals("Hello Tester", $output); } public function testExecuteCommand_ReturnsTrueForValidCommands() { - $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); + $returnValue = $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); $this->assertTrue($returnValue); } public function testExecuteCommand_ReturnsFalseForInvalidCommands() { - $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World')); + $returnValue = $this->testedExecutor->executeCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World')); $this->assertFalse($returnValue); } From d7db9cf593b54a5e17dc59cc5d21a50e85a013f6 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 14:57:22 +0700 Subject: [PATCH 20/83] Few fixes for windows --- PHPCI/Plugin/CleanBuild.php | 3 +++ PHPCI/Plugin/CopyBuild.php | 6 ++++++ PHPCI/Plugin/Wipe.php | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/PHPCI/Plugin/CleanBuild.php b/PHPCI/Plugin/CleanBuild.php index 73a7305f..38c1ccde 100644 --- a/PHPCI/Plugin/CleanBuild.php +++ b/PHPCI/Plugin/CleanBuild.php @@ -38,6 +38,9 @@ class CleanBuild implements \PHPCI\Plugin public function execute() { $cmd = 'rm -Rf "%s"'; + if (IS_WIN) { + $cmd = 'rmdir /S /Q "%s"'; + } $this->phpci->executeCommand($cmd, $this->phpci->buildPath . 'composer.phar'); $this->phpci->executeCommand($cmd, $this->phpci->buildPath . 'composer.lock'); diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index 021d5e80..83ed6ebe 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -46,11 +46,17 @@ class CopyBuild implements \PHPCI\Plugin } $cmd = 'mkdir -p "%s" && cp -R "%s" "%s"'; + if (IS_WIN) { + $cmd = 'mkdir -p "%s" && xcopy /E "%s" "%s"'; + } $success = $this->phpci->executeCommand($cmd, $this->directory, $build, $this->directory); if ($this->ignore) { foreach ($this->phpci->ignore as $file) { $cmd = 'rm -Rf "%s/%s"'; + if (IS_WIN) { + $cmd = 'rmdir /S /Q "%s\%s"'; + } $this->phpci->executeCommand($cmd, $this->directory, $file); } } diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php index 7a0c2107..4d55009c 100644 --- a/PHPCI/Plugin/Wipe.php +++ b/PHPCI/Plugin/Wipe.php @@ -52,7 +52,10 @@ class Wipe implements \PHPCI\Plugin return true; } if (is_dir($this->directory)) { - $cmd = 'rm -rf %s*'; + $cmd = 'rm -Rf "%s"'; + if (IS_WIN) { + $cmd = 'rmdir /S /Q "%s"'; + } $success = $this->phpci->executeCommand($cmd, $this->directory); } return $success; From 2d52c8dd0127b68f15eb0a88c5b6e1f3fbcbdcc6 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 15:21:53 +0700 Subject: [PATCH 21/83] Fixed phpdocs --- PHPCI/Helper/CommandExecutor.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index dc284b6a..46bead2f 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -2,7 +2,6 @@ namespace PHPCI\Helper; - use \PHPCI\Logging\BuildLogger; use Psr\Log\LogLevel; @@ -36,9 +35,9 @@ class CommandExecutor /** * @param BuildLogger $logger - * @param $rootDir - * @param bool $quiet - * @param bool $verbose + * @param string $rootDir + * @param bool $quiet + * @param bool $verbose */ public function __construct(BuildLogger $logger, $rootDir, &$quiet = false, &$verbose = false) { @@ -106,7 +105,7 @@ class CommandExecutor /** * Find a binary required by a plugin. - * @param $binary + * @param string $binary * @return null|string */ public function findBinary($binary) From b3cf244944c85b4f3f0a244d08eff82a2d36bf89 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 15:23:30 +0700 Subject: [PATCH 22/83] Added CommandExecutorInterface --- PHPCI/Helper/CommandExecutorInterface.php | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 PHPCI/Helper/CommandExecutorInterface.php diff --git a/PHPCI/Helper/CommandExecutorInterface.php b/PHPCI/Helper/CommandExecutorInterface.php new file mode 100644 index 00000000..8e75b166 --- /dev/null +++ b/PHPCI/Helper/CommandExecutorInterface.php @@ -0,0 +1,35 @@ + Date: Fri, 9 May 2014 11:20:04 +0100 Subject: [PATCH 23/83] bump required php version to 5.3.8. --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6cb24ba1..fdb4bc28 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require": { - "php": ">=5.3.3", + "php": ">=5.3.8", "ext-mcrypt": "*", "ext-pdo": "*", "ext-pdo_mysql": "*", diff --git a/composer.lock b/composer.lock index d8f78d4c..1e6302c3 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "0692857385ac27090b3000cbc680ced8", + "hash": "07244b4e81274ba07fdb9f0166c73678", "packages": [ { "name": "block8/b8framework", @@ -885,7 +885,7 @@ ], "platform": { - "php": ">=5.3.3", + "php": ">=5.3.8", "ext-mcrypt": "*", "ext-pdo": "*", "ext-pdo_mysql": "*" From a180d8ac086462b6287f99284f6d2c123236445c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 11:41:34 +0100 Subject: [PATCH 24/83] Making login redirect you to where you were trying to go after logging in. --- PHPCI/Application.php | 1 + PHPCI/Controller/SessionController.php | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index ecc71ad5..5d1d9f9d 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -51,6 +51,7 @@ class Application extends b8\Application $response->setResponseCode(401); $response->setContent(''); } else { + $_SESSION['login_redirect'] = substr($request->getPath(), 1); $response = new RedirectResponse($response); $response->setHeader('Location', PHPCI_URL.'session/login'); } diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index def6d4c4..48a70475 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -43,7 +43,7 @@ class SessionController extends \PHPCI\Controller if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { $_SESSION['user_id'] = $user->getId(); - header('Location: ' . PHPCI_URL); + header('Location: ' . $this->getLoginRedirect()); die; } else { $isLoginFailure = true; @@ -159,4 +159,16 @@ MSG; return $this->view->render(); } + + protected function getLoginRedirect() + { + $rtn = PHPCI_URL; + + if (!empty($_SESSION['login_redirect'])) { + $rtn .= $_SESSION['login_redirect']; + $_SESSION['login_redirect'] = null; + } + + return $rtn; + } } From 5908e86fc0ba61eccb64726e8920e25ad98b4c04 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 11:47:42 +0100 Subject: [PATCH 25/83] Enabling the exception / error handler for console mode only. Also fixing a catchable fatal error in the BuildFactory class. --- PHPCI/BuildFactory.php | 5 +++++ bootstrap.php | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php index 82ebc221..3f48eec0 100644 --- a/PHPCI/BuildFactory.php +++ b/PHPCI/BuildFactory.php @@ -21,11 +21,16 @@ class BuildFactory /** * @param $buildId * @return Build + * @throws \Exception */ public static function getBuildById($buildId) { $build = Factory::getStore('Build')->getById($buildId); + if (empty($build)) { + throw new \Exception('Build ID ' . $buildId . ' does not exist.'); + } + return self::getBuild($build); } diff --git a/bootstrap.php b/bootstrap.php index 2a271503..3b951a43 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -59,8 +59,10 @@ if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_I // Load Composer autoloader: require_once(dirname(__FILE__) . '/vendor/autoload.php'); -$loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); -Handler::register($loggerConfig->getFor('_')); +if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) { + $loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); + Handler::register($loggerConfig->getFor('_')); +} // Load configuration if present: $conf = array(); From b146af66b781b6852522ef226fb793630cce7b7d Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:04:42 +0100 Subject: [PATCH 26/83] Adding some form of exception handling to front-end requests --- PHPCI/Application.php | 11 ++++++++++- PHPCI/View/exception.phtml | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 PHPCI/View/exception.phtml diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 5d1d9f9d..e4532d3b 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -10,6 +10,7 @@ namespace PHPCI; use b8; +use b8\Exception\HttpException; use b8\Http\Response; use b8\Http\Response\RedirectResponse; use b8\View; @@ -70,7 +71,15 @@ class Application extends b8\Application */ public function handleRequest() { - $this->response = parent::handleRequest(); + try { + $this->response = parent::handleRequest(); + } catch (\Exception $ex) { + $this->config->set('page_title', 'Error'); + + $view = new View('exception'); + $view->exception = $ex; + $this->response->setContent($view->render()); + } if (View::exists('layout') && $this->response->hasLayout()) { $view = new View('layout'); diff --git a/PHPCI/View/exception.phtml b/PHPCI/View/exception.phtml new file mode 100644 index 00000000..1ecbe6a4 --- /dev/null +++ b/PHPCI/View/exception.phtml @@ -0,0 +1,9 @@ +
    +
    +

    Sorry, there was a problem

    +
    + +
    + getMessage(); ?> +
    +
    \ No newline at end of file From baee67a43b9bdf7f3dd397c0ba9f5f89abfc9737 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:10:48 +0100 Subject: [PATCH 27/83] Updating exception handler to return the appropriate HTTP response code --- PHPCI/Application.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index e4532d3b..011e27e5 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -73,11 +73,21 @@ class Application extends b8\Application { try { $this->response = parent::handleRequest(); + } catch (HttpException $ex) { + $this->config->set('page_title', 'Error'); + + $view = new View('exception'); + $view->exception = $ex; + + $this->response->setResponseCode($ex->getErrorCode()); + $this->response->setContent($view->render()); } catch (\Exception $ex) { $this->config->set('page_title', 'Error'); $view = new View('exception'); $view->exception = $ex; + + $this->response->setResponseCode(500); $this->response->setContent($view->render()); } From f2bf4ba440e32c88c0eadfe58f3519c74f5e99a3 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:11:02 +0100 Subject: [PATCH 28/83] 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'); From 5fc0ed024939cb32846d92da99e869100e370119 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:15:11 +0100 Subject: [PATCH 29/83] Cleaning up exceptions in the Build controller --- PHPCI/Controller/BuildController.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index 3ebb8432..1dff5a15 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -10,6 +10,7 @@ namespace PHPCI\Controller; use b8; +use b8\Exception\HttpException\NotFoundException; use PHPCI\BuildFactory; use PHPCI\Model\Build; @@ -36,7 +37,16 @@ class BuildController extends \PHPCI\Controller */ public function view($buildId) { - $build = BuildFactory::getBuildById($buildId); + try { + $build = BuildFactory::getBuildById($buildId); + } catch (\Exception $ex) { + $build = null; + } + + if (empty($build)) { + throw new NotFoundException('Build with ID: ' . $buildId . ' does not exist.'); + } + $this->view->plugins = $this->getUiPlugins(); $this->view->build = $build; $this->view->data = $this->getBuildData($build); @@ -110,6 +120,10 @@ class BuildController extends \PHPCI\Controller { $copy = BuildFactory::getBuildById($buildId); + if (empty($copy)) { + throw new NotFoundException('Build with ID: ' . $buildId . ' does not exist.'); + } + $build = new Build(); $build->setProjectId($copy->getProjectId()); $build->setCommitId($copy->getCommitId()); @@ -134,11 +148,10 @@ class BuildController extends \PHPCI\Controller throw new \Exception('You do not have permission to do that.'); } - $build = BuildFactory::getBuildById($buildId); + $build = BuildFactory::getBuildById($buildId); - if (!$build) { - $this->response->setResponseCode(404); - return '404 - Not Found'; + if (empty($build)) { + throw new NotFoundException('Build with ID: ' . $buildId . ' does not exist.'); } $this->buildStore->delete($build); From 302717bad090b2eecb05545bccd7998de8a33015 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:16:24 +0100 Subject: [PATCH 30/83] Cleaning up exceptions in the BuildStatus controller --- PHPCI/Controller/BuildStatusController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index 74a1fbad..8c34cd63 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -65,7 +65,8 @@ class BuildStatusController 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'); } From 7357f81dc3ae8cfbe688f5f38bb24eec05fc1eb6 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 12:19:48 +0100 Subject: [PATCH 31/83] Cleaning up exceptions in the User controller --- PHPCI/Controller/UserController.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 817cb5e8..93de822e 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -10,6 +10,8 @@ namespace PHPCI\Controller; use b8; +use b8\Exception\HttpException\ForbiddenException; +use b8\Exception\HttpException\NotFoundException; use b8\Form; use PHPCI\Controller; use PHPCI\Model\User; @@ -106,12 +108,11 @@ class UserController extends Controller public function add() { 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.'); } $this->config->set('page_title', 'Add User'); - $method = $this->request->getMethod(); if ($method == 'POST') { @@ -150,14 +151,17 @@ class UserController extends Controller public function edit($userId) { 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(); $user = $this->userStore->getById($userId); - $this->config->set('page_title', 'Edit: ' . $user->getName()); + if (empty($user)) { + throw new NotFoundException('User with ID: ' . $userId . ' does not exist.'); + } + $this->config->set('page_title', 'Edit: ' . $user->getName()); if ($method == 'POST') { $values = $this->getParams(); @@ -244,10 +248,15 @@ class UserController extends Controller public function delete($userId) { 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.'); } $user = $this->userStore->getById($userId); + + if (empty($user)) { + throw new NotFoundException('User with ID: ' . $userId . ' does not exist.'); + } + $this->userStore->delete($user); header('Location: '.PHPCI_URL.'user'); From d32c43713dbebf4a33533451cc314db418b12104 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 19:09:27 +0700 Subject: [PATCH 32/83] Separeted CommandExecutor for different OS --- PHPCI/Builder.php | 9 +- PHPCI/Helper/BaseCommandExecutor.php | 127 ++++++++++++++++++++++ PHPCI/Helper/CommandExecutor.php | 112 ++----------------- PHPCI/Helper/CommandExecutorInterface.php | 35 ------ PHPCI/Helper/UnixCommandExecutor.php | 33 ++++++ PHPCI/Helper/WindowsCommandExecutor.php | 33 ++++++ vars.php | 4 - 7 files changed, 206 insertions(+), 147 deletions(-) create mode 100644 PHPCI/Helper/BaseCommandExecutor.php delete mode 100644 PHPCI/Helper/CommandExecutorInterface.php create mode 100644 PHPCI/Helper/UnixCommandExecutor.php create mode 100644 PHPCI/Helper/WindowsCommandExecutor.php diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 69db31e1..ced3c510 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -10,7 +10,6 @@ namespace PHPCI; use PHPCI\Helper\BuildInterpolator; -use PHPCI\Helper\CommandExecutor; use PHPCI\Helper\MailerFactory; use PHPCI\Logging\BuildLogger; use PHPCI\Model\Build; @@ -118,7 +117,12 @@ class Builder implements LoggerAwareInterface $pluginFactory->addConfigFromFile(PHPCI_DIR . "/pluginconfig.php"); $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger); - $this->commandExecutor = new CommandExecutor( + $executorClass = 'PHPCI\Helper\UnixCommandExecutor'; + if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { + $executorClass = 'PHPCI\Helper\WindowsCommandExecutor'; + } + + $this->commandExecutor = new $executorClass( $this->buildLogger, PHPCI_DIR, $this->quiet, @@ -126,7 +130,6 @@ class Builder implements LoggerAwareInterface ); $this->interpolator = new BuildInterpolator(); - } /** diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php new file mode 100644 index 00000000..cc4b8ca0 --- /dev/null +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -0,0 +1,127 @@ +logger = $logger; + $this->quiet = $quiet; + $this->verbose = $verbose; + + $this->lastOutput = array(); + + $this->rootDir = $rootDir; + } + + /** + * Executes shell commands. + * @param array $args + * @return bool Indicates success + */ + public function executeCommand($args = array()) + { + $this->lastOutput = array(); + + $command = call_user_func_array('sprintf', $args); + + if ($this->quiet) { + $this->logger->log('Executing: ' . $command); + } + + $status = 0; + exec($command, $this->lastOutput, $status); + + foreach ($this->lastOutput as &$lastOutput) { + $lastOutput = trim($lastOutput, '"'); + } + + if ($this->logExecOutput && !empty($this->lastOutput) && ($this->verbose|| $status != 0)) { + $this->logger->log($this->lastOutput); + } + + $rtn = false; + + if ($status == 0) { + $rtn = true; + } + + return $rtn; + } + + /** + * Returns the output from the last command run. + */ + public function getLastOutput() + { + return implode(PHP_EOL, $this->lastOutput); + } + + /** + * Find a binary required by a plugin. + * @param string $binary + * @return null|string + */ + public function findBinary($binary) + { + $binaryPath = null; + + if (is_string($binary)) { + $binary = array($binary); + } + + foreach ($binary as $bin) { + $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); + // Check project root directory: + if (is_file($this->rootDir . $bin)) { + $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . $bin; + break; + } + + // Check Composer bin dir: + if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { + $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . 'vendor/bin/' . $bin; + break; + } + } + return $binaryPath; + } +} diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index b008c14e..3dce9a44 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -3,131 +3,33 @@ namespace PHPCI\Helper; use \PHPCI\Logging\BuildLogger; -use Psr\Log\LogLevel; -class CommandExecutor +interface CommandExecutor { - /** - * @var \PHPCI\Logging\BuildLogger - */ - protected $logger; - - /** - * @var bool - */ - protected $quiet; - - /** - * @var bool - */ - protected $verbose; - - protected $lastOutput; - - public $logExecOutput = true; - - - /** - * The path which findBinary will look in. - * @var string - */ - protected $rootDir; - /** * @param BuildLogger $logger * @param string $rootDir * @param bool $quiet * @param bool $verbose */ - public function __construct(BuildLogger $logger, $rootDir, &$quiet = false, &$verbose = false) - { - $this->logger = $logger; - $this->quiet = $quiet; - $this->verbose = $verbose; - - $this->lastOutput = array(); - - $this->rootDir = $rootDir; - } + public function __construct(BuildLogger $logger, $rootDir, &$quiet = false, &$verbose = false); /** - * Executes shell commands. - * @param array $args + * Executes shell commands. Accepts multiple arguments the first + * is the template and everything else is inserted in. c.f. sprintf * @return bool Indicates success */ - public function executeCommand($args = array()) - { - $this->lastOutput = array(); - - $command = call_user_func_array('sprintf', $args); - - if ($this->quiet) { - $this->logger->log('Executing: ' . $command); - } - - $status = 0; - exec($command, $this->lastOutput, $status); - - foreach ($this->lastOutput as &$lastOutput) { - $lastOutput = trim($lastOutput, '"'); - } - - if ($this->logExecOutput && !empty($this->lastOutput) && ($this->verbose|| $status != 0)) { - $this->logger->log($this->lastOutput); - } - - $rtn = false; - - if ($status == 0) { - $rtn = true; - } - - return $rtn; - } + public function executeCommand(); /** * Returns the output from the last command run. */ - public function getLastOutput() - { - return implode(PHP_EOL, $this->lastOutput); - } + public function getLastOutput(); /** * Find a binary required by a plugin. * @param string $binary * @return null|string */ - public function findBinary($binary) - { - if (is_string($binary)) { - $binary = array($binary); - } - - foreach ($binary as $bin) { - $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); - // Check project root directory: - if (is_file($this->rootDir . $bin)) { - $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); - return $this->rootDir . $bin; - } - - // Check Composer bin dir: - if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { - $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); - return $this->rootDir . 'vendor/bin/' . $bin; - } - - // Use "where" for windows and "which" for other OS - $findCmd = IS_WIN ? 'where' : 'which'; - $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); - - if (!empty($findCmdResult)) { - $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); - return $findCmdResult; - } - } - - return null; - } + public function findBinary($binary); } diff --git a/PHPCI/Helper/CommandExecutorInterface.php b/PHPCI/Helper/CommandExecutorInterface.php deleted file mode 100644 index 8e75b166..00000000 --- a/PHPCI/Helper/CommandExecutorInterface.php +++ /dev/null @@ -1,35 +0,0 @@ -logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); + $binaryPath = $findCmdResult; + break; + } + } + } + return $binaryPath; + } +} diff --git a/PHPCI/Helper/WindowsCommandExecutor.php b/PHPCI/Helper/WindowsCommandExecutor.php new file mode 100644 index 00000000..ad0ce236 --- /dev/null +++ b/PHPCI/Helper/WindowsCommandExecutor.php @@ -0,0 +1,33 @@ +logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); + $binaryPath = $findCmdResult; + break; + } + } + } + return $binaryPath; + } +} diff --git a/vars.php b/vars.php index 2408d41d..5725805e 100644 --- a/vars.php +++ b/vars.php @@ -25,7 +25,3 @@ if (!defined('ENABLE_SHELL_PLUGIN')) { if (!defined('PHPCI_IS_CONSOLE')) { define('PHPCI_IS_CONSOLE', false); } - -if (!defined('IS_WIN')) { - define('IS_WIN', ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false)); -} From 52202c08c960efcb4551f8c032602b3add4e85a0 Mon Sep 17 00:00:00 2001 From: danio1024 Date: Fri, 9 May 2014 14:51:45 +0200 Subject: [PATCH 33/83] Added missing run statement for PhpSpec --- PHPCI/Plugin/PhpSpec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php index c8a36253..b2213013 100644 --- a/PHPCI/Plugin/PhpSpec.php +++ b/PHPCI/Plugin/PhpSpec.php @@ -58,7 +58,7 @@ class PhpSpec implements PHPCI\Plugin return false; } - $success = $this->phpci->executeCommand($phpspec . ' --format=pretty --no-code-generation'); + $success = $this->phpci->executeCommand($phpspec . ' run --format=pretty --no-code-generation'); chdir($curdir); From cbc769d8ef50cf50bc96694459028a414d8172db Mon Sep 17 00:00:00 2001 From: danio1024 Date: Fri, 9 May 2014 15:15:55 +0200 Subject: [PATCH 34/83] Changed PhpSpec run command order to match docs --- PHPCI/Plugin/PhpSpec.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php index b2213013..c8ba27bc 100644 --- a/PHPCI/Plugin/PhpSpec.php +++ b/PHPCI/Plugin/PhpSpec.php @@ -58,7 +58,7 @@ class PhpSpec implements PHPCI\Plugin return false; } - $success = $this->phpci->executeCommand($phpspec . ' run --format=pretty --no-code-generation'); + $success = $this->phpci->executeCommand($phpspec . ' --format=pretty --no-code-generation run'); chdir($curdir); From 84182088636f5b7a2ccee7b9f6f0d3832376c348 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 15:34:14 +0100 Subject: [PATCH 35/83] Updating UI plugins to fix memory leak reported in #394 --- public/assets/js/build-plugins/loc.js | 11 +++++------ public/assets/js/build-plugins/phpcs.js | 11 +++++------ public/assets/js/build-plugins/phpdoccheck.js | 9 +++++---- public/assets/js/build-plugins/phpmd.js | 8 +++++--- public/assets/js/build-plugins/phpunit.js | 8 +++++--- public/assets/js/build-plugins/warnings.js | 4 +++- public/assets/js/phpci.js | 17 ++++++++++++++++- 7 files changed, 44 insertions(+), 24 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index d71a42ad..45eeac91 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -4,6 +4,7 @@ var locPlugin = PHPCI.UiPlugin.extend({ title: 'Lines of Code', lastData: null, displayOnUpdate: false, + rendered: false, register: function() { var self = this; @@ -14,8 +15,7 @@ var locPlugin = PHPCI.UiPlugin.extend({ }); $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { - self.displayOnUpdate = true; + if (data.queryData.status > 1 && !self.rendered) { query(); } }); @@ -29,10 +29,7 @@ var locPlugin = PHPCI.UiPlugin.extend({ onUpdate: function(e) { this.lastData = e.queryData; - - if (this.displayOnUpdate) { - this.displayChart(); - } + this.displayChart(); }, displayChart: function() { @@ -42,6 +39,8 @@ var locPlugin = PHPCI.UiPlugin.extend({ return; } + this.rendered = true; + $('#phploc-lines').empty().animate({height: '275px'}); var titles = ['Build', 'Lines', 'Comment Lines', 'Non-Comment Lines', 'Logical Lines']; diff --git a/public/assets/js/build-plugins/phpcs.js b/public/assets/js/build-plugins/phpcs.js index aaac3ec9..ce302965 100644 --- a/public/assets/js/build-plugins/phpcs.js +++ b/public/assets/js/build-plugins/phpcs.js @@ -3,8 +3,8 @@ var phpcsPlugin = PHPCI.UiPlugin.extend({ css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', title: 'PHP Code Sniffer', lastData: null, - displayOnUpdate: false, box: true, + rendered: false, register: function() { var self = this; @@ -14,16 +14,14 @@ var phpcsPlugin = PHPCI.UiPlugin.extend({ self.onUpdate(data); }); - $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { - self.displayOnUpdate = true; + $(window).on('build-updated', function() { + if (!self.rendered) { query(); } }); }, render: function() { - return $('' + '' + '' + @@ -35,10 +33,11 @@ var phpcsPlugin = PHPCI.UiPlugin.extend({ }, onUpdate: function(e) { - if (this.lastData && this.lastData[0]) { + if (!e.queryData) { return; } + this.rendered = true; this.lastData = e.queryData; var errors = this.lastData[0].meta_value; diff --git a/public/assets/js/build-plugins/phpdoccheck.js b/public/assets/js/build-plugins/phpdoccheck.js index 89d8b449..adfb75ff 100644 --- a/public/assets/js/build-plugins/phpdoccheck.js +++ b/public/assets/js/build-plugins/phpdoccheck.js @@ -5,6 +5,7 @@ var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ lastData: null, displayOnUpdate: false, box: true, + rendered: false, register: function() { var self = this; @@ -14,8 +15,8 @@ var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ self.onUpdate(data); }); - $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { + $(window).on('build-updated', function() { + if (!self.rendered) { self.displayOnUpdate = true; query(); } @@ -23,7 +24,6 @@ var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ }, render: function() { - return $('
    ' + '' + '' + @@ -37,10 +37,11 @@ var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ }, onUpdate: function(e) { - if (this.lastData && this.lastData[0]) { + if (!e.queryData) { return; } + this.rendered = true; this.lastData = e.queryData; var errors = this.lastData[0].meta_value; diff --git a/public/assets/js/build-plugins/phpmd.js b/public/assets/js/build-plugins/phpmd.js index abf90f4c..c2e6c7e1 100644 --- a/public/assets/js/build-plugins/phpmd.js +++ b/public/assets/js/build-plugins/phpmd.js @@ -5,6 +5,7 @@ var phpmdPlugin = PHPCI.UiPlugin.extend({ lastData: null, displayOnUpdate: false, box: true, + rendered: false, register: function() { var self = this; @@ -14,8 +15,8 @@ var phpmdPlugin = PHPCI.UiPlugin.extend({ self.onUpdate(data); }); - $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { + $(window).on('build-updated', function() { + if (!self.rendered) { self.displayOnUpdate = true; query(); } @@ -36,10 +37,11 @@ var phpmdPlugin = PHPCI.UiPlugin.extend({ }, onUpdate: function(e) { - if (this.lastData && this.lastData[0]) { + if (!e.queryData) { return; } + this.rendered = true; this.lastData = e.queryData; var errors = this.lastData[0].meta_value; diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js index c09855a9..1afe4d27 100644 --- a/public/assets/js/build-plugins/phpunit.js +++ b/public/assets/js/build-plugins/phpunit.js @@ -5,6 +5,7 @@ var phpunitPlugin = PHPCI.UiPlugin.extend({ lastData: null, displayOnUpdate: false, box: true, + rendered: false, register: function() { var self = this; @@ -14,8 +15,8 @@ var phpunitPlugin = PHPCI.UiPlugin.extend({ self.onUpdate(data); }); - $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { + $(window).on('build-updated', function() { + if (!self.rendered) { self.displayOnUpdate = true; query(); } @@ -33,10 +34,11 @@ var phpunitPlugin = PHPCI.UiPlugin.extend({ }, onUpdate: function(e) { - if (this.lastData && this.lastData[0]) { + if (!e.queryData) { return; } + this.rendered = true; this.lastData = e.queryData; var tests = this.lastData[0].meta_value; diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 70d2b4b2..7ae48970 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -12,6 +12,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ }, data: {}, displayOnUpdate: false, + rendered: false, register: function() { var self = this; @@ -26,7 +27,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ }); $(window).on('build-updated', function(data) { - if (data.queryData.status > 1) { + if (!self.rendered && data.queryData.status > 1) { self.displayOnUpdate = true; for (var query in queries) { queries[query](); @@ -68,6 +69,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ displayChart: function() { var self = this; + self.rendered = true; $('#build-warnings').empty().animate({height: '275px'}); diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index 05d4c3cb..9d86b849 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -317,8 +317,19 @@ var PHPCIObject = Class.extend({ updateInterval: null, init: function(build) { + var self = this; this.buildId = build; this.registerQuery('build-updated', 10); + + $(window).on('build-updated', function(data) { + + // If the build has finished, stop updating every 10 seconds: + if (data.queryData.status > 1) { + self.cancelQuery('build-updated'); + $(window).trigger({type: 'build-complete'}); + } + + }); }, registerQuery: function(name, seconds, query) { @@ -337,12 +348,16 @@ var PHPCIObject = Class.extend({ }; if (seconds != -1) { - setInterval(cb, seconds * 1000); + self.queries[name] = setInterval(cb, seconds * 1000); } return cb; }, + cancelQuery: function (name) { + clearInterval(this.queries[name]); + }, + registerPlugin: function(plugin) { this.plugins[plugin.id] = plugin; plugin.register(); From 7d50256a5382540d54e7765d2fa617b33f57a6b7 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 15:51:13 +0100 Subject: [PATCH 36/83] Initial work on fixing the complexity of user controller --- PHPCI/Controller/UserController.php | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 817cb5e8..8e727989 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -153,31 +153,23 @@ class UserController extends Controller throw new \Exception('You do not have permission to do that.'); } - $method = $this->request->getMethod(); - $user = $this->userStore->getById($userId); + $method = $this->request->getMethod(); + $user = $this->userStore->getById($userId); $this->config->set('page_title', 'Edit: ' . $user->getName()); - - if ($method == 'POST') { - $values = $this->getParams(); - } else { - $values = $user->getDataArray(); - $values['admin'] = $values['is_admin']; - } - - $form = $this->userForm($values, 'edit/' . $userId); + $values = array_merge($user->getDataArray(), $this->getParams()); + $form = $this->userForm($values, 'edit/' . $userId); if ($method != 'POST' || ($method == 'POST' && !$form->validate())) { - $view = new b8\View('UserForm'); - $view->type = 'edit'; - $view->user = $user; - $view->form = $form; + $view = new b8\View('UserForm'); + $view->type = 'edit'; + $view->user = $user; + $view->form = $form; return $view->render(); } - $values = $form->getValues(); $values['is_admin'] = $values['admin'] ? 1 : 0; if (!empty($values['password'])) { @@ -185,7 +177,7 @@ class UserController extends Controller } $user->setValues($values); - $user = $this->userStore->save($user); + $this->userStore->save($user); header('Location: '.PHPCI_URL.'user'); die; @@ -222,7 +214,7 @@ class UserController extends Controller $field->setContainerClass('form-group'); $form->addField($field); - $field = new Form\Element\Checkbox('admin'); + $field = new Form\Element\Checkbox('is_admin'); $field->setRequired(false); $field->setCheckedValue(1); $field->setLabel('Is this user an administrator?'); From aab931c29333e1498edb7b65504ba71854ff60b3 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 16:05:21 +0100 Subject: [PATCH 37/83] Reducing complexity of phpdocblockchecker::execute(), see #402 --- PHPCI/Plugin/PhpDocblockChecker.php | 31 +++++++++++++++++++---------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php index b41b8434..f2d91b4e 100755 --- a/PHPCI/Plugin/PhpDocblockChecker.php +++ b/PHPCI/Plugin/PhpDocblockChecker.php @@ -89,13 +89,7 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ public function execute() { - $ignore = ''; - if (count($this->ignore)) { - $ignore = ' --exclude="' . implode(',', $this->ignore) . '"'; - } - - var_dump($ignore); - + // Check that the binary exists: $checker = $this->phpci->findBinary('phpdoccheck'); if (!$checker) { @@ -103,9 +97,25 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - $path = $this->phpci->buildPath . $this->path; + // Build ignore string: + $ignore = ''; + if (count($this->ignore)) { + $ignore = ' --exclude="' . implode(',', $this->ignore) . '"'; + } - $cmd = $checker . ' --json --directory="%s"%s%s%s'; + // Are we skipping any checks? + $add = ''; + if ($this->skipClasses) { + $add .= ' --skip-classes'; + } + + if ($this->skipMethods) { + $add .= ' --skip-methods'; + } + + // Build command string: + $path = $this->phpci->buildPath . $this->path; + $cmd = $checker . ' --json --directory="%s"%s%s'; // Disable exec output logging, as we don't want the XML report in the log: $this->phpci->logExecOutput(false); @@ -115,8 +125,7 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $cmd, $path, $ignore, - ($this->skipClasses ? ' --skip-classes' : ''), - ($this->skipMethods ? ' --skip-methods' : '') + $add ); // Re-enable exec output logging: From 66772d3bf13f2377289074740bcd704938142fb2 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 16:19:15 +0100 Subject: [PATCH 38/83] Reducing the complexity of ProjectController::add() --- PHPCI/Controller/ProjectController.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index c06676bd..90faf898 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -227,22 +227,20 @@ class ProjectController extends \PHPCI\Controller $this->config->set('page_title', 'Edit: ' . $project->getTitle()); + $values = $project->getDataArray(); + $values['key'] = $values['git_key']; + $values['pubkey'] = $values['public_key']; + + if ($values['type'] == "gitlab") { + $accessInfo = $project->getAccessInformation(); + $reference = $accessInfo["user"].'@'.$accessInfo["domain"].':' . $project->getReference().".git"; + $values['reference'] = $reference; + } if ($method == 'POST') { $values = $this->getParams(); - } else { - $values = $project->getDataArray(); - $values['key'] = $values['git_key']; - $values['pubkey'] = $values['public_key']; - - if ($values['type'] == "gitlab") { - $accessInfo = $project->getAccessInformation(); - $reference = $accessInfo["user"].'@'.$accessInfo["domain"].':' . $project->getReference().".git"; - $values['reference'] = $reference; - } } - $form = $this->projectForm($values, 'edit/' . $projectId); if ($method != 'POST' || ($method == 'POST' && !$form->validate())) { From 3e7c38df3594f64737530a912dc0c677a8e9ba97 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 23:41:26 +0700 Subject: [PATCH 39/83] Added Sqlite plugin --- PHPCI/Plugin/Sqlite.php | 81 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 PHPCI/Plugin/Sqlite.php diff --git a/PHPCI/Plugin/Sqlite.php b/PHPCI/Plugin/Sqlite.php new file mode 100644 index 00000000..4753b6e7 --- /dev/null +++ b/PHPCI/Plugin/Sqlite.php @@ -0,0 +1,81 @@ + +* @package PHPCI +* @subpackage Plugins +*/ +class Sqlite implements \PHPCI\Plugin +{ + /** + * @var \PHPCI\Builder + */ + protected $phpci; + + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + /** + * @var array + */ + protected $queries = array(); + + /** + * @var string + */ + protected $path; + + /** + * @param Builder $phpci + * @param Build $build + * @param array $options + */ + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + $this->queries = $options; + $buildSettings = $phpci->getConfig('build_settings'); + + if (isset($buildSettings['sqlite'])) { + $sql = $buildSettings['sqlite']; + $this->path = $sql['path']; + } + } + + /** + * Connects to SQLite and runs a specified set of queries. + * @return boolean + */ + public function execute() + { + try { + $opts = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION); + $pdo = new PDO('sqlite:' . $this->path, $opts); + + foreach ($this->queries as $query) { + $pdo->query($query); + } + } catch (\Exception $ex) { + $this->phpci->logFailure($ex->getMessage()); + return false; + } + return true; + } +} From fa85f13ae891cb4a5e2dc9aa2b51003170e8986f Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 23:49:20 +0700 Subject: [PATCH 40/83] Small fixes for SQL plugins (phpdocs, some fixes) --- PHPCI/Plugin.php | 1 - PHPCI/Plugin/Mysql.php | 42 +++++++++++++++++++++++++++++++----------- PHPCI/Plugin/Pgsql.php | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/PHPCI/Plugin.php b/PHPCI/Plugin.php index 6f915e3b..d4e90ef0 100644 --- a/PHPCI/Plugin.php +++ b/PHPCI/Plugin.php @@ -9,7 +9,6 @@ namespace PHPCI; -use PHPCI\Builder; use PHPCI\Model\Build; /** diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php index c66f77cb..d2a4314e 100755 --- a/PHPCI/Plugin/Mysql.php +++ b/PHPCI/Plugin/Mysql.php @@ -22,24 +22,41 @@ use PHPCI\Model\Build; */ class Mysql implements \PHPCI\Plugin { - /** * @var \PHPCI\Builder */ protected $phpci; + + /** + * @var \PHPCI\Model\Build + */ protected $build; + + /** + * @var array + */ protected $queries = array(); + /** + * @var string + */ protected $host; + + /** + * @var string + */ protected $user; + + /** + * @var string + */ protected $pass; /** - * Database Connection - * @var PDO + * @param Builder $phpci + * @param Build $build + * @param array $options */ - protected $pdo; - public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; @@ -74,19 +91,18 @@ class Mysql implements \PHPCI\Plugin /** * Connects to MySQL and runs a specified set of queries. + * @return boolean */ public function execute() { - $success = true; - try { $opts = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION); - $this->pdo = new PDO('mysql:host=' . $this->host, $this->user, $this->pass, $opts); + $pdo = new PDO('mysql:host=' . $this->host, $this->user, $this->pass, $opts); foreach ($this->queries as $query) { if (!is_array($query)) { // Simple query - $this->pdo->query($this->phpci->interpolate($query)); + $pdo->query($this->phpci->interpolate($query)); } elseif (isset($query['import'])) { // SQL file execution $this->executeFile($query['import']); @@ -98,10 +114,14 @@ class Mysql implements \PHPCI\Plugin $this->phpci->logFailure($ex->getMessage()); return false; } - - return $success; + return true; } + /** + * @param string $query + * @return boolean + * @throws \Exception + */ protected function executeFile($query) { if (!isset($query['file'])) { diff --git a/PHPCI/Plugin/Pgsql.php b/PHPCI/Plugin/Pgsql.php index a05068d2..e4001132 100644 --- a/PHPCI/Plugin/Pgsql.php +++ b/PHPCI/Plugin/Pgsql.php @@ -21,18 +21,45 @@ use PHPCI\Model\Build; */ class Pgsql implements \PHPCI\Plugin { + /** + * @var \PHPCI\Builder + */ protected $phpci; + + /** + * @var \PHPCI\Model\Build + */ protected $build; + + /** + * @var array + */ protected $queries = array(); + /** + * @var string + */ protected $host; + + /** + * @var string + */ protected $user; + + /** + * @var string + */ protected $pass; + /** + * @param Builder $phpci + * @param Build $build + * @param array $options + */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; - $this->build = $build; + $this->phpci = $phpci; + $this->build = $build; $this->queries = $options; $buildSettings = $phpci->getConfig('build_settings'); @@ -47,6 +74,7 @@ class Pgsql implements \PHPCI\Plugin /** * Connects to PgSQL and runs a specified set of queries. + * @return boolean */ public function execute() { @@ -61,7 +89,6 @@ class Pgsql implements \PHPCI\Plugin $this->phpci->logFailure($ex->getMessage()); return false; } - return true; } } From 2476086f7c199966ec5fb3f2a3ce8e5e11687631 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 23:55:13 +0700 Subject: [PATCH 41/83] Fixes --- PHPCI/Builder.php | 2 +- vars.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index ced3c510..7365f42f 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -118,7 +118,7 @@ class Builder implements LoggerAwareInterface $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger); $executorClass = 'PHPCI\Helper\UnixCommandExecutor'; - if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { + if (IS_WIN) { $executorClass = 'PHPCI\Helper\WindowsCommandExecutor'; } diff --git a/vars.php b/vars.php index 5725805e..2408d41d 100644 --- a/vars.php +++ b/vars.php @@ -25,3 +25,7 @@ if (!defined('ENABLE_SHELL_PLUGIN')) { if (!defined('PHPCI_IS_CONSOLE')) { define('PHPCI_IS_CONSOLE', false); } + +if (!defined('IS_WIN')) { + define('IS_WIN', ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false)); +} From ff1dad958f28f2f96f09774ec3dc2bcc59389434 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sat, 10 May 2014 21:06:16 +0700 Subject: [PATCH 42/83] Fixed public key text outinf of panel border --- public/assets/css/phpci.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/assets/css/phpci.css b/public/assets/css/phpci.css index 7093c2aa..ce98017a 100644 --- a/public/assets/css/phpci.css +++ b/public/assets/css/phpci.css @@ -80,4 +80,8 @@ h1 { position: absolute; right: 25px; width: 200px; +} + +.panel-body { + overflow: auto; } \ No newline at end of file From f6d189609668f510a0af28a18ed21be83b1bbd18 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sun, 11 May 2014 22:38:33 +0700 Subject: [PATCH 43/83] Pull request review fixes --- PHPCI/Helper/BaseCommandExecutor.php | 32 +++------------------- PHPCI/Helper/CommandExecutor.php | 10 ------- PHPCI/Helper/UnixCommandExecutor.php | 35 +++++++++++++++++-------- PHPCI/Helper/WindowsCommandExecutor.php | 35 +++++++++++++++++-------- 4 files changed, 51 insertions(+), 61 deletions(-) diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php index cc4b8ca0..08364606 100644 --- a/PHPCI/Helper/BaseCommandExecutor.php +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -3,9 +3,8 @@ namespace PHPCI\Helper; use \PHPCI\Logging\BuildLogger; -use Psr\Log\LogLevel; -class BaseCommandExecutor implements CommandExecutor +abstract class BaseCommandExecutor implements CommandExecutor { /** * @var \PHPCI\Logging\BuildLogger @@ -98,30 +97,5 @@ class BaseCommandExecutor implements CommandExecutor * @param string $binary * @return null|string */ - public function findBinary($binary) - { - $binaryPath = null; - - if (is_string($binary)) { - $binary = array($binary); - } - - foreach ($binary as $bin) { - $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); - // Check project root directory: - if (is_file($this->rootDir . $bin)) { - $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); - $binaryPath = $this->rootDir . $bin; - break; - } - - // Check Composer bin dir: - if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { - $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); - $binaryPath = $this->rootDir . 'vendor/bin/' . $bin; - break; - } - } - return $binaryPath; - } -} + abstract public function findBinary($binary); +} \ No newline at end of file diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 3dce9a44..633618bb 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -2,18 +2,8 @@ namespace PHPCI\Helper; -use \PHPCI\Logging\BuildLogger; - interface CommandExecutor { - /** - * @param BuildLogger $logger - * @param string $rootDir - * @param bool $quiet - * @param bool $verbose - */ - public function __construct(BuildLogger $logger, $rootDir, &$quiet = false, &$verbose = false); - /** * Executes shell commands. Accepts multiple arguments the first * is the template and everything else is inserted in. c.f. sprintf diff --git a/PHPCI/Helper/UnixCommandExecutor.php b/PHPCI/Helper/UnixCommandExecutor.php index 208ebb33..5ab0fbc0 100644 --- a/PHPCI/Helper/UnixCommandExecutor.php +++ b/PHPCI/Helper/UnixCommandExecutor.php @@ -2,6 +2,8 @@ namespace PHPCI\Helper; +use Psr\Log\LogLevel; + class UnixCommandExecutor extends BaseCommandExecutor { /** @@ -11,21 +13,32 @@ class UnixCommandExecutor extends BaseCommandExecutor */ public function findBinary($binary) { - $binaryPath = parent::findBinary($binary); - if (is_null($binaryPath)) { + $binaryPath = null; - if (is_string($binary)) { - $binary = array($binary); + if (is_string($binary)) { + $binary = array($binary); + } + + foreach ($binary as $bin) { + $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); + + if (is_file($this->rootDir . $bin)) { + $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . $bin; + break; } - foreach ($binary as $bin) { - $findCmdResult = trim(shell_exec('which ' . $bin)); + if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { + $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . 'vendor/bin/' . $bin; + break; + } - if (!empty($findCmdResult)) { - $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); - $binaryPath = $findCmdResult; - break; - } + $findCmdResult = trim(shell_exec('which ' . $bin)); + if (!empty($findCmdResult)) { + $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); + $binaryPath = $findCmdResult; + break; } } return $binaryPath; diff --git a/PHPCI/Helper/WindowsCommandExecutor.php b/PHPCI/Helper/WindowsCommandExecutor.php index ad0ce236..83136d2a 100644 --- a/PHPCI/Helper/WindowsCommandExecutor.php +++ b/PHPCI/Helper/WindowsCommandExecutor.php @@ -2,6 +2,8 @@ namespace PHPCI\Helper; +use Psr\Log\LogLevel; + class WindowsCommandExecutor extends BaseCommandExecutor { /** @@ -11,21 +13,32 @@ class WindowsCommandExecutor extends BaseCommandExecutor */ public function findBinary($binary) { - $binaryPath = parent::findBinary($binary); - if (is_null($binaryPath)) { + $binaryPath = null; - if (is_string($binary)) { - $binary = array($binary); + if (is_string($binary)) { + $binary = array($binary); + } + + foreach ($binary as $bin) { + $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); + + if (is_file($this->rootDir . $bin)) { + $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . $bin; + break; } - foreach ($binary as $bin) { - $findCmdResult = trim(shell_exec('where ' . $bin)); + if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { + $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); + $binaryPath = $this->rootDir . 'vendor/bin/' . $bin; + break; + } - if (!empty($findCmdResult)) { - $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); - $binaryPath = $findCmdResult; - break; - } + $findCmdResult = trim(shell_exec('where ' . $bin)); + if (!empty($findCmdResult)) { + $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); + $binaryPath = $findCmdResult; + break; } } return $binaryPath; From 9d3e9d1719c3463698914121dd7ea83b512a2115 Mon Sep 17 00:00:00 2001 From: Steve B Date: Sun, 11 May 2014 16:59:54 +0100 Subject: [PATCH 44/83] Reduce complexity of mess detector plugin execute method. --- PHPCI/Plugin/PhpMessDetector.php | 132 +++++++++++++++++++------------ 1 file changed, 82 insertions(+), 50 deletions(-) diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index 2be7fed4..86175f7c 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -97,67 +97,24 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ public function execute() { - $ignore = ''; - if (count($this->ignore)) { - $ignore = ' --exclude ' . implode(',', $this->ignore); - } - - $suffixes = ''; - if (count($this->suffixes)) { - $suffixes = ' --suffixes ' . implode(',', $this->suffixes); - } - - if (!empty($this->rules) && !is_array($this->rules)) { - $this->phpci->logFailure('The "rules" option must be an array.'); + if (!$this->tryAndProcessRules()) { return false; } - foreach ($this->rules as &$rule) { - if (strpos($rule, '/') !== false) { - $rule = $this->phpci->buildPath . $rule; - } - } + $phpmdBinaryPath = $this->phpci->findBinary('phpmd'); - $phpmd = $this->phpci->findBinary('phpmd'); - - if (!$phpmd) { + if (!$phpmdBinaryPath) { $this->phpci->logFailure('Could not find phpmd.'); return false; } - - $path = $this->phpci->buildPath . $this->path; - if (!empty($this->path) && $this->path{0} == '/') { - $path = $this->path; - } - $cmd = $phpmd . ' "%s" xml %s %s %s'; + $this->executePhpMd($phpmdBinaryPath); - // Disable exec output logging, as we don't want the XML report in the log: - $this->phpci->logExecOutput(false); - - // Run PHPMD: - $this->phpci->executeCommand( - $cmd, - $path, - implode(',', $this->rules), - $ignore, - $suffixes - ); - - // Re-enable exec output logging: - $this->phpci->logExecOutput(true); - - $success = true; - - list($errors, $data) = $this->processReport(trim($this->phpci->getLastOutput())); - $this->build->storeMeta('phpmd-warnings', $errors); + list($errorCount, $data) = $this->processReport(trim($this->phpci->getLastOutput())); + $this->build->storeMeta('phpmd-warnings', $errorCount); $this->build->storeMeta('phpmd-data', $data); - if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { - $success = false; - } - - return $success; + return $this->wasLastExecSuccessful($errorCount); } protected function overrideSetting($options, $key) @@ -200,4 +157,79 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return array($warnings, $data); } + + protected function tryAndProcessRules() + { + if (!empty($this->rules) && !is_array($this->rules)) { + $this->phpci->logFailure('The "rules" option must be an array.'); + return false; + } + + foreach ($this->rules as &$rule) { + if (strpos($rule, '/') !== false) { + $rule = $this->phpci->buildPath . $rule; + } + } + + return true; + } + + protected function executePhpMd($binaryPath) + { + $cmd = $binaryPath . ' "%s" xml %s %s %s'; + + $path = $this->getTargetPath(); + + $ignore = ''; + if (count($this->ignore)) { + $ignore = ' --exclude ' . implode(',', $this->ignore); + } + + $suffixes = ''; + if (count($this->suffixes)) { + $suffixes = ' --suffixes ' . implode(',', $this->suffixes); + } + + // Disable exec output logging, as we don't want the XML report in the log: + $this->phpci->logExecOutput(false); + + // Run PHPMD: + $this->phpci->executeCommand( + $cmd, + $path, + implode(',', $this->rules), + $ignore, + $suffixes + ); + + // Re-enable exec output logging: + $this->phpci->logExecOutput(true); + } + + protected function getTargetPath() + { + $path = $this->phpci->buildPath . $this->path; + if (!empty($this->path) && $this->path{0} == '/') { + $path = $this->path; + return $path; + } + return $path; + } + + /** + * Returns a boolean indicating if the error count can be considered a success. + * + * @param int $errorCount + * @return bool + */ + protected function wasLastExecSuccessful($errorCount) + { + $success = true; + + if ($this->allowed_warnings != -1 && $errorCount > $this->allowed_warnings) { + $success = false; + return $success; + } + return $success; + } } From aa83103e8745bee62902018d0628b3b40bb63c96 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Mon, 12 May 2014 00:43:41 +0700 Subject: [PATCH 45/83] Repaired tests for CommandExecutor --- Tests/PHPCI/Helper/CommandExecutorTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index ae6809d5..f911b994 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -2,7 +2,7 @@ namespace PHPCI\Plugin\Tests\Helper; -use PHPCI\Helper\CommandExecutor; +use PHPCI\Helper\UnixCommandExecutor; use \Prophecy\PhpUnit\ProphecyTestCase; class CommandExecutorTest extends ProphecyTestCase @@ -16,7 +16,7 @@ class CommandExecutorTest extends ProphecyTestCase { parent::setUp(); $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger'); - $this->testedExecutor = new CommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/"); + $this->testedExecutor = new UnixCommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/"); } public function testGetLastOutput_ReturnsOutputOfCommand() From 7c762c60425376da9a6f4ed714ec38d05b4ee508 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Mon, 12 May 2014 00:44:13 +0700 Subject: [PATCH 46/83] Fixed annotation --- Tests/PHPCI/Helper/CommandExecutorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index f911b994..8ae045dc 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -8,7 +8,7 @@ use \Prophecy\PhpUnit\ProphecyTestCase; class CommandExecutorTest extends ProphecyTestCase { /** - * @var CommandExecutor + * @var UnixCommandExecutor */ protected $testedExecutor; From 614af204f5312962f665f635a4d6ad8992f861b9 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Mon, 12 May 2014 09:07:27 +0100 Subject: [PATCH 47/83] Add missing newline to end of BaseCommandExecutor. --- PHPCI/Helper/BaseCommandExecutor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php index 08364606..7dbd7b18 100644 --- a/PHPCI/Helper/BaseCommandExecutor.php +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -98,4 +98,4 @@ abstract class BaseCommandExecutor implements CommandExecutor * @return null|string */ abstract public function findBinary($binary); -} \ No newline at end of file +} From fd50aa144c278ee5d7abfad716523ec32fbbcb9d Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 10:12:54 +0100 Subject: [PATCH 48/83] Adding agent Dockerfile, allows you to run PHPCI build daemon within Docker --- Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..84ab1b40 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:14.04 +MAINTAINER Dan Cryer dan.cryer@block8.co.uk + +RUN echo "deb http://ppa.launchpad.net/ondrej/php5/ubuntu trusty main" >> /etc/apt/sources.list +RUN echo "deb http://archive.ubuntu.com/ubuntu/ precise universe" >> /etc/apt/sources.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C E5267A6C 0xcbcb082a1bb943db +RUN apt-get update + +# Install PHP: +RUN apt-get install -qy php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd + +ADD ./ /phpci + +CMD /phpci/daemonise phpci:daemonise From 176af17a37a7f54f18d5df48d538f8aa3b4d9810 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 10:22:56 +0100 Subject: [PATCH 49/83] Updating Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84ab1b40..9b64eaea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C300EE8C E5267A6C 0 RUN apt-get update # Install PHP: -RUN apt-get install -qy php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd +RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd ADD ./ /phpci From 3ae0f021f7d4feab7857d2253b837f79e1f2f59b Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 11:44:27 +0100 Subject: [PATCH 50/83] Trying Composer without --prefer-dist to see if we are still rate limited --- phpci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/phpci.yml b/phpci.yml index 24121476..697e6e7c 100644 --- a/phpci.yml +++ b/phpci.yml @@ -9,6 +9,7 @@ build_settings: setup: composer: action: "install" + prefer_dist: false test: php_mess_detector: From 32ca0b438d877b0dba5d5bcb5b02abbd2c371817 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 11:47:07 +0100 Subject: [PATCH 51/83] Trying adding --prefer-source when --prefer-dist is not enabled --- PHPCI/Plugin/Composer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index 3a13b672..fdad3bef 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -64,7 +64,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $cmd = 'php '; } $cmd .= $composerLocation . ' --no-ansi --no-interaction '; - $cmd .= ($this->preferDist ? '--prefer-dist' : null) . ' --working-dir="%s" %s'; + $cmd .= ($this->preferDist ? '--prefer-dist' : '--prefer-source') . ' --working-dir="%s" %s'; return $this->phpci->executeCommand($cmd, $this->directory, $this->action); } From edc8bb0754e5230e187f7867b5c9d3b47242cf83 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 11:58:43 +0100 Subject: [PATCH 52/83] Cleaning up the composer plugin a little --- PHPCI/Plugin/Composer.php | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index fdad3bef..8909dbd6 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -40,12 +40,24 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin public function __construct(Builder $phpci, Build $build, array $options = array()) { - $path = $phpci->buildPath; - $this->phpci = $phpci; + $path = $phpci->buildPath; + $this->phpci = $phpci; $this->build = $build; - $this->directory = isset($options['directory']) ? $path . '/' . $options['directory'] : $path; - $this->action = isset($options['action']) ? $options['action'] : 'install'; - $this->preferDist = isset($options['prefer_dist']) ? $options['prefer_dist'] : true; + $this->directory = $path; + $this->action = 'install'; + $this->preferDist = false; + + if (array_key_exists('directory', $options)) { + $this->directory = $path . '/' . $options['directory']; + } + + if (array_key_exists('action', $options)) { + $this->action = $options['action']; + } + + if (array_key_exists('prefer_dist', $options)) { + $this->preferDist = (bool)$options['prefer_dist']; + } } /** @@ -59,12 +71,24 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->phpci->logFailure('Could not find Composer.'); return false; } + $cmd = ''; + if (IS_WIN) { $cmd = 'php '; } + $cmd .= $composerLocation . ' --no-ansi --no-interaction '; - $cmd .= ($this->preferDist ? '--prefer-dist' : '--prefer-source') . ' --working-dir="%s" %s'; + + if ($this->preferDist) { + $this->phpci->log('Using --prefer-dist flag'); + $cmd .= '--prefer-dist'; + } else { + $this->phpci->log('Using --prefer-source flag'); + $cmd .= '--prefer-source'; + } + + $cmd .= ' --working-dir="%s" %s'; return $this->phpci->executeCommand($cmd, $this->directory, $this->action); } From 9486bd0863ff540ba39da7b514b0ba84faa41d68 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 13:46:26 +0100 Subject: [PATCH 53/83] Removing unused plugins column, adding extra column to allow for type-specific build information (such as forked repo information for pull requests or a patch file --- PHPCI/Model/Base/BuildBase.php | 76 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 569c9d6b..97b427b5 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/PHPCI/Model/Base/BuildBase.php @@ -42,9 +42,9 @@ class BuildBase extends Model 'created' => null, 'started' => null, 'finished' => null, - 'plugins' => null, 'committer_email' => null, 'commit_message' => null, + 'extra' => null, ); /** @@ -61,9 +61,9 @@ class BuildBase extends Model 'created' => 'getCreated', 'started' => 'getStarted', 'finished' => 'getFinished', - 'plugins' => 'getPlugins', 'committer_email' => 'getCommitterEmail', 'commit_message' => 'getCommitMessage', + 'extra' => 'getExtra', // Foreign key getters: 'Project' => 'getProject', @@ -83,9 +83,9 @@ class BuildBase extends Model 'created' => 'setCreated', 'started' => 'setStarted', 'finished' => 'setFinished', - 'plugins' => 'setPlugins', 'committer_email' => 'setCommitterEmail', 'commit_message' => 'setCommitMessage', + 'extra' => 'setExtra', // Foreign key setters: 'Project' => 'setProject', @@ -143,11 +143,6 @@ class BuildBase extends Model 'nullable' => true, 'default' => null, ), - 'plugins' => array( - 'type' => 'text', - 'nullable' => true, - 'default' => null, - ), 'committer_email' => array( 'type' => 'varchar', 'length' => 512, @@ -159,6 +154,11 @@ class BuildBase extends Model 'nullable' => true, 'default' => null, ), + 'extra' => array( + 'type' => 'longtext', + 'nullable' => true, + 'default' => null, + ), ); /** @@ -303,18 +303,6 @@ class BuildBase extends Model return $rtn; } - /** - * Get the value of Plugins / plugins. - * - * @return string - */ - public function getPlugins() - { - $rtn = $this->data['plugins']; - - return $rtn; - } - /** * Get the value of CommitterEmail / committer_email. * @@ -339,6 +327,18 @@ class BuildBase extends Model return $rtn; } + /** + * Get the value of Extra / extra. + * + * @return string + */ + public function getExtra() + { + $rtn = $this->data['extra']; + + return $rtn; + } + /** * Set the value of Id / id. * @@ -509,24 +509,6 @@ class BuildBase extends Model $this->_setModified('finished'); } - /** - * Set the value of Plugins / plugins. - * - * @param $value string - */ - public function setPlugins($value) - { - $this->_validateString('Plugins', $value); - - if ($this->data['plugins'] === $value) { - return; - } - - $this->data['plugins'] = $value; - - $this->_setModified('plugins'); - } - /** * Set the value of CommitterEmail / committer_email. * @@ -563,6 +545,24 @@ class BuildBase extends Model $this->_setModified('commit_message'); } + /** + * Set the value of Extra / extra. + * + * @param $value string + */ + public function setExtra($value) + { + $this->_validateString('Extra', $value); + + if ($this->data['extra'] === $value) { + return; + } + + $this->data['extra'] = $value; + + $this->_setModified('extra'); + } + /** * Get the Project model for this Build by Id. * From 03351214f12c3c8caae674afbd2f6b00045f6436 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 14:07:09 +0100 Subject: [PATCH 54/83] Updating Build model to add accessor for the extra column --- PHPCI/Model/Build.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 174126fa..d3633dfe 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -164,4 +164,19 @@ class Build extends BuildBase { return null; } + + public function getExtra($key = null) + { + $data = unserialize($this->data['extra']); + + if (is_null($key)) { + $rtn = $data; + } elseif (isset($data[$key])) { + $rtn = $data[$key]; + } else { + $rtn = null; + } + + return $rtn; + } } From fd5416a431a05e138137121b97208458495d1967 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 14:46:45 +0100 Subject: [PATCH 55/83] Updating webhook controller to support pull request payloads --- PHPCI/Controller/WebhookController.php | 72 +++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 9a9d143b..d33eea79 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -112,11 +112,27 @@ class WebhookController extends \PHPCI\Controller */ public function github($project) { - $payload = json_decode($this->getParam('payload'), true); + $payload = json_decode($this->getParam('payload'), true); + // Handle Pull Request web hooks: + if (array_key_exists('pull_request', $payload)) { + return $this->githubPullRequest($project, $payload); + } + + // Handle Push web hooks: + if (array_key_exists('commits', $payload)) { + return $this->githubCommitRequest($project, $payload); + } + + header('HTTP/1.1 200 OK'); + die('This request type is not supported, this is not an error.'); + } + + protected function githubCommitRequest($project, array $payload) + { // Github sends a payload when you close a pull request with a // non-existant commit. We don't want this. - if ($payload['after'] === '0000000000000000000000000000000000000000') { + if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') { die('OK'); } @@ -167,6 +183,58 @@ class WebhookController extends \PHPCI\Controller die('OK'); } + protected function githubPullRequest($projectId, array $payload) + { + // We only want to know about open pull requests: + if (!in_array($payload['action'], array('opened', 'synchronize', 'reopened'))) { + die('OK'); + } + + try { + $headers = array(); + $token = \b8\Config::getInstance()->get('phpci.github.token'); + + if (!empty($token)) { + $headers[] = 'Authorization: token ' . $token; + } + + $url = $payload['pull_request']['commits_url']; + $http = new \b8\HttpClient(); + $response = $http->get($url); + + foreach ($response as $commit) { + $build = new Build(); + $build->setProjectId($projectId); + $build->setCommitId($commit['sha']); + $build->setStatus(Build::STATUS_NEW); + $build->setLog(''); + $build->setCreated(new \DateTime()); + $build->setBranch(str_replace('refs/heads/', '', $payload['pull_request']['base']['ref'])); + $build->setCommitterEmail($commit['commit']['author']['email']); + $build->setCommitMessage($commit['commit']['message']); + + $extra = array( + 'build_type' => 'pull_request', + 'pull_request_id' => $payload['pull_request']['id'], + 'pull_request_number' => $payload['number'], + 'remote_branch' => $payload['pull_request']['head']['ref'], + 'remote_url' => $payload['pull_request']['head']['repo']['clone_url'], + ); + + $build->setExtra(json_encode($extra)); + + $build = $this->buildStore->save($build); + $build->sendStatusPostback(); + } + } catch (\Exception $ex) { + header('HTTP/1.1 500 Internal Server Error'); + header('Ex: ' . $ex->getMessage()); + die('FAIL'); + } + + die('OK'); + } + /** * Called by Gitlab Webhooks: */ From 5ec83f64db352c3fa9788f9ce99a6b8540267767 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 14:58:30 +0100 Subject: [PATCH 56/83] Fixing WebhookController --- PHPCI/Controller/WebhookController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index d33eea79..cfd4de9c 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -200,9 +200,17 @@ class WebhookController extends \PHPCI\Controller $url = $payload['pull_request']['commits_url']; $http = new \b8\HttpClient(); + $http->setHeaders($headers); $response = $http->get($url); - foreach ($response as $commit) { + // Check we got a success response: + if (!$response['success']) { + header('HTTP/1.1 500 Internal Server Error'); + header('Ex: Could not get commits, failed API request.'); + die('FAIL'); + } + + foreach ($response['body'] as $commit) { $build = new Build(); $build->setProjectId($projectId); $build->setCommitId($commit['sha']); From 328e5790371af725bf2bab6ac50558daf40ab418 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 14:58:48 +0100 Subject: [PATCH 57/83] Removing reference to getPlugins() from BuildsTable view --- PHPCI/View/BuildsTable.phtml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index da67e087..4fb5fa91 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -61,21 +61,7 @@ switch($build->getStatus()) - - - + + + From a62307250f883dd7bb7f24a88753122d9cc0ae57 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 18:57:55 +0100 Subject: [PATCH 77/83] Fix the git plugin merge command, see #326 --- PHPCI/Plugin/Git.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Git.php b/PHPCI/Plugin/Git.php index cdd115ce..4fe6f530 100644 --- a/PHPCI/Plugin/Git.php +++ b/PHPCI/Plugin/Git.php @@ -80,8 +80,9 @@ class Git implements \PHPCI\Plugin protected function runMergeAction($options) { if (array_key_exists('branch', $options)) { - $cmd = 'git checkout %s && git merge ' . $this->build->getBranch(); - return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']); + $cmd = 'cd "%s" && git checkout %s && git merge "%s"'; + $path = $this->phpci->buildPath; + return $this->phpci->executeCommand($cmd, $path, $options['branch'], $this->build->getBranch()); } } From a7a266b10f69b16cf69a20051f1938ba52f24386 Mon Sep 17 00:00:00 2001 From: Steve B Date: Tue, 13 May 2014 12:18:55 +0100 Subject: [PATCH 78/83] Link build status icon explicitly to master --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 686b4c12..bab731a0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ PHPCI is a free and open source continuous integration tool specifically designe **Current Build Status** -[![Build Status](http://phpci.block8.net/build-status/image/2)](http://phpci.block8.net/build-status/view/2) +[![Build Status](http://phpci.block8.net/build-status/image/2?branch=master)](http://phpci.block8.net/build-status/view/2) ##What it does: * Clones your project from Github, Bitbucket or a local path From 9488d7814f377bf6d4fa19979f2a124821e1faae Mon Sep 17 00:00:00 2001 From: Steve B Date: Tue, 13 May 2014 12:19:32 +0100 Subject: [PATCH 79/83] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bab731a0..eb0db9a9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ PHPCI is a free and open source continuous integration tool specifically designe **Current Build Status** -[![Build Status](http://phpci.block8.net/build-status/image/2?branch=master)](http://phpci.block8.net/build-status/view/2) +[![Build Status](http://phpci.block8.net/build-status/image/2?branch=master)](http://phpci.block8.net/build-status/view/2?branch=master) ##What it does: * Clones your project from Github, Bitbucket or a local path From d63a029b74bae7eaa80619f78795e6b6d6ef31b7 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 13 May 2014 15:15:06 +0000 Subject: [PATCH 80/83] Adding migrations functionality to PHPCI using Phinx --- .gitignore | 6 +- PHPCI/Command/InstallCommand.php | 14 +- PHPCI/Command/UpdateCommand.php | 6 +- .../20140513143726_initial_migration.php | 218 +++++++++++++++++ PHPCI/Model/Base/BuildMetaBase.php | 67 ++++++ PHPCI/Model/Base/ProjectBase.php | 103 +++----- PHPCI/Store/Base/BuildMetaStoreBase.php | 32 +++ composer.json | 3 +- composer.lock | 220 +++++++++++++++++- phinx.php | 29 +++ 10 files changed, 608 insertions(+), 90 deletions(-) create mode 100644 PHPCI/Migrations/20140513143726_initial_migration.php create mode 100644 phinx.php diff --git a/.gitignore b/.gitignore index d8c5ef7b..fbfc1a28 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,8 @@ config.php PHPCI/config.yml cache /loggerconfig.php -/pluginconfig.php \ No newline at end of file +/pluginconfig.php +PHPCI/Model/Migration.php +PHPCI/Model/Base/MigrationBase.php +PHPCI/Store/MigrationStore.php +PHPCI/Store/Base/MigrationStoreBase.php diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 9921cb37..83c50437 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -204,19 +204,7 @@ class InstallCommand extends Command { $output->write('Setting up your database... '); - // Load PHPCI's bootstrap file: - require(PHPCI_DIR . 'bootstrap.php'); - - try { - // Set up the database, based on table data from the models: - $gen = new Database\Generator(Database::getConnection(), 'PHPCI', './PHPCI/Model/Base/'); - $gen->generate(); - } catch (Exception $ex) { - $output->writeln(''); - $output->writeln('PHPCI failed to set up the database.'); - $output->writeln('' . $ex->getMessage() . ''); - die; - } + shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'phinx.php"'); $output->writeln('OK'); } diff --git a/PHPCI/Command/UpdateCommand.php b/PHPCI/Command/UpdateCommand.php index 171408fa..1b8becb1 100644 --- a/PHPCI/Command/UpdateCommand.php +++ b/PHPCI/Command/UpdateCommand.php @@ -50,11 +50,9 @@ class UpdateCommand extends Command { $this->verifyInstalled($output); - $output->writeln('Updating PHPCI database.'); + $output->write('Updating PHPCI database: '); - // Update the database: - $gen = new \b8\Database\Generator(\b8\Database::getConnection(), 'PHPCI', './PHPCI/Model/Base/'); - $gen->generate(); + shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'phinx.php"'); $output->writeln('Done!'); } diff --git a/PHPCI/Migrations/20140513143726_initial_migration.php b/PHPCI/Migrations/20140513143726_initial_migration.php new file mode 100644 index 00000000..8aad60b6 --- /dev/null +++ b/PHPCI/Migrations/20140513143726_initial_migration.php @@ -0,0 +1,218 @@ +createBuildTable(); + $this->createBuildMetaTable(); + $this->createProjectTable(); + $this->createUserTable(); + + // Set up foreign keys: + $build = $this->table('build'); + + if (!$build->hasForeignKey('project_id')) { + $build->addForeignKey('project_id', 'project', 'id', array('delete'=> 'CASCADE', 'update' => 'CASCADE')); + } + + $build->save(); + + $buildMeta = $this->table('build_meta'); + + if (!$buildMeta->hasForeignKey('build_id')) { + $buildMeta->addForeignKey('build_id', 'build', 'id', array('delete'=> 'CASCADE', 'update' => 'CASCADE')); + } + + if (!$buildMeta->hasForeignKey('project_id')) { + $buildMeta->addForeignKey('project_id', 'project', 'id', array('delete'=> 'CASCADE', 'update' => 'CASCADE')); + } + + $buildMeta->save(); + } + + /** + * Migrate Down. + */ + public function down() + { + + } + + protected function createBuildTable() + { + $table = $this->table('build'); + + if (!$table->hasColumn('project_id')) { + $table->addColumn('project_id', 'integer'); + } + + if (!$table->hasColumn('commit_id')) { + $table->addColumn('commit_id', 'string', array('limit' => 50)); + } + + if (!$table->hasColumn('status')) { + $table->addColumn('status', 'integer', array('limit' => 4)); + } + + if (!$table->hasColumn('log')) { + $table->addColumn('log', 'text'); + } + + if (!$table->hasColumn('branch')) { + $table->addColumn('branch', 'string', array('limit' => 50)); + } + + if (!$table->hasColumn('created')) { + $table->addColumn('created', 'datetime'); + } + + if (!$table->hasColumn('started')) { + $table->addColumn('started', 'datetime'); + } + + if (!$table->hasColumn('finished')) { + $table->addColumn('finished', 'datetime'); + } + + if (!$table->hasColumn('committer_email')) { + $table->addColumn('committer_email', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('commit_message')) { + $table->addColumn('commit_message', 'text'); + } + + if (!$table->hasColumn('extra')) { + $table->addColumn('extra', 'text'); + } + + if ($table->hasColumn('plugins')) { + $table->removeColumn('plugins'); + } + + if (!$table->hasIndex(array('project_id'))) { + $table->addIndex(array('project_id')); + } + + if (!$table->hasIndex(array('status'))) { + $table->addIndex(array('status')); + } + + $table->save(); + } + + protected function createBuildMetaTable() + { + $table = $this->table('build_meta'); + + if (!$table->hasColumn('project_id')) { + $table->addColumn('project_id', 'integer'); + } + + if (!$table->hasColumn('build_id')) { + $table->addColumn('build_id', 'integer'); + } + + if (!$table->hasColumn('meta_key')) { + $table->addColumn('meta_key', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('meta_value')) { + $table->addColumn('meta_value', 'text'); + } + + if (!$table->hasIndex(array('build_id', 'meta_key'))) { + $table->addIndex(array('build_id', 'meta_key')); + } + + $table->save(); + } + + protected function createProjectTable() + { + $table = $this->table('project'); + + if (!$table->hasColumn('title')) { + $table->addColumn('title', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('reference')) { + $table->addColumn('reference', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('git_key')) { + $table->addColumn('git_key', 'text'); + } + + if (!$table->hasColumn('public_key')) { + $table->addColumn('public_key', 'text'); + } + + if (!$table->hasColumn('type')) { + $table->addColumn('type', 'string', array('limit' => 50)); + } + + if (!$table->hasColumn('access_information')) { + $table->addColumn('access_information', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('last_commit')) { + $table->addColumn('last_commit', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('build_config')) { + $table->addColumn('build_config', 'text'); + } + + if (!$table->hasColumn('allow_public_status')) { + $table->addColumn('allow_public_status', 'integer'); + } + + if ($table->hasColumn('token')) { + $table->removeColumn('token'); + } + + if (!$table->hasIndex(array('title'))) { + $table->addIndex(array('title')); + } + + $table->save(); + } + + protected function createUserTable() + { + $table = $this->table('user'); + + if (!$table->hasColumn('email')) { + $table->addColumn('email', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('hash')) { + $table->addColumn('hash', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('name')) { + $table->addColumn('name', 'string', array('limit' => 250)); + } + + if (!$table->hasColumn('is_admin')) { + $table->addColumn('is_admin', 'integer'); + } + + if (!$table->hasIndex(array('email'))) { + $table->addIndex(array('email')); + } + + $table->save(); + } +} \ No newline at end of file diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index fc9183b2..a979e1d9 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -52,6 +52,7 @@ class BuildMetaBase extends Model 'meta_value' => 'getMetaValue', // Foreign key getters: + 'Project' => 'getProject', 'Build' => 'getBuild', ); @@ -67,6 +68,7 @@ class BuildMetaBase extends Model 'meta_value' => 'setMetaValue', // Foreign key setters: + 'Project' => 'setProject', 'Build' => 'setBuild', ); @@ -110,12 +112,20 @@ class BuildMetaBase extends Model public $indexes = array( 'PRIMARY' => array('unique' => true, 'columns' => 'id'), 'idx_meta_id' => array('unique' => true, 'columns' => 'build_id, meta_key'), + 'project_id' => array('columns' => 'project_id'), ); /** * @var array */ public $foreignKeys = array( + 'build_meta_ibfk_1' => array( + 'local_col' => 'project_id', + 'update' => 'CASCADE', + 'delete' => 'CASCADE', + 'table' => 'project', + 'col' => 'id' + ), 'fk_meta_build_id' => array( 'local_col' => 'build_id', 'update' => 'CASCADE', @@ -281,6 +291,63 @@ class BuildMetaBase extends Model $this->_setModified('meta_value'); } + /** + * Get the Project model for this BuildMeta by Id. + * + * @uses \PHPCI\Store\ProjectStore::getById() + * @uses \PHPCI\Model\Project + * @return \PHPCI\Model\Project + */ + public function getProject() + { + $key = $this->getProjectId(); + + if (empty($key)) { + return null; + } + + $cacheKey = 'Cache.Project.' . $key; + $rtn = $this->cache->get($cacheKey, null); + + if (empty($rtn)) { + $rtn = Factory::getStore('Project', 'PHPCI')->getById($key); + $this->cache->set($cacheKey, $rtn); + } + + return $rtn; + } + + /** + * Set Project - Accepts an ID, an array representing a Project or a Project model. + * + * @param $value mixed + */ + public function setProject($value) + { + // Is this an instance of Project? + if ($value instanceof \PHPCI\Model\Project) { + return $this->setProjectObject($value); + } + + // Is this an array representing a Project item? + if (is_array($value) && !empty($value['id'])) { + return $this->setProjectId($value['id']); + } + + // Is this a scalar value representing the ID of this foreign key? + return $this->setProjectId($value); + } + + /** + * Set Project - Accepts a Project model. + * + * @param $value \PHPCI\Model\Project + */ + public function setProjectObject(\PHPCI\Model\Project $value) + { + return $this->setProjectId($value->getId()); + } + /** * Get the Build model for this BuildMeta by Id. * diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index 9e2f5922..00bee23a 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -36,10 +36,9 @@ class ProjectBase extends Model 'id' => null, 'title' => null, 'reference' => null, - 'git_key' => null, - 'public_key' => null, + 'ssh_private_key' => null, + 'ssh_public_key' => null, 'type' => null, - 'token' => null, 'access_information' => null, 'last_commit' => null, 'build_config' => null, @@ -54,10 +53,9 @@ class ProjectBase extends Model 'id' => 'getId', 'title' => 'getTitle', 'reference' => 'getReference', - 'git_key' => 'getGitKey', - 'public_key' => 'getPublicKey', + 'ssh_private_key' => 'getSshPrivateKey', + 'ssh_public_key' => 'getSshPublicKey', 'type' => 'getType', - 'token' => 'getToken', 'access_information' => 'getAccessInformation', 'last_commit' => 'getLastCommit', 'build_config' => 'getBuildConfig', @@ -74,10 +72,9 @@ class ProjectBase extends Model 'id' => 'setId', 'title' => 'setTitle', 'reference' => 'setReference', - 'git_key' => 'setGitKey', - 'public_key' => 'setPublicKey', + 'ssh_private_key' => 'setSshPrivateKey', + 'ssh_public_key' => 'setSshPublicKey', 'type' => 'setType', - 'token' => 'setToken', 'access_information' => 'setAccessInformation', 'last_commit' => 'setLastCommit', 'build_config' => 'setBuildConfig', @@ -107,12 +104,12 @@ class ProjectBase extends Model 'length' => 250, 'default' => null, ), - 'git_key' => array( + 'ssh_private_key' => array( 'type' => 'text', 'nullable' => true, 'default' => null, ), - 'public_key' => array( + 'ssh_public_key' => array( 'type' => 'text', 'nullable' => true, 'default' => null, @@ -122,12 +119,6 @@ class ProjectBase extends Model 'length' => 50, 'default' => 1, ), - 'token' => array( - 'type' => 'varchar', - 'length' => 50, - 'nullable' => true, - 'default' => null, - ), 'access_information' => array( 'type' => 'varchar', 'length' => 250, @@ -202,25 +193,25 @@ class ProjectBase extends Model } /** - * Get the value of GitKey / git_key. + * Get the value of SshPrivateKey / ssh_private_key. * * @return string */ - public function getGitKey() + public function getSshPrivateKey() { - $rtn = $this->data['git_key']; + $rtn = $this->data['ssh_private_key']; return $rtn; } /** - * Get the value of PublicKey / public_key. + * Get the value of SshPublicKey / ssh_public_key. * * @return string */ - public function getPublicKey() + public function getSshPublicKey() { - $rtn = $this->data['public_key']; + $rtn = $this->data['ssh_public_key']; return $rtn; } @@ -237,18 +228,6 @@ class ProjectBase extends Model return $rtn; } - /** - * Get the value of Token / token. - * - * @return string - */ - public function getToken() - { - $rtn = $this->data['token']; - - return $rtn; - } - /** * Get the value of AccessInformation / access_information. * @@ -358,39 +337,39 @@ class ProjectBase extends Model } /** - * Set the value of GitKey / git_key. + * Set the value of SshPrivateKey / ssh_private_key. * * @param $value string */ - public function setGitKey($value) + public function setSshPrivateKey($value) { - $this->_validateString('GitKey', $value); + $this->_validateString('SshPrivateKey', $value); - if ($this->data['git_key'] === $value) { + if ($this->data['ssh_private_key'] === $value) { return; } - $this->data['git_key'] = $value; + $this->data['ssh_private_key'] = $value; - $this->_setModified('git_key'); + $this->_setModified('ssh_private_key'); } /** - * Set the value of PublicKey / public_key. + * Set the value of SshPublicKey / ssh_public_key. * * @param $value string */ - public function setPublicKey($value) + public function setSshPublicKey($value) { - $this->_validateString('PublicKey', $value); + $this->_validateString('SshPublicKey', $value); - if ($this->data['public_key'] === $value) { + if ($this->data['ssh_public_key'] === $value) { return; } - $this->data['public_key'] = $value; + $this->data['ssh_public_key'] = $value; - $this->_setModified('public_key'); + $this->_setModified('ssh_public_key'); } /** @@ -413,24 +392,6 @@ class ProjectBase extends Model $this->_setModified('type'); } - /** - * Set the value of Token / token. - * - * @param $value string - */ - public function setToken($value) - { - $this->_validateString('Token', $value); - - if ($this->data['token'] === $value) { - return; - } - - $this->data['token'] = $value; - - $this->_setModified('token'); - } - /** * Set the value of AccessInformation / access_information. * @@ -516,4 +477,16 @@ class ProjectBase extends Model { return Factory::getStore('Build', 'PHPCI')->getByProjectId($this->getId()); } + + /** + * Get BuildMeta models by ProjectId for this Project. + * + * @uses \PHPCI\Store\BuildMetaStore::getByProjectId() + * @uses \PHPCI\Model\BuildMeta + * @return \PHPCI\Model\BuildMeta[] + */ + public function getProjectBuildMetas() + { + return Factory::getStore('BuildMeta', 'PHPCI')->getByProjectId($this->getId()); + } } diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 4abd97a3..bc1589cc 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -44,6 +44,38 @@ class BuildMetaStoreBase extends Store return null; } + public function getByProjectId($value, $limit = null, $useConnection = 'read') + { + if (is_null($value)) { + throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); + } + + $add = ''; + + if ($limit) { + $add .= ' LIMIT ' . $limit; + } + + $count = null; + + $query = 'SELECT * FROM `build_meta` WHERE `project_id` = :project_id' . $add; + $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt->bindValue(':project_id', $value); + + if ($stmt->execute()) { + $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + $map = function ($item) { + return new BuildMeta($item); + }; + $rtn = array_map($map, $res); + + return array('items' => $rtn, 'count' => $count); + } else { + return array('items' => array(), 'count' => 0); + } + } + public function getByBuildId($value, $limit = null, $useConnection = 'read') { if (is_null($value)) { diff --git a/composer.json b/composer.json index fdb4bc28..9ccd326b 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "symfony/console" : "~2.1", "psr/log": "~1.0", "monolog/monolog": "~1.6", - "pimple/pimple": "~1.1" + "pimple/pimple": "~1.1", + "robmorgan/phinx": "*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 1e6302c3..4a2b4e73 100644 --- a/composer.lock +++ b/composer.lock @@ -3,20 +3,20 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "07244b4e81274ba07fdb9f0166c73678", + "hash": "4fafee12f4bcc7e7dac5f997b511eabb", "packages": [ { "name": "block8/b8framework", - "version": "1.1.2", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/Block8/b8framework.git", - "reference": "63a18f2fdc1dc31b657ea39ef841339d89f24ce8" + "reference": "2ae699b8b6a28752e9eebbd43c518fdc80a9d322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Block8/b8framework/zipball/63a18f2fdc1dc31b657ea39ef841339d89f24ce8", - "reference": "63a18f2fdc1dc31b657ea39ef841339d89f24ce8", + "url": "https://api.github.com/repos/Block8/b8framework/zipball/2ae699b8b6a28752e9eebbd43c518fdc80a9d322", + "reference": "2ae699b8b6a28752e9eebbd43c518fdc80a9d322", "shasum": "" }, "require": { @@ -50,7 +50,7 @@ "mvc", "php" ], - "time": "2014-04-01 15:30:13" + "time": "2014-05-13 09:41:11" }, { "name": "ircmaxell/password-compat", @@ -245,6 +245,63 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "robmorgan/phinx", + "version": "v0.3.4", + "source": { + "type": "git", + "url": "https://github.com/robmorgan/phinx.git", + "reference": "5de112662b64d4d6ffa45d4dfc557c2a4c1620cd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/robmorgan/phinx/zipball/5de112662b64d4d6ffa45d4dfc557c2a4c1620cd", + "reference": "5de112662b64d4d6ffa45d4dfc557c2a4c1620cd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/class-loader": "2.*", + "symfony/config": "2.*", + "symfony/console": "2.*", + "symfony/yaml": "2.*" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*", + "squizlabs/php_codesniffer": "dev-phpcs-fixer" + }, + "bin": [ + "bin/phinx" + ], + "type": "library", + "autoload": { + "psr-0": { + "Phinx": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rob Morgan", + "email": "robbym@gmail.com", + "homepage": "http://robmorgan.id.au", + "role": "Lead Developer" + } + ], + "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", + "homepage": "http://phinx.org", + "keywords": [ + "database", + "database migrations", + "db", + "migrations", + "phinx" + ], + "time": "2014-04-27 15:25:07" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.2.0", @@ -299,6 +356,108 @@ ], "time": "2014-05-08 08:11:19" }, + { + "name": "symfony/class-loader", + "version": "v2.4.4", + "target-dir": "Symfony/Component/ClassLoader", + "source": { + "type": "git", + "url": "https://github.com/symfony/ClassLoader.git", + "reference": "5101f3094903a95db3552a834a9c6585afc10d3b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/5101f3094903a95db3552a834a9c6585afc10d3b", + "reference": "5101f3094903a95db3552a834a9c6585afc10d3b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/finder": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\ClassLoader\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "http://symfony.com", + "time": "2014-04-16 10:34:31" + }, + { + "name": "symfony/config", + "version": "v2.4.4", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config.git", + "reference": "2effc67af6f21a0d267210b72d0b0b691d113528" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Config/zipball/2effc67af6f21a0d267210b72d0b0b691d113528", + "reference": "2effc67af6f21a0d267210b72d0b0b691d113528", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/filesystem": "~2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Config\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com", + "time": "2014-04-22 08:11:06" + }, { "name": "symfony/console", "version": "v2.4.4", @@ -354,6 +513,55 @@ "homepage": "http://symfony.com", "time": "2014-04-27 13:34:57" }, + { + "name": "symfony/filesystem", + "version": "v2.4.4", + "target-dir": "Symfony/Component/Filesystem", + "source": { + "type": "git", + "url": "https://github.com/symfony/Filesystem.git", + "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a3af8294bcce4a7c1b2892363b0c9d8109affad4", + "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "http://symfony.com", + "time": "2014-04-16 10:34:31" + }, { "name": "symfony/yaml", "version": "v2.4.4", diff --git a/phinx.php b/phinx.php new file mode 100644 index 00000000..674dfed6 --- /dev/null +++ b/phinx.php @@ -0,0 +1,29 @@ +get('b8.database.servers.write'); + +if (!is_array($writeServers)) { + $writeServers = array($writeServers); +} + +$conf = array( + 'paths' => array( + 'migrations' => 'PHPCI/Migrations', + ), + + 'environments' => array( + 'default_migration_table' => 'migration', + 'default_database' => 'phpci', + 'phpci' => array( + 'adapter' => 'mysql', + 'host' => end($writeServers), + 'name' => $config->get('b8.database.name'), + 'user' => $config->get('b8.database.username'), + 'pass' => $config->get('b8.database.password'), + ), + ), +); + +return $conf; \ No newline at end of file From ba8d88f23336118fda785b176941d0c16cdf972c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 13 May 2014 15:15:33 +0000 Subject: [PATCH 81/83] Renaming project.git_key and project.public_key to project.ssh_private_key and project.ssh_public_key respectively. --- PHPCI/Controller/ProjectController.php | 12 ++++----- ...0513153133_change_build_keys_migration.php | 26 +++++++++++++++++++ PHPCI/Model/Build/BitbucketBuild.php | 2 +- PHPCI/Model/Build/GithubBuild.php | 2 +- PHPCI/Model/Build/GitlabBuild.php | 2 +- PHPCI/Model/Build/RemoteGitBuild.php | 4 +-- 6 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 PHPCI/Migrations/20140513153133_change_build_keys_migration.php diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index dcfa312f..76f794c7 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -187,8 +187,8 @@ class ProjectController extends \PHPCI\Controller $values['reference'] = $matches[3]."/".$matches[4]; } - $values['git_key'] = $values['key']; - $values['public_key'] = $values['pubkey']; + $values['ssh_private_key'] = $values['key']; + $values['ssh_public_key'] = $values['pubkey']; $project = new Project(); $project->setValues($values); @@ -218,8 +218,8 @@ class ProjectController extends \PHPCI\Controller $this->config->set('page_title', 'Edit: ' . $project->getTitle()); $values = $project->getDataArray(); - $values['key'] = $values['git_key']; - $values['pubkey'] = $values['public_key']; + $values['key'] = $values['ssh_private_key']; + $values['pubkey'] = $values['ssh_public_key']; if ($values['type'] == "gitlab") { $accessInfo = $project->getAccessInformation(); @@ -244,8 +244,8 @@ class ProjectController extends \PHPCI\Controller } $values = $form->getValues(); - $values['git_key'] = $values['key']; - $values['public_key'] = $values['pubkey']; + $values['ssh_private_key'] = $values['key']; + $values['ssh_public_key'] = $values['pubkey']; if ($values['type'] == "gitlab") { preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches); diff --git a/PHPCI/Migrations/20140513153133_change_build_keys_migration.php b/PHPCI/Migrations/20140513153133_change_build_keys_migration.php new file mode 100644 index 00000000..b26a9388 --- /dev/null +++ b/PHPCI/Migrations/20140513153133_change_build_keys_migration.php @@ -0,0 +1,26 @@ +table('project'); + $project->renameColumn('git_key', 'ssh_private_key'); + $project->renameColumn('public_key', 'ssh_public_key'); + } + + /** + * Migrate Down. + */ + public function down() + { + $project = $this->table('project'); + $project->renameColumn('ssh_private_key', 'git_key'); + $project->renameColumn('ssh_public_key', 'public_key'); + } +} \ No newline at end of file diff --git a/PHPCI/Model/Build/BitbucketBuild.php b/PHPCI/Model/Build/BitbucketBuild.php index 5d7539b3..3af0d2b5 100644 --- a/PHPCI/Model/Build/BitbucketBuild.php +++ b/PHPCI/Model/Build/BitbucketBuild.php @@ -41,7 +41,7 @@ class BitbucketBuild extends RemoteGitBuild */ protected function getCloneUrl() { - $key = trim($this->getProject()->getGitKey()); + $key = trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { return 'git@bitbucket.org:' . $this->getProject()->getReference() . '.git'; diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 281dfc22..6d3f217b 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -86,7 +86,7 @@ class GithubBuild extends RemoteGitBuild */ protected function getCloneUrl() { - $key = trim($this->getProject()->getGitKey()); + $key = trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { return 'git@github.com:' . $this->getProject()->getReference() . '.git'; diff --git a/PHPCI/Model/Build/GitlabBuild.php b/PHPCI/Model/Build/GitlabBuild.php index beaf6f1e..83053090 100644 --- a/PHPCI/Model/Build/GitlabBuild.php +++ b/PHPCI/Model/Build/GitlabBuild.php @@ -56,7 +56,7 @@ class GitlabBuild extends RemoteGitBuild */ protected function getCloneUrl() { - $key = trim($this->getProject()->getGitKey()); + $key = trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { $user = $this->getProject()->getAccessInformation("user"); diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 6f845ba7..2af3f584 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -33,7 +33,7 @@ class RemoteGitBuild extends Build */ public function createWorkingCopy(Builder $builder, $buildPath) { - $key = trim($this->getProject()->getGitKey()); + $key = trim($this->getProject()->getSshPrivateKey()); if (!empty($key)) { $success = $this->cloneBySsh($builder, $buildPath); @@ -140,7 +140,7 @@ class RemoteGitBuild extends Build $keyFile = $keyPath . '.key'; // Write the contents of this project's git key to the file: - file_put_contents($keyFile, $this->getProject()->getGitKey()); + file_put_contents($keyFile, $this->getProject()->getSshPrivateKey()); chmod($keyFile, 0600); // Return the filename: From 04a79d078b2288387625f046db4afad829f5da12 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 13 May 2014 16:44:57 +0100 Subject: [PATCH 82/83] Fixing PHPMD and PHPCS errors --- phinx.php | 2 +- phpci.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phinx.php b/phinx.php index 674dfed6..3c407b1e 100644 --- a/phinx.php +++ b/phinx.php @@ -26,4 +26,4 @@ $conf = array( ), ); -return $conf; \ No newline at end of file +return $conf; diff --git a/phpci.yml b/phpci.yml index 050c6e75..4522d0fe 100644 --- a/phpci.yml +++ b/phpci.yml @@ -5,6 +5,7 @@ build_settings: - "Tests" - "PHPCI/Command" # PHPMD complains about un-used parameters, but they are required. - "public/install.php" # PHPCS really doesn't like PHP mixed with HTML (and so it shouldn't) + - "PHPCI/Migrations" # Ignore the migrations directory, as both PHPMD and PHPCS can't cope with them. setup: composer: From e84a8766fcbc27db696caca073e8d1bf9a73254c Mon Sep 17 00:00:00 2001 From: James Inman Date: Tue, 13 May 2014 16:56:05 +0100 Subject: [PATCH 83/83] HipChat integration. --- PHPCI/Plugin/HipchatNotify.php | 63 ++++++++++++++++++++++++++++++++++ composer.json | 3 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 PHPCI/Plugin/HipchatNotify.php diff --git a/PHPCI/Plugin/HipchatNotify.php b/PHPCI/Plugin/HipchatNotify.php new file mode 100644 index 00000000..4e976759 --- /dev/null +++ b/PHPCI/Plugin/HipchatNotify.php @@ -0,0 +1,63 @@ + + * @package PHPCI + * @subpackage Plugins + */ +class HipchatNotify implements \PHPCI\Plugin +{ + private $authToken; + private $userAgent; + private $cookie; + + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + + $this->userAgent = "PHPCI/1.0 (+http://www.phptesting.org/)"; + $this->cookie = "phpcicookie"; + + if (is_array($options) && isset($options['authToken']) && isset($options['room'])) { + $this->authToken = $options['authToken']; + $this->room = $options['room']; + + if (isset($options['message'])) { + $this->message = $options['message']; + } else { + $this->message = '%PROJECT_TITLE% built at %BUILD_URI%'; + } + } else { + throw new \Exception('Please define room and authToken for hipchat_notify plugin!'); + } + + } + + public function execute() + { + $hipChat = new \HipChat\HipChat($this->authToken); + $message = $this->phpci->interpolate($this->message); + + if (is_array($this->room)) { + foreach ($this->room as $room) { + $hipChat->message_room($room, 'PHPCI', $message); + } + } else { + $hipChat->message_room($this->room, 'PHPCI', $message); + } + } +} diff --git a/composer.json b/composer.json index 9ccd326b..3d9a81be 100644 --- a/composer.json +++ b/composer.json @@ -53,6 +53,7 @@ "phploc/phploc": "PHP Lines of Code", "atoum/atoum": "Atoum", "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", - "behat/behat": "Behat BDD Testing" + "behat/behat": "Behat BDD Testing", + "hipchat/hipchat-php": "Hipchat integration" } } \ No newline at end of file
    getBranch(); ?> - getPlugins(), true); - - if ( !is_array($plugins) ) { - $plugins = array(); - } - if ( 0 === count($plugins) ) { - ?> - $pluginstatus): - $subcls = $pluginstatus?'label label-success':'label label-danger'; - ?> Build()->formatPluginName($plugin); ?> -
    +
    From a2997713d128a0e134690745b14da05335b0a8f9 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:01:34 +0100 Subject: [PATCH 58/83] Removing reference to getPlugins() from BuildController --- PHPCI/Controller/BuildController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index 1dff5a15..8a12a1ef 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -105,7 +105,6 @@ class BuildController extends \PHPCI\Controller $data = array(); $data['status'] = (int)$build->getStatus(); $data['log'] = $this->cleanLog($build->getLog()); - $data['plugins'] = json_decode($build->getPlugins(), true); $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; From 1739afeca6ae7da87376a5376dbfccd79bc72b5e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:18:42 +0100 Subject: [PATCH 59/83] Update GithubBuild to allow for testing pull requests, hopefully --- PHPCI/Model/Build/GithubBuild.php | 26 +++++++++++++++++++ PHPCI/Model/Build/RemoteGitBuild.php | 37 +++++++++++++++++----------- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index f358355a..58d728ac 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -9,6 +9,7 @@ namespace PHPCI\Model\Build; +use PHPCI\Builder; use PHPCI\Model\Build\RemoteGitBuild; /** @@ -115,4 +116,29 @@ class GithubBuild extends RemoteGitBuild return $link; } + + protected function postCloneSetup(Builder $builder, $cloneTo) + { + $buildType = $this->getExtra('build_type'); + + $success = true; + + try { + if (!empty($buildType) && $buildType == 'pull_request') { + $remoteUrl = $this->getExtra('remote_url'); + $remoteBranch = $this->getExtra('remote_branch'); + + $cmd = 'cd "%s" && git checkout -b phpci/' . $this->getId() . ' %s && git pull %s %s'; + $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch(), $remoteUrl, $remoteBranch); + } + } catch (\Exception $ex) { + $success = false; + } + + if ($success) { + $success = parent::postCloneSetup($builder, $cloneTo); + } + + return $success; + } } diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 9c7c6a26..055d75d8 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -65,12 +65,8 @@ class RemoteGitBuild extends Build $cmd .= ' -b %s %s "%s"'; $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); - if (!empty($commit) && $commit != 'Manual') { - $cmd = 'cd "%s" && git checkout %s'; - if (IS_WIN) { - $cmd = 'cd /d "%s" && git checkout %s'; - } - $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); + if ($success) { + $success = $this->postCloneSetup($builder, $cloneTo); } return $success; @@ -104,15 +100,8 @@ class RemoteGitBuild extends Build $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); - // Checkout a specific commit if we need to: - $commit = $this->getCommitId(); - - if (!empty($commit) && $commit != 'Manual') { - $cmd = 'cd "%s" && git checkout %s'; - if (IS_WIN) { - $cmd = 'cd /d "%s" && git checkout %s'; - } - $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); + if ($success) { + $success = $this->postCloneSetup($builder, $cloneTo); } // Remove the key file and git wrapper: @@ -122,6 +111,24 @@ class RemoteGitBuild extends Build return $success; } + protected function postCloneSetup(Builder $builder, $cloneTo) + { + $success = true; + $commit = $this->getCommitId(); + + if (!empty($commit) && $commit != 'Manual') { + $cmd = 'cd "%s" && git checkout %s'; + + if (IS_WIN) { + $cmd = 'cd /d "%s" && git checkout %s'; + } + + $success = $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); + } + + return $success; + } + /** * Create an SSH key file on disk for this build. * @param $cloneTo From 77ec9998b674c0ed18ae7628fe438a3bbbb832ea Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:20:42 +0100 Subject: [PATCH 60/83] Fixing build model --- PHPCI/Model/Build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index d3633dfe..174decb3 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -167,7 +167,7 @@ class Build extends BuildBase public function getExtra($key = null) { - $data = unserialize($this->data['extra']); + $data = json_decode($this->data['extra']); if (is_null($key)) { $rtn = $data; From 3f0074de881918ff66c3c4a6d0b2907aae89c061 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:22:32 +0100 Subject: [PATCH 61/83] Fixing build model --- PHPCI/Model/Build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 174decb3..6b0386ac 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -167,7 +167,7 @@ class Build extends BuildBase public function getExtra($key = null) { - $data = json_decode($this->data['extra']); + $data = json_decode($this->data['extra'], true); if (is_null($key)) { $rtn = $data; From 01df334bb3fc256f9052aefb8fbc2a1368ff17a7 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:53:29 +0100 Subject: [PATCH 62/83] Cleaning up the WebhookController class, making it actually send status postbacks, skipping duplicate commits --- PHPCI/Controller/WebhookController.php | 130 ++++++++++--------------- PHPCI/Store/BuildStore.php | 22 +++++ 2 files changed, 75 insertions(+), 77 deletions(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index cfd4de9c..4044e953 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -11,6 +11,7 @@ namespace PHPCI\Controller; use b8; use b8\Store; +use PHPCI\BuildFactory; use PHPCI\Model\Build; /** @@ -42,21 +43,16 @@ class WebhookController extends \PHPCI\Controller foreach ($payload['commits'] as $commit) { try { + $email = $commit['raw_author']; $email = substr($email, 0, strpos($email, '>')); $email = substr($email, strpos($email, '<') + 1); - $build = new Build(); - $build->setProjectId($project); - $build->setCommitId($commit['raw_node']); - $build->setCommitterEmail($email); - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); - $build->setBranch($commit['branch']); - $build->setCommitMessage($commit['message']); - $this->buildStore->save($build); + $this->createBuild($project, $commit['raw_node'], $commit['branch'], $email, $commit['message']); } catch (\Exception $ex) { + header('HTTP/1.1 500 Internal Server Error'); + header('Ex: ' . $ex->getMessage()); + die('FAIL'); } } @@ -74,36 +70,22 @@ class WebhookController extends \PHPCI\Controller $commit = $this->getParam('commit'); try { - $build = new Build(); - $build->setProjectId($project); - - if ($branch !== null && trim($branch) !== '') { - $build->setBranch($branch); - } else { - $build->setBranch('master'); + if (empty($branch)) { + $branch = 'master'; } - if ($commit !== null && trim($commit) !== '') { - $build->setCommitId($commit); + if (empty($commit)) { + $commit = null; } - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); + $this->createBuild($project, $commit, $branch, null, null); + } catch (\Exception $ex) { header('HTTP/1.1 400 Bad Request'); header('Ex: ' . $ex->getMessage()); die('FAIL'); } - try { - $this->buildStore->save($build); /** bugfix: Errors with PHPCI GitHub hook #296 */ - } catch (\Exception $ex) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); - } - die('OK'); } @@ -146,32 +128,16 @@ class WebhookController extends \PHPCI\Controller continue; } - $build = new Build(); - $build->setProjectId($project); - $build->setCommitId($commit['id']); - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); - $build->setBranch(str_replace('refs/heads/', '', $payload['ref'])); - $build->setCommitterEmail($commit['committer']['email']); - $build->setCommitMessage($commit['message']); - $build = $this->buildStore->save($build); - $build->sendStatusPostback(); + $branch = str_replace('refs/heads/', '', $payload['ref']); + $committer = $commit['committer']['email']; + $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']); } } elseif (substr($payload['ref'], 0, 10) == 'refs/tags/') { // If we don't, but we're dealing with a tag, add that instead: - $build = new Build(); - $build->setProjectId($project); - $build->setCommitId($payload['after']); - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); - $build->setBranch(str_replace('refs/tags/', 'Tag: ', $payload['ref'])); - $build->setCommitterEmail($payload['pusher']['email']); - $build->setCommitMessage($payload['head_commit']['message']); - - $build = $this->buildStore->save($build); - $build->sendStatusPostback(); + $branch = str_replace('refs/tags/', 'Tag: ', $payload['ref']); + $committer = $payload['pusher']['email']; + $message = $payload['head_commit']['message']; + $this->createBuild($project, $payload['after'], $branch, $committer, $message); } } catch (\Exception $ex) { @@ -211,15 +177,9 @@ class WebhookController extends \PHPCI\Controller } foreach ($response['body'] as $commit) { - $build = new Build(); - $build->setProjectId($projectId); - $build->setCommitId($commit['sha']); - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); - $build->setBranch(str_replace('refs/heads/', '', $payload['pull_request']['base']['ref'])); - $build->setCommitterEmail($commit['commit']['author']['email']); - $build->setCommitMessage($commit['commit']['message']); + $branch = str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']); + $committer = $commit['commit']['author']['email']; + $message = $commit['commit']['message']; $extra = array( 'build_type' => 'pull_request', @@ -229,10 +189,7 @@ class WebhookController extends \PHPCI\Controller 'remote_url' => $payload['pull_request']['head']['repo']['clone_url'], ); - $build->setExtra(json_encode($extra)); - - $build = $this->buildStore->save($build); - $build->sendStatusPostback(); + $this->createBuild($projectId, $commit['sha'], $branch, $committer, $message, $extra); } } catch (\Exception $ex) { header('HTTP/1.1 500 Internal Server Error'); @@ -257,17 +214,9 @@ class WebhookController extends \PHPCI\Controller // If we have a list of commits, then add them all as builds to be tested: foreach ($payload['commits'] as $commit) { - $build = new Build(); - $build->setProjectId($project); - $build->setCommitId($commit['id']); - $build->setStatus(Build::STATUS_NEW); - $build->setLog(''); - $build->setCreated(new \DateTime()); - $build->setBranch(str_replace('refs/heads/', '', $payload['ref'])); - $build->setCommitterEmail($commit['author']['email']); - $build->setCommitMessage($commit['message']); - $build = $this->buildStore->save($build); - $build->sendStatusPostback(); + $branch = str_replace('refs/heads/', '', $payload['ref']); + $committer = $commit['author']['email']; + $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']); } } @@ -279,4 +228,31 @@ class WebhookController extends \PHPCI\Controller die('OK'); } + + protected function createBuild($projectId, $commitId, $branch, $committer, $commitMessage, $extra = array()) + { + // Check if a build already exists for this commit ID: + $builds = $this->buildStore->getByProjectAndCommit($projectId, $commitId); + + if ($builds['count']) { + return true; + } + + // If not, create a new build job for it: + $build = new Build(); + $build->setProjectId($projectId); + $build->setCommitId($commitId); + $build->setStatus(Build::STATUS_NEW); + $build->setLog(''); + $build->setCreated(new \DateTime()); + $build->setBranch($branch); + $build->setCommitterEmail($committer); + $build->setCommitMessage($commitMessage); + $build = BuildFactory::getBuild($this->buildStore->save($build)); + + // Send a status postback if the build type provides one: + $build->sendStatusPostback(); + + return true; + } } diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index e419c9cc..41d0a6f0 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -39,6 +39,28 @@ class BuildStore extends BuildStoreBase } } + public function getByProjectAndCommit($projectId, $commitId) + { + $query = 'SELECT * FROM `build` WHERE `project_id` = :project_id AND `commit_id` = :commit_id'; + $stmt = Database::getConnection('read')->prepare($query); + $stmt->bindValue(':project_id', $projectId); + $stmt->bindValue(':commit_id', $commitId); + + if ($stmt->execute()) { + $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + $map = function ($item) { + return new Build($item); + }; + + $rtn = array_map($map, $res); + + return array('items' => $rtn, 'count' => count($rtn)); + } else { + return array('items' => array(), 'count' => 0); + } + } + public function getMeta($key, $projectId, $buildId = null, $numResults = 1) { $select = '`build_id`, `meta_key`, `meta_value`'; From 1efbf62ff3e94184a88c4667d0e8bdbd73344aeb Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:55:56 +0100 Subject: [PATCH 63/83] Fixing BuildStore --- PHPCI/Store/BuildStore.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index 41d0a6f0..142dd56b 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -9,6 +9,7 @@ namespace PHPCI\Store; +use b8\Database; use PHPCI\Store\Base\BuildStoreBase; /** @@ -22,7 +23,7 @@ class BuildStore extends BuildStoreBase public function getLatestBuilds($projectId) { $query = 'SELECT * FROM build WHERE project_id = :pid ORDER BY id DESC LIMIT 5'; - $stmt = \b8\Database::getConnection('read')->prepare($query); + $stmt = Database::getConnection('read')->prepare($query); $stmt->bindValue(':pid', $projectId); if ($stmt->execute()) { @@ -68,7 +69,7 @@ class BuildStore extends BuildStoreBase $where = '`meta_key` = :key AND `project_id` = :projectId ' . $and; $query = 'SELECT '.$select.' FROM `build_meta` WHERE '.$where.' ORDER BY id DESC LIMIT :numResults'; - $stmt = \b8\Database::getConnection('read')->prepare($query); + $stmt = Database::getConnection('read')->prepare($query); $stmt->bindValue(':key', $key, \PDO::PARAM_STR); $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT); @@ -99,7 +100,7 @@ class BuildStore extends BuildStoreBase $cols = '`project_id`, `build_id`, `meta_key`, `meta_value`'; $query = 'REPLACE INTO build_meta ('.$cols.') VALUES (:projectId, :buildId, :key, :value)'; - $stmt = \b8\Database::getConnection('read')->prepare($query); + $stmt = Database::getConnection('read')->prepare($query); $stmt->bindValue(':key', $key, \PDO::PARAM_STR); $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT); From 6177b6e40607676596dfc3a1362b867e5b244e16 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 15:56:39 +0100 Subject: [PATCH 64/83] Fixing BuildStore --- PHPCI/Store/BuildStore.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index 142dd56b..469e7ec2 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -10,6 +10,7 @@ namespace PHPCI\Store; use b8\Database; +use PHPCI\Model\Build; use PHPCI\Store\Base\BuildStoreBase; /** From 079ebc527547728e0f59f789d429ecac09a03309 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 16:06:58 +0100 Subject: [PATCH 65/83] Making WebhookController actually store the array when passed --- PHPCI/Controller/WebhookController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 4044e953..95de7a72 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -229,7 +229,7 @@ class WebhookController extends \PHPCI\Controller die('OK'); } - protected function createBuild($projectId, $commitId, $branch, $committer, $commitMessage, $extra = array()) + protected function createBuild($projectId, $commitId, $branch, $committer, $commitMessage, $extra = null) { // Check if a build already exists for this commit ID: $builds = $this->buildStore->getByProjectAndCommit($projectId, $commitId); @@ -248,6 +248,11 @@ class WebhookController extends \PHPCI\Controller $build->setBranch($branch); $build->setCommitterEmail($committer); $build->setCommitMessage($commitMessage); + + if (!is_null($extra)) { + $build->setExtra(json_encode($extra)); + } + $build = BuildFactory::getBuild($this->buildStore->save($build)); // Send a status postback if the build type provides one: From 4806d1a7834c5b71d0803c414a3826d3df69f328 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 16:28:48 +0100 Subject: [PATCH 66/83] Hopefully fixing the clone issues for Pull Requests --- PHPCI/Controller/WebhookController.php | 2 +- PHPCI/Model/Build/GithubBuild.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 95de7a72..fb0e4417 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -252,7 +252,7 @@ class WebhookController extends \PHPCI\Controller if (!is_null($extra)) { $build->setExtra(json_encode($extra)); } - + $build = BuildFactory::getBuild($this->buildStore->save($build)); // Send a status postback if the build type provides one: diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 58d728ac..0b1852d8 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -128,7 +128,7 @@ class GithubBuild extends RemoteGitBuild $remoteUrl = $this->getExtra('remote_url'); $remoteBranch = $this->getExtra('remote_branch'); - $cmd = 'cd "%s" && git checkout -b phpci/' . $this->getId() . ' %s && git pull %s %s'; + $cmd = 'cd "%s" && git checkout -b phpci/' . $this->getId() . ' %s && git pull -q --no-edit %s %s'; $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch(), $remoteUrl, $remoteBranch); } } catch (\Exception $ex) { From 29aeedb033e9b9b01f6b2398e69b70c7512720a2 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 16:35:35 +0100 Subject: [PATCH 67/83] Adding git config to the docker file --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9b64eaea..da4411c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,10 @@ RUN apt-get update # Install PHP: RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd +# Give Git some fake user details to prevent it asking when trying to test merges: +git config --global user.name "PHPCI" +git config --global user.email "hello@php.ci" + ADD ./ /phpci CMD /phpci/daemonise phpci:daemonise From d4a886f747d1a908df3cdb00dfede57618c207d8 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 16:36:18 +0100 Subject: [PATCH 68/83] Adding git config to the docker file --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index da4411c4..f0c8b605 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ RUN apt-get update RUN apt-get install -qy git-core php5-common php5-cli php5-curl php5-imap php5-mcrypt php5-mysqlnd # Give Git some fake user details to prevent it asking when trying to test merges: -git config --global user.name "PHPCI" -git config --global user.email "hello@php.ci" +RUN git config --global user.name "PHPCI" +RUN git config --global user.email "hello@php.ci" ADD ./ /phpci From e81232dd2206f99629217f1ef0c0bcd0f5e3ebd1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 17:01:05 +0100 Subject: [PATCH 69/83] Reducing complexity of ProjectController::add() - See #384 --- PHPCI/Controller/ProjectController.php | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 90faf898..63a84fc6 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -178,23 +178,13 @@ class ProjectController extends \PHPCI\Controller $values = $form->getValues(); - if ($values['type'] == "gitlab") { - preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches); - + $matches = array(); + if ($values['type'] == "gitlab" && preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches)) { $info = array(); - if (isset($matches[1])) { - $info["user"] = $matches[1]; - } - - if (isset($matches[2])) { - $info["domain"] = $matches[2]; - } - + $info['user'] = $matches[1]; + $info['domain'] = $matches[2]; $values['access_information'] = serialize($info); - - if (isset($matches[3]) && isset($matches[4])) { - $values['reference'] = $matches[3]."/".$matches[4]; - } + $values['reference'] = $matches[3]."/".$matches[4]; } $values['git_key'] = $values['key']; From 70b50c108e40ddaab1a75b18523089d127299f2a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 17:07:20 +0100 Subject: [PATCH 70/83] Reducing complexity of PhpCodeSniffer::__construct() - see #386 --- PHPCI/Plugin/PhpCodeSniffer.php | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index 7c7f81e0..827e783c 100755 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -109,14 +109,6 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->suffixes = (array)$options['suffixes']; } - if (isset($options['directory'])) { - $this->directory = $options['directory']; - } - - if (isset($options['standard'])) { - $this->standard = $options['standard']; - } - if (!empty($options['tab_width'])) { $this->tab_width = ' --tab-width='.$options['tab_width']; } @@ -125,20 +117,15 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->encoding = ' --encoding=' . $options['encoding']; } - if (isset($options['path'])) { - $this->path = $options['path']; - } + $this->setOptions($options); + } - if (isset($options['ignore'])) { - $this->ignore = $options['ignore']; - } - - if (isset($options['allowed_warnings'])) { - $this->allowed_warnings = (int)$options['allowed_warnings']; - } - - if (isset($options['allowed_errors'])) { - $this->allowed_errors = (int)$options['allowed_errors']; + protected function setOptions($options) + { + foreach (array('directory', 'standard', 'path', 'ignore', 'allowed_warnings', 'allowed_errors') as $key) { + if (array_key_exists($key, $options)) { + $this->{$key} = $options[$key]; + } } } From 978b968f2706dea459aa21690affcdf9e5864bf2 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 17:12:26 +0100 Subject: [PATCH 71/83] Updating project to prevent any PHPMD or PHPCS errors creeping in --- phpci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpci.yml b/phpci.yml index 697e6e7c..050c6e75 100644 --- a/phpci.yml +++ b/phpci.yml @@ -13,9 +13,11 @@ setup: test: php_mess_detector: - allowed_warnings: 10 # Set max warnings at the current level - Disallow any further errors creeping in. + allowed_warnings: 0 php_code_sniffer: standard: "PSR2" + allowed_warnings: 0 + allowed_errors: 0 php_loc: php_unit: php_docblock_checker: From 5ba629e874d19c666de8b28228d49c751fbc0b29 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 17:26:17 +0100 Subject: [PATCH 72/83] Adding / correcting the file docblock throughout the project --- PHPCI/Application.php | 4 ++-- PHPCI/BuildFactory.php | 4 ++-- PHPCI/Builder.php | 4 ++-- PHPCI/Command/CreateAdminCommand.php | 12 ++++++------ PHPCI/Command/DaemonCommand.php | 13 ++++++------- PHPCI/Command/DaemoniseCommand.php | 13 ++++++------- PHPCI/Command/GenerateCommand.php | 12 ++++++------ PHPCI/Command/InstallCommand.php | 4 ++-- PHPCI/Command/PollCommand.php | 5 ++--- PHPCI/Command/RunCommand.php | 12 ++++++------ PHPCI/Command/UpdateCommand.php | 4 ++-- PHPCI/Controller.php | 7 +++++++ PHPCI/Controller/BuildController.php | 12 ++++++------ PHPCI/Controller/BuildStatusController.php | 12 ++++++------ PHPCI/Controller/HomeController.php | 12 ++++++------ PHPCI/Controller/PluginController.php | 4 ++-- PHPCI/Controller/ProjectController.php | 12 ++++++------ PHPCI/Controller/SessionController.php | 12 ++++++------ PHPCI/Controller/SettingsController.php | 4 ++-- PHPCI/Controller/UserController.php | 12 ++++++------ PHPCI/Controller/WebhookController.php | 4 ++-- PHPCI/Helper/BaseCommandExecutor.php | 7 +++++++ PHPCI/Helper/Build.php | 4 ++-- PHPCI/Helper/BuildInterpolator.php | 7 +++++++ PHPCI/Helper/CommandExecutor.php | 7 +++++++ PHPCI/Helper/Email.php | 7 +++++++ PHPCI/Helper/Github.php | 7 +++++++ PHPCI/Helper/MailerFactory.php | 7 +++++++ PHPCI/Helper/SshKey.php | 7 +++++++ PHPCI/Helper/UnixCommandExecutor.php | 7 +++++++ PHPCI/Helper/User.php | 12 ++++++------ PHPCI/Helper/WindowsCommandExecutor.php | 7 +++++++ PHPCI/Logging/BuildDBLogHandler.php | 8 +++++++- PHPCI/Logging/BuildLogger.php | 8 +++++++- PHPCI/Logging/Handler.php | 7 +++++++ PHPCI/Logging/LoggedBuildContextTidier.php | 7 +++++++ PHPCI/Logging/LoggerConfig.php | 9 +++++++-- PHPCI/Logging/OutputLogHandler.php | 9 +++++++-- PHPCI/Model.php | 8 ++++++++ PHPCI/Model/Build.php | 12 ++++++------ PHPCI/Model/Build/BitbucketBuild.php | 12 ++++++------ PHPCI/Model/Build/GithubBuild.php | 12 ++++++------ PHPCI/Model/Build/GitlabBuild.php | 12 ++++++------ PHPCI/Model/Build/LocalBuild.php | 12 ++++++------ PHPCI/Model/Build/MercurialBuild.php | 12 ++++++------ PHPCI/Model/Build/RemoteGitBuild.php | 12 ++++++------ PHPCI/Model/BuildMeta.php | 7 +++++-- PHPCI/Model/Project.php | 12 ++++++------ PHPCI/Model/User.php | 12 ++++++------ PHPCI/Plugin.php | 12 ++++++------ PHPCI/Plugin/Atoum.php | 7 +++++++ PHPCI/Plugin/Behat.php | 4 ++-- PHPCI/Plugin/Campfire.php | 7 +++++++ PHPCI/Plugin/CleanBuild.php | 12 ++++++------ PHPCI/Plugin/Codeception.php | 4 ++-- PHPCI/Plugin/Composer.php | 12 ++++++------ PHPCI/Plugin/CopyBuild.php | 12 ++++++------ PHPCI/Plugin/Email.php | 12 ++++++------ PHPCI/Plugin/Env.php | 12 ++++++------ PHPCI/Plugin/Git.php | 4 ++-- PHPCI/Plugin/Grunt.php | 12 ++++++------ PHPCI/Plugin/Irc.php | 7 +++++++ PHPCI/Plugin/Lint.php | 4 ++-- PHPCI/Plugin/Mysql.php | 12 ++++++------ PHPCI/Plugin/PackageBuild.php | 12 ++++++------ PHPCI/Plugin/Pdepend.php | 4 ++-- PHPCI/Plugin/Pgsql.php | 12 ++++++------ PHPCI/Plugin/Phing.php | 4 ++-- PHPCI/Plugin/PhpCodeSniffer.php | 12 ++++++------ PHPCI/Plugin/PhpCpd.php | 12 ++++++------ PHPCI/Plugin/PhpCsFixer.php | 12 ++++++------ PHPCI/Plugin/PhpDocblockChecker.php | 12 ++++++------ PHPCI/Plugin/PhpLoc.php | 4 ++-- PHPCI/Plugin/PhpMessDetector.php | 12 ++++++------ PHPCI/Plugin/PhpParallelLint.php | 12 ++++++------ PHPCI/Plugin/PhpSpec.php | 12 ++++++------ PHPCI/Plugin/PhpUnit.php | 12 ++++++------ PHPCI/Plugin/Shell.php | 4 ++-- PHPCI/Plugin/Sqlite.php | 12 ++++++------ PHPCI/Plugin/Wipe.php | 12 ++++++------ PHPCI/Store.php | 8 ++++++++ PHPCI/Store/BuildMetaStore.php | 7 +++++-- PHPCI/Store/BuildStore.php | 12 ++++++------ PHPCI/Store/ProjectStore.php | 12 ++++++------ PHPCI/Store/UserStore.php | 12 ++++++------ PHPCI/ZeroConfigPlugin.php | 4 ++-- 86 files changed, 461 insertions(+), 315 deletions(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 011e27e5..3e15686e 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -2,9 +2,9 @@ /** * PHPCI - Continuous Integration for PHP * -* @copyright Copyright 2013, Block 8 Limited. +* @copyright Copyright 2014, Block 8 Limited. * @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md -* @link http://www.phptesting.org/ +* @link https://www.phptesting.org/ */ namespace PHPCI; diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php index 3f48eec0..4825047d 100644 --- a/PHPCI/BuildFactory.php +++ b/PHPCI/BuildFactory.php @@ -2,9 +2,9 @@ /** * PHPCI - Continuous Integration for PHP * -* @copyright Copyright 2013, Block 8 Limited. +* @copyright Copyright 2014, Block 8 Limited. * @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md -* @link http://www.phptesting.org/ +* @link https://www.phptesting.org/ */ namespace PHPCI; diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 7365f42f..674e63a9 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -2,9 +2,9 @@ /** * PHPCI - Continuous Integration for PHP * - * @copyright Copyright 2013, Block 8 Limited. + * @copyright Copyright 2014, Block 8 Limited. * @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md - * @link http://www.phptesting.org/ + * @link https://www.phptesting.org/ */ namespace PHPCI; diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php index 647dffca..30d800b1 100644 --- a/PHPCI/Command/CreateAdminCommand.php +++ b/PHPCI/Command/CreateAdminCommand.php @@ -1,11 +1,11 @@ /dev/null 2>&1 & -* -* @copyright Copyright 2013, Block 8 Limited. -* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md -* @link http://www.phptesting.org/ -*/ + * PHPCI - Continuous Integration for PHP + * + * @copyright Copyright 2014, Block 8 Limited. + * @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md + * @link https://www.phptesting.org/ + */ namespace PHPCI\Command; diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index b4d0295c..2850ff5f 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -1,12 +1,11 @@ /dev/null 2>&1 & -* -* @copyright Copyright 2013, Block 8 Limited. -* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md -* @link http://www.phptesting.org/ -*/ + * PHPCI - Continuous Integration for PHP + * + * @copyright Copyright 2014, Block 8 Limited. + * @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md + * @link https://www.phptesting.org/ + */ namespace PHPCI\Command; diff --git a/PHPCI/Command/GenerateCommand.php b/PHPCI/Command/GenerateCommand.php index 82c41531..07307686 100644 --- a/PHPCI/Command/GenerateCommand.php +++ b/PHPCI/Command/GenerateCommand.php @@ -1,11 +1,11 @@ output = $output; } - protected function write(array $record) { $this->output->writeln((string)$record['formatted']); diff --git a/PHPCI/Model.php b/PHPCI/Model.php index 7e314693..d1adf9ec 100644 --- a/PHPCI/Model.php +++ b/PHPCI/Model.php @@ -1,4 +1,12 @@ Date: Mon, 12 May 2014 17:26:40 +0100 Subject: [PATCH 73/83] Update index.php --- public/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/index.php b/public/index.php index 134e9a7b..94191794 100644 --- a/public/index.php +++ b/public/index.php @@ -2,9 +2,9 @@ /** * PHPCI - Continuous Integration for PHP * -* @copyright Copyright 2013, Block 8 Limited. -* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md -* @link http://www.phptesting.org/ +* @copyright Copyright 2014, Block 8 Limited. +* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md +* @link https://www.phptesting.org/ */ session_start(); From 9d58add8436bce973c24a2c7e992806f155a8c96 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 18:26:44 +0100 Subject: [PATCH 74/83] Removing PHPCI's attempt to install plugins via composer automatically, as it usually doesn't work. See #395 --- PHPCI/Controller/PluginController.php | 36 ++------------------------- PHPCI/View/Plugin/index.phtml | 10 +------- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index 3d94536c..46cba7b5 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -37,20 +37,6 @@ class PluginController extends \PHPCI\Controller protected $canInstall; protected $composerPath; - public function init() - { - parent::init(); - $this->canInstall = function_exists('shell_exec'); - - if ($this->canInstall) { - $this->composerPath = $this->findBinary(array('composer', 'composer.phar')); - - if (!$this->composerPath) { - $this->canInstall = false; - } - } - } - public function index() { if (!$_SESSION['user']->getIsAdmin()) { @@ -58,7 +44,6 @@ class PluginController extends \PHPCI\Controller } $this->view->canWrite = is_writable(APPLICATION_PATH . 'composer.json'); - $this->view->canInstall = $this->canInstall; $this->view->required = $this->required; $json = $this->getComposerJson(); @@ -93,13 +78,6 @@ class PluginController extends \PHPCI\Controller unset($json['require'][$package]); $this->setComposerJson($json); - if ($this->canInstall) { - $home = 'COMPOSER_HOME='.APPLICATION_PATH . ' '; - $action = ' update --working-dir=' . APPLICATION_PATH; - $toLog = APPLICATION_PATH . '/phpci_composer_remove.log 2>&1 &'; - shell_exec($home . $this->composerPath . $action . ' > /' . $toLog); - } - header('Location: ' . PHPCI_URL . 'plugin?r=' . $package); die; } @@ -121,16 +99,6 @@ class PluginController extends \PHPCI\Controller $json['require'][$package] = $version; $this->setComposerJson($json); - if ($this->canInstall) { - $home = 'COMPOSER_HOME='.APPLICATION_PATH . ' '; - $action = ' update --working-dir=' . APPLICATION_PATH; - $toLog = ' > /' . APPLICATION_PATH . '/phpci_composer_install.log 2>&1 &'; - shell_exec($home . $this->composerPath . $action . $toLog); - - header('Location: ' . PHPCI_URL . 'plugin?i=' . $package); - die; - } - header('Location: ' . PHPCI_URL . 'plugin?w=' . $package); die; } @@ -179,7 +147,7 @@ class PluginController extends \PHPCI\Controller { $searchQuery = $this->getParam('q', ''); $http = new \b8\HttpClient(); - $http->setHeaders(array('User-Agent: PHPCI/1.0 (+http://www.phptesting.org)')); + $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)')); $res = $http->get('https://packagist.org/search.json', array('q' => $searchQuery)); die(json_encode($res['body'])); @@ -189,7 +157,7 @@ class PluginController extends \PHPCI\Controller { $name = $this->getParam('p', ''); $http = new \b8\HttpClient(); - $http->setHeaders(array('User-Agent: PHPCI/1.0 (+http://www.phptesting.org)')); + $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)')); $res = $http->get('https://packagist.org/packages/'.$name.'.json'); die(json_encode($res['body'])); diff --git a/PHPCI/View/Plugin/index.phtml b/PHPCI/View/Plugin/index.phtml index 3cfac153..a28799c7 100644 --- a/PHPCI/View/Plugin/index.phtml +++ b/PHPCI/View/Plugin/index.phtml @@ -1,8 +1,4 @@

    Packages and Provided Plugins

    - -

    PHPCI cannot automatically install/remove plugins for you, as either the shell_exec() - function is disabled or PHPCI could not find Composer. PHPCI will update composer.json for you, but you will need to run Composer manually to make the changes.

    -

    PHPCI cannot update composer.json for you as it is not writable.

    @@ -12,12 +8,8 @@

    has been removed.

    - -

    has been installed.

    - - -

    has been added to composer.json and will be installed next time you run composer update.

    +

    has been added to composer.json for you and will be installed next time you run composer update.

    From b4c0783f4d06181d4b465b7b3980623edf3d09a4 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 18:37:48 +0100 Subject: [PATCH 75/83] Adding a warning that PHPCI can't save your settings if the config.yml file is not writeable, fixes #369 --- PHPCI/Controller/SettingsController.php | 6 ++++++ PHPCI/View/Settings/index.phtml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 01f52460..ebcab7e8 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -48,6 +48,7 @@ class SettingsController extends Controller $this->view->github = $this->getGithubForm(); $this->view->emailSettings = $this->getEmailForm($emailSettings); + $this->view->isWriteable = $this->canWriteConfig(); if (!empty($this->settings['phpci']['github']['token'])) { $this->view->githubUser = $this->getGithubUser($this->settings['phpci']['github']['token']); @@ -242,4 +243,9 @@ class SettingsController extends Controller return $user['body']; } + + protected function canWriteConfig() + { + return is_writeable(APPLICATION_PATH . 'PHPCI/config.yml'); + } } diff --git a/PHPCI/View/Settings/index.phtml b/PHPCI/View/Settings/index.phtml index 3f0eb5ec..322206c4 100644 --- a/PHPCI/View/Settings/index.phtml +++ b/PHPCI/View/Settings/index.phtml @@ -10,6 +10,12 @@

    + +

    + PHPCI cannot write to your config.yml file, settings may not be saved properly until this is rectified. +

    + +

    Your Github account has been linked. From 84cfda353895a6ab4d5ca60d28e1ab9a7be98eae Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 12 May 2014 18:42:57 +0100 Subject: [PATCH 76/83] PHP 5.3 cleanup, fixes #360 --- PHPCI/View/Email/failed.phtml | 8 ++++---- PHPCI/View/Plugin/index.phtml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PHPCI/View/Email/failed.phtml b/PHPCI/View/Email/failed.phtml index fc199540..4391748f 100644 --- a/PHPCI/View/Email/failed.phtml +++ b/PHPCI/View/Email/failed.phtml @@ -1,15 +1,15 @@

    - getTitle(); ?> - Build #getId(); ?> + getTitle(); ?> - Build #getId(); ?>
    -

    Your commit getCommitId(); ?> caused a failed build in project getTitle(); ?>.

    +

    Your commit getCommitId(); ?> caused a failed build in project getTitle(); ?>.

    -

    getCommitMessage(); ?>

    +

    getCommitMessage(); ?>

    -

    Please review your commit and the build log.

    +

    Please review your commit and the build log.

    \ No newline at end of file diff --git a/PHPCI/View/Plugin/index.phtml b/PHPCI/View/Plugin/index.phtml index a28799c7..a224c752 100644 --- a/PHPCI/View/Plugin/index.phtml +++ b/PHPCI/View/Plugin/index.phtml @@ -26,9 +26,9 @@
    name; ?>class; ?>source; ?>name; ?>class; ?>source; ?>