diff --git a/.phpci.yml b/.phpci.yml
index b4fd52ec..d6ea0921 100644
--- a/.phpci.yml
+++ b/.phpci.yml
@@ -13,7 +13,6 @@ build_settings:
setup:
composer:
action: "install"
- prefer_dist: false
test:
php_parallel_lint:
diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index 0edc44d8..1aed3d3f 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -213,8 +213,6 @@ class Builder implements LoggerAwareInterface
$this->build->setStatus(Build::STATUS_FAILED);
}
- // Complete stage plugins are always run
- $this->pluginExecutor->executePlugins($this->config, 'complete');
if ($success) {
$this->pluginExecutor->executePlugins($this->config, 'success');
@@ -236,6 +234,9 @@ class Builder implements LoggerAwareInterface
} catch (\Exception $ex) {
$this->build->setStatus(Build::STATUS_FAILED);
$this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage());
+ }finally{
+ // Complete stage plugins are always run
+ $this->pluginExecutor->executePlugins($this->config, 'complete');
}
diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php
index 318871a5..5f5cbd67 100644
--- a/PHPCI/Command/InstallCommand.php
+++ b/PHPCI/Command/InstallCommand.php
@@ -21,6 +21,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use PHPCI\Service\UserService;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
/**
* Install console command - Installs PHPCI.
@@ -253,6 +254,14 @@ class InstallCommand extends Command
$rtn = [];
+ $helper = $this->getHelper('question');
+ $question = new ConfirmationQuestion('Use beanstalkd to manage build queue? ', true);
+
+ if (!$helper->ask($input, $output, $question)) {
+ $output->writeln('Skipping beanstalkd configuration.');
+ return null;
+ }
+
if (!$rtn['host'] = $input->getOption('queue-server')) {
$rtn['host'] = $dialog->ask($output, 'Enter your beanstalkd hostname [localhost]: ', 'localhost');
}
diff --git a/PHPCI/Command/WorkerCommand.php b/PHPCI/Command/WorkerCommand.php
index 49685656..5ceb6a84 100644
--- a/PHPCI/Command/WorkerCommand.php
+++ b/PHPCI/Command/WorkerCommand.php
@@ -50,7 +50,8 @@ class WorkerCommand extends Command
{
$this
->setName('phpci:worker')
- ->setDescription('Runs the PHPCI build worker.');
+ ->setDescription('Runs the PHPCI build worker.')
+ ->addOption('debug', null, null, 'Run PHPCI in Debug Mode');
}
protected function execute(InputInterface $input, OutputInterface $output)
@@ -65,6 +66,12 @@ class WorkerCommand extends Command
);
}
+ // Allow PHPCI to run in "debug mode"
+ if ($input->hasOption('debug') && $input->getOption('debug')) {
+ $output->writeln('Debug mode enabled.');
+ define('PHPCI_DEBUG_MODE', true);
+ }
+
$config = Config::getInstance()->get('phpci.worker', []);
if (empty($config['host']) || empty($config['queue'])) {
diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php
index f68a739c..55ccbb37 100644
--- a/PHPCI/Controller/BuildController.php
+++ b/PHPCI/Controller/BuildController.php
@@ -180,7 +180,7 @@ class BuildController extends \PHPCI\Controller
$errorView->build = $build;
$errorView->errors = $errors;
- $data['errors'] = count($errors);
+ $data['errors'] = $errorStore->getErrorTotalForBuild($build->getId());
$data['error_html'] = $errorView->render();
$data['since'] = (new \DateTime())->format('Y-m-d H:i:s');
@@ -200,6 +200,10 @@ class BuildController extends \PHPCI\Controller
$build = $this->buildService->createDuplicateBuild($copy);
+ if ($this->buildService->queueError) {
+ $_SESSION['global_error'] = Lang::get('add_to_queue_failed');
+ }
+
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
return $response;
diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index be5dee19..72be46e5 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -116,6 +116,10 @@ class ProjectController extends PHPCI\Controller
$email = $_SESSION['phpci_user']->getEmail();
$build = $this->buildService->createBuild($project, null, urldecode($branch), $email);
+ if ($this->buildService->queueError) {
+ $_SESSION['global_error'] = Lang::get('add_to_queue_failed');
+ }
+
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
return $response;
diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index b43bd1cd..4b444d03 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -27,6 +27,8 @@ use PHPCI\Store\ProjectStore;
* @author Guillaume Perréal
* @package PHPCI
* @subpackage Web
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
*/
class WebhookController extends \b8\Controller
{
diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php
index bd948834..b3b47f7b 100644
--- a/PHPCI/Helper/BaseCommandExecutor.php
+++ b/PHPCI/Helper/BaseCommandExecutor.php
@@ -76,6 +76,7 @@ abstract class BaseCommandExecutor implements CommandExecutor
$this->lastOutput = array();
$command = call_user_func_array('sprintf', $args);
+ $this->logger->logDebug($command);
if ($this->quiet) {
$this->logger->log('Executing: ' . $command);
@@ -89,7 +90,6 @@ abstract class BaseCommandExecutor implements CommandExecutor
);
$pipes = array();
-
$process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null);
if (is_resource($process)) {
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index eec2ee07..63df75d2 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -372,6 +372,9 @@ PHPCI',
'project_id_argument' => 'A project ID',
'commit_id_option' => 'Commit ID to build',
'branch_name_option' => 'Branch to build',
+ 'add_to_queue_failed' => 'Build created successfully, but failed to add to build queue. This usually happens
+ when PHPCI is set to use a beanstalkd server that does not exist,
+ or your beanstalkd server has stopped.',
// Run Command
'run_all_pending' => 'Run all pending PHPCI builds.',
diff --git a/PHPCI/Logging/BuildLogger.php b/PHPCI/Logging/BuildLogger.php
index 73f3b464..a68e9e6d 100644
--- a/PHPCI/Logging/BuildLogger.php
+++ b/PHPCI/Logging/BuildLogger.php
@@ -67,7 +67,7 @@ class BuildLogger implements LoggerAwareInterface
}
}
- /**
+ /**
* Add a success-coloured message to the log.
* @param string
*/
@@ -98,6 +98,17 @@ class BuildLogger implements LoggerAwareInterface
);
}
+ /**
+ * Add a debug message to the log.
+ * @param string
+ */
+ public function logDebug($message)
+ {
+ if (defined('PHPCI_DEBUG_MODE') && PHPCI_DEBUG_MODE) {
+ $this->log("\033[0;33m" . $message . "\033[0m");
+ }
+ }
+
/**
* Sets a logger instance on the object
*
diff --git a/PHPCI/Migrations/20160623100223_project_table_defaults.php b/PHPCI/Migrations/20160623100223_project_table_defaults.php
new file mode 100644
index 00000000..079db327
--- /dev/null
+++ b/PHPCI/Migrations/20160623100223_project_table_defaults.php
@@ -0,0 +1,18 @@
+table('project')
+ ->changeColumn('build_config', MysqlAdapter::PHINX_TYPE_TEXT, array('null' => true))
+ ->changeColumn('archived', MysqlAdapter::PHINX_TYPE_INTEGER, array(
+ 'length' => MysqlAdapter::INT_TINY,
+ 'default' => 0,
+ ))
+ ->save();
+ }
+}
diff --git a/PHPCI/Model/Project.php b/PHPCI/Model/Project.php
index 717b0d9a..4b5268b2 100644
--- a/PHPCI/Model/Project.php
+++ b/PHPCI/Model/Project.php
@@ -96,7 +96,7 @@ class Project extends ProjectBase
$info = $this->data['access_information'];
// Handle old-format (serialized) access information first:
- if (!empty($info) && substr($info, 0, 1) != '{') {
+ if (!empty($info) && !in_array(substr($info, 0, 1), array('{', '['))) {
$data = unserialize($info);
} else {
$data = json_decode($info, true);
diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php
index bd5f6658..7bd86ac3 100644
--- a/PHPCI/Plugin/Composer.php
+++ b/PHPCI/Plugin/Composer.php
@@ -61,6 +61,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
$this->directory = $path;
$this->action = 'install';
$this->preferDist = false;
+ $this->preferSource = false;
$this->nodev = false;
if (array_key_exists('directory', $options)) {
@@ -75,6 +76,11 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
$this->preferDist = (bool)$options['prefer_dist'];
}
+ if (array_key_exists('prefer_source', $options)) {
+ $this->preferDist = false;
+ $this->preferSource = (bool)$options['prefer_source'];
+ }
+
if (array_key_exists('no_dev', $options)) {
$this->nodev = (bool)$options['no_dev'];
}
@@ -97,10 +103,12 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
if ($this->preferDist) {
$this->phpci->log('Using --prefer-dist flag');
- $cmd .= '--prefer-dist';
- } else {
+ $cmd .= ' --prefer-dist';
+ }
+
+ if ($this->preferSource) {
$this->phpci->log('Using --prefer-source flag');
- $cmd .= '--prefer-source';
+ $cmd .= ' --prefer-source';
}
if ($this->nodev) {
diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php
old mode 100644
new mode 100755
index 2424d41e..aa076d2d
--- a/PHPCI/Plugin/PhpCpd.php
+++ b/PHPCI/Plugin/PhpCpd.php
@@ -50,17 +50,12 @@ class PhpCpd implements \PHPCI\Plugin
$this->build = $build;
$this->path = $phpci->buildPath;
- $this->standard = 'PSR1';
$this->ignore = $phpci->ignore;
if (!empty($options['path'])) {
$this->path = $phpci->buildPath . $options['path'];
}
- if (!empty($options['standard'])) {
- $this->standard = $options['standard'];
- }
-
if (!empty($options['ignore'])) {
$this->ignore = $options['ignore'];
}
diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
index 39f28666..24af62e4 100644
--- a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
+++ b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
@@ -30,7 +30,6 @@ class Codeception implements ParserInterface
{
$this->phpci = $phpci;
$this->resultsXml = $resultsXml;
-
$this->totalTests = 0;
}
@@ -71,7 +70,7 @@ class Codeception implements ParserInterface
if (isset($testcase->failure) || isset($testcase->error)) {
$testresult['pass'] = false;
- $testresult['message'] = isset($testcase->failure) ? (string) $testcase->failure : (string) $testcase->error;
+ $testresult['message'] = (string)$testcase->failure . (string)$testcase->error;
} else {
$testresult['pass'] = true;
}
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index dca0fc0d..a120a64e 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -30,6 +30,11 @@ class BuildService
*/
protected $buildStore;
+ /**
+ * @var bool
+ */
+ public $queueError = false;
+
/**
* @param BuildStore $buildStore
*/
@@ -155,27 +160,30 @@ class BuildService
}
$config = Config::getInstance();
-
$settings = $config->get('phpci.worker', []);
if (!empty($settings['host']) && !empty($settings['queue'])) {
- $jobData = array(
- 'type' => 'phpci.build',
- 'build_id' => $build->getId(),
- );
+ try {
+ $jobData = array(
+ 'type' => 'phpci.build',
+ 'build_id' => $build->getId(),
+ );
- if ($config->get('using_custom_file')) {
- $jobData['config'] = $config->getArray();
+ if ($config->get('using_custom_file')) {
+ $jobData['config'] = $config->getArray();
+ }
+
+ $pheanstalk = new Pheanstalk($settings['host']);
+ $pheanstalk->useTube($settings['queue']);
+ $pheanstalk->put(
+ json_encode($jobData),
+ PheanstalkInterface::DEFAULT_PRIORITY,
+ PheanstalkInterface::DEFAULT_DELAY,
+ $config->get('phpci.worker.job_timeout', 600)
+ );
+ } catch (\Exception $ex) {
+ $this->queueError = true;
}
-
- $pheanstalk = new Pheanstalk($settings['host']);
- $pheanstalk->useTube($settings['queue']);
- $pheanstalk->put(
- json_encode($jobData),
- PheanstalkInterface::DEFAULT_PRIORITY,
- PheanstalkInterface::DEFAULT_DELAY,
- $config->get('phpci.worker.job_timeout', 600)
- );
}
}
}
diff --git a/PHPCI/Store/BuildErrorStore.php b/PHPCI/Store/BuildErrorStore.php
index 815a4d18..c2d32468 100644
--- a/PHPCI/Store/BuildErrorStore.php
+++ b/PHPCI/Store/BuildErrorStore.php
@@ -54,4 +54,27 @@ class BuildErrorStore extends BuildErrorStoreBase
return array();
}
}
+
+ /**
+ * Gets the total number of errors for a given build.
+ * @param $buildId
+ * @param string $since date string
+ * @return array
+ */
+ public function getErrorTotalForBuild($buildId)
+ {
+ $query = 'SELECT COUNT(*) AS total FROM build_error
+ WHERE build_id = :build';
+
+ $stmt = Database::getConnection('read')->prepare($query);
+
+ $stmt->bindValue(':build', $buildId, \PDO::PARAM_INT);
+
+ if ($stmt->execute()) {
+ $res = $stmt->fetch(\PDO::FETCH_ASSOC);
+ return $res['total'];
+ } else {
+ return array();
+ }
+ }
}
diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index 2e105c18..1960aff6 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -292,6 +292,14 @@
+ ' . $message . '';
+ }
+ ?>
+
diff --git a/README.md b/README.md
index 910e15f7..77683b91 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,12 @@ PHPCI is a free and open source (BSD License) continuous integration tool specif
We have a chat room for discussing PHPCI, you can access it here: [](https://gitter.im/Block8/PHPCI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
+**Support the development of PHPCI**
+
+We [now accept donations](https://www.phptesting.org/support) to directly support the ongoing development of PHPCI. There is of course no obligation to donate, nor any commitment if you do.
+
+[Donate](https://www.phptesting.org/support)
+
## What it does:
* Clones your project from Github, Bitbucket or a local path
* Allows you to set up and tear down test databases.