Updating composer.

.github/CONTRIBUTING.md

@@ -1,41 +0,0 @@
-Contributions to PHPCI are very much encouraged, and we do our best to make it as welcoming and simple as possible.
-
-### Before You Start
-Before you start, please make sure that you are aware of, and agree to, the following conditions of contribution:
-
-* By making a contribution to PHPCI, you accept that you are granting copyright ownership for that contribution to Block 8 Limited - the company responsible for PHPCI. In countries where copyright reassignment is not permitted, you grant Block 8 Limited a perpetual, non-exclusive licence to use your contribution in any way and for any purpose.
-
-* By making a contribution to PHPCI, you accept that your code will be released under the open-source [BSD 2-Clause Licence](https://github.com/Block8/PHPCI/blob/master/LICENSE.md).
-
-Block 8 are committed to PHPCI being a truly free and open source project, providing easy to use continuous integration and testing to as many developers as possible. We may, at our sole discretion, provide paid services based upon PHPCI - but PHPCI will always remain free (as in cost, and freedom) and open source.
-
-### The Contribution Process
-
-1. If you are thinking of making a large change or feature addition, [open an issue](/Block8/PHPCI/issues) titled "Intent to implement: <Your Feature>". Describe your idea in detail and discuss it with the community. It might be that someone already has a plan, could help you out, or your idea may simply not be suitable for the project at this time.
-2. Fork the PHPCI project on Github
-3. Add a feature or fix a bug - We recommend that you do this on a branch within your repository.
-4. Create a pull request containing just the one change you want to contribute back to PHPCI. If you have more than one feature or bug fix, please create separate branches within your repository, and then submit a separate pull request for each one. Your pull request should use the template detailed below.
-5. We'll then review your pull request and give any necessary feedback, this could be:
-    * Suggestions to improve your implementation
-    * Questions
-    * Issues/bugs related to the change
-    * Coding standards pointers
-6. Once everyone is happy with the submission, we'll merge it back into PHPCI. Your change will then be included in the next project release.
-
-### Not sure what to start with?
-We maintain two labels within our issue tracker that may be of interest to new contributors:
-
-* [The "Easy Fix" List](https://github.com/Block8/PHPCI/labels/flag:easy-fix)
-* [The "Priority" List](https://github.com/Block8/PHPCI/labels/flag:priority)
-
-### Coding Standards
-We require that all contributions meet at least the following guidelines:
-
-* PSR-1 & PSR-2 compliance for all code
-* Doc-blocks for all classes and methods
-* All files must contain the standard file-level docblock, including the copyright, license and link tags.
-
-All pull requests will be checked against these standards. If you're modifying a file as part of your change which does not comply with the above, please make the necessary changes to bring it into compliance prior to submitting the pull request.
-
-### Other Requirements
-When you're adding new features or functionality, or you're updating existing functionality, please ensure that the relevant documentation is also either created or updated on the Wiki.

.github/ISSUE_TEMPLATE.md

@@ -1,28 +0,0 @@
-Before submitting your issue, please make sure that you've checked all of the checkboxes below.
-
-- [ ] You're running the [latest release](https://github.com/Block8/PHPCI/releases/latest) version of PHPCI.
-- [ ] Ensure that you're running at least PHP 5.3.6, you can check this by running `php -v`
-- [ ] You've run `composer install --no-dev -o` from the root of your installation.
-- [ ] You have set up either the PHPCI [Worker](https://github.com/Block8/PHPCI/wiki/Run-Builds-Using-a-Worker), [Daemon](https://github.com/Block8/PHPCI/wiki/Run-Builds-Using-a-Daemon) or [Cron Job](https://github.com/Block8/PHPCI/wiki/Run-Builds-Using-Cron) to run builds.
-
-To help us better understand your issue, please answer the following.
-
-### Expected behaviour
-
-*Please describe what you're expecting to see happen.*
-
-### Actual behaviour
-
-*Please describe what you're actually seeing happen.*
-
-### Steps to reproduce
-
-*If your issue requires any specific steps to reproduce, please outline them here.*
-
-### Environment info
-Operating System:
-PHP Version:
-MySQL Version:
-
-### Logs or other output that would be helpful
-(If logs are large, please upload as attachment).

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +0,0 @@
-Contribution Type: bug fix | new plugin | new feature | refactor | cosmetic
-Link to Intent to Implement:
-Link to Bug:
-
-This pull request affects the following areas:
-
-* [ ] Front-End
-* [ ] Builder
-* [ ] Build Plugins
-
-**In raising this pull request, I confirm the following (please check boxes):**
-
-- [ ] I have read and understood the [contributing guidelines](/.github/CONTRIBUTING.md)?
-- [ ] I have checked that another pull request for this purpose does not exist.
-- [ ] I have considered, and confirmed that this submission will be valuable to others.
-- [ ] I have created or updated the relevant documentation for this change on the PHPCI Wiki.
-- [ ] Do the PHPCI tests pass?
-
-
-Detailed description of change:
-
-
-

.gitignore

@@ -15,5 +15,3 @@ PHPCI/Model/Migration.php
 PHPCI/Model/Base/MigrationBase.php
 PHPCI/Store/MigrationStore.php
 PHPCI/Store/Base/MigrationStoreBase.php
-local_vars.php
-Tests/PHPCI/config.yml

Dockerfile

@@ -15,7 +15,4 @@ RUN git config --global user.email "hello@php.ci"
 
 ADD ./ /phpci
 
-RUN php -r "readfile('https://getcomposer.org/installer');" | php
-RUN mv composer.phar /phpci/composer
-
 CMD /phpci/daemonise phpci:daemonise

LICENSE.md

@@ -6,4 +6,4 @@ Redistribution and use in source and binary forms, with or without modification,
 - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

PHPCI/Application.php

@@ -14,6 +14,7 @@ use b8\Exception\HttpException;
 use b8\Http\Response;
 use b8\Http\Response\RedirectResponse;
 use b8\View;
+use PHPCI\Model\Build;
 
 /**
 * PHPCI Front Controller
@@ -51,13 +52,13 @@ class Application extends b8\Application
             return false;
         };
 
-        $skipAuth = array($this, 'shouldSkipAuth');
+        $skipAuth = [$this, 'shouldSkipAuth'];
 
         // Handler for the route we're about to register, checks for a valid session where necessary:
         $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession, $skipAuth) {
             $skipValidation = in_array($route['controller'], array('session', 'webhook', 'build-status'));
 
-            if (!$skipValidation && !$validateSession() && (!is_callable($skipAuth) || !$skipAuth())) {
+            if (!$skipValidation && !$validateSession() && !$skipAuth()) {
                 if ($request->isAjax()) {
                     $response->setResponseCode(401);
                     $response->setContent('');
@@ -135,18 +136,9 @@ class Application extends b8\Application
      */
     protected function setLayoutVariables(View &$layout)
     {
-        $groups = array();
+        /** @var \PHPCI\Store\ProjectStore $projectStore */
-        $groupStore = b8\Store\Factory::getStore('ProjectGroup');
+        $projectStore = b8\Store\Factory::getStore('Project');
-        $groupList = $groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+        $layout->projects = $projectStore->getAll();
-
-        foreach ($groupList['items'] as $group) {
-            $thisGroup = array('title' => $group->getTitle());
-            $projects = b8\Store\Factory::getStore('Project')->getByGroupId($group->getId());
-            $thisGroup['projects'] = $projects['items'];
-            $groups[] = $thisGroup;
-        }
-
-        $layout->groups = $groups;
     }
 
     /**

PHPCI/BuildFactory.php

@@ -36,44 +36,35 @@ class BuildFactory
 
     /**
     * Takes a generic build and returns a type-specific build model.
-    * @param Build $build The build from which to get a more specific build type.
+    * @param Build $base The build from which to get a more specific build type.
     * @return Build
     */
-    public static function getBuild(Build $build)
+    public static function getBuild(Build $base)
     {
-        $project = $build->getProject();
+        switch($base->getProject()->getType())
-
+        {
-        if (!empty($project)) {
+            case 'remote':
-            switch ($project->getType()) {
+                $type = 'RemoteGitBuild';
-                case 'remote':
+                break;
-                    $type = 'RemoteGitBuild';
+            case 'local':
-                    break;
+                $type = 'LocalBuild';
-                case 'local':
+                break;
-                    $type = 'LocalBuild';
+            case 'github':
-                    break;
+                $type = 'GithubBuild';
-                case 'github':
+                break;
-                    $type = 'GithubBuild';
+            case 'bitbucket':
-                    break;
+                $type = 'BitbucketBuild';
-                case 'bitbucket':
+                break;
-                    $type = 'BitbucketBuild';
+            case 'gitlab':
-                    break;
+                $type = 'GitlabBuild';
-                case 'gitlab':
+                break;
-                    $type = 'GitlabBuild';
+            case 'hg':
-                    break;
+                $type = 'MercurialBuild';
-                case 'hg':
+                break;
-                    $type = 'MercurialBuild';
-                    break;
-                case 'svn':
-                    $type = 'SubversionBuild';
-                    break;
-                default:
-                    return $build;
-            }
-
-            $class = '\\PHPCI\\Model\\Build\\' . $type;
-            $build = new $class($build->getDataArray());
         }
 
-        return $build;
+        $type = '\\PHPCI\\Model\\Build\\' . $type;
+
+        return new $type($base->getDataArray());
     }
 }

PHPCI/Builder.php

@@ -188,14 +188,6 @@ class Builder implements LoggerAwareInterface
         $this->build->sendStatusPostback();
         $success = true;
 
-        $previous_build = $this->build->getProject()->getPreviousBuild($this->build->getBranch());
-
-        $previous_state = Build::STATUS_NEW;
-
-        if ($previous_build) {
-            $previous_state = $previous_build->getStatus();
-        }
-
         try {
             // Set up the build:
             $this->setupBuild();
@@ -213,41 +205,34 @@ 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');
-
-                if ($previous_state == Build::STATUS_FAILED) {
-                    $this->pluginExecutor->executePlugins($this->config, 'fixed');
-                }
-
                 $this->buildLogger->logSuccess(Lang::get('build_success'));
             } else {
                 $this->pluginExecutor->executePlugins($this->config, 'failure');
-
-                if ($previous_state == Build::STATUS_SUCCESS || $previous_state == Build::STATUS_NEW) {
-                    $this->pluginExecutor->executePlugins($this->config, 'broken');
-                }
-
                 $this->buildLogger->logFailure(Lang::get('build_failed'));
             }
+
+            // Clean up:
+            $this->buildLogger->log(Lang::get('removing_build'));
+
+            $cmd = 'rm -Rf "%s"';
+            if (IS_WIN) {
+                $cmd = 'rmdir /S /Q "%s"';
+            }
+            $this->executeCommand($cmd, $this->buildPath);
         } 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');
         }
 
 
         // Update the build in the database, ping any external services, etc.
         $this->build->sendStatusPostback();
         $this->build->setFinished(new \DateTime());
-
-        // Clean up:
-        $this->buildLogger->log(Lang::get('removing_build'));
-        $this->build->removeBuildDirectory();
-
         $this->store->save($this->build);
     }
 
@@ -278,14 +263,12 @@ class Builder implements LoggerAwareInterface
 
     /**
      * Find a binary required by a plugin.
-     * @param string $binary
+     * @param $binary
-     * @param bool $quiet
-     *
      * @return null|string
      */
-    public function findBinary($binary, $quiet = false)
+    public function findBinary($binary)
     {
-        return $this->commandExecutor->findBinary($binary, $quiet = false);
+        return $this->commandExecutor->findBinary($binary, $this->buildPath);
     }
 
     /**
@@ -304,7 +287,8 @@ class Builder implements LoggerAwareInterface
      */
     protected function setupBuild()
     {
-        $this->buildPath = $this->build->getBuildPath();
+        $this->buildPath = PHPCI_DIR . 'PHPCI/build/' . $this->build->getId() . '/';
+        $this->build->currentBuildPath = $this->buildPath;
 
         $this->interpolator->setupInterpolationVars(
             $this->build,
@@ -312,8 +296,6 @@ class Builder implements LoggerAwareInterface
             PHPCI_URL
         );
 
-        $this->commandExecutor->setBuildPath($this->buildPath);
-
         // Create a working copy of the project:
         if (!$this->build->createWorkingCopy($this, $this->buildPath)) {
             throw new \Exception(Lang::get('could_not_create_working'));

PHPCI/Command/CreateAdminCommand.php

@@ -9,36 +9,24 @@
 
 namespace PHPCI\Command;
 
-use PHPCI\Service\UserService;
 use PHPCI\Helper\Lang;
-use PHPCI\Store\UserStore;
+use PHPCI\Service\UserService;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use b8\Store\Factory;
+use PHPCI\Builder;
 
 /**
- * Create admin command - creates an admin user
+* Create admin command - creates an admin user
- * @author       Wogan May (@woganmay)
+* @author       Wogan May (@woganmay)
- * @package      PHPCI
+* @package      PHPCI
- * @subpackage   Console
+* @subpackage   Console
- */
+*/
 class CreateAdminCommand extends Command
 {
-    /**
-     * @var UserStore
-     */
-    protected $userStore;
-
-    /**
-     * @param UserStore $userStore
-     */
-    public function __construct(UserStore $userStore)
-    {
-        parent::__construct();
-
-        $this->userStore = $userStore;
-    }
-
     protected function configure()
     {
         $this
@@ -47,36 +35,92 @@ class CreateAdminCommand extends Command
     }
 
     /**
-     * Creates an admin user in the existing PHPCI database
+    * Creates an admin user in the existing PHPCI database
-     *
+    */
-     * {@inheritDoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $userService = new UserService($this->userStore);
+        $userStore = Factory::getStore('User');
+        $userService = new UserService($userStore);
 
-        /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+        require(PHPCI_DIR . 'bootstrap.php');
-        $dialog = $this->getHelperSet()->get('dialog');
 
-        // Function to validate mail address.
+        // Try to create a user account:
-        $mailValidator = function ($answer) {
+        $adminEmail = $this->ask(Lang::get('enter_email'), true, FILTER_VALIDATE_EMAIL);
-            if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) {
-                throw new \InvalidArgumentException(Lang::get('must_be_valid_email'));
-            }
 
-            return $answer;
+        if (empty($adminEmail)) {
-        };
+            return;
+        }
 
-        $adminEmail = $dialog->askAndValidate($output, Lang::get('enter_email'), $mailValidator, false);
+        $adminPass = $this->ask(Lang::get('enter_pass'));
-        $adminName = $dialog->ask($output, Lang::get('enter_name'));
+        $adminName = $this->ask(Lang::get('enter_name'));
-        $adminPass = $dialog->askHiddenResponse($output, Lang::get('enter_password'));
 
         try {
-            $userService->createUser($adminName, $adminEmail, $adminPass, true);
+            $userService->createUser($adminName, $adminEmail, $adminPass, 1);
-            $output->writeln(Lang::get('user_created'));
+            print Lang::get('user_created') . PHP_EOL;
-        } catch (\Exception $e) {
+        } catch (\Exception $ex) {
-            $output->writeln(sprintf('<error>%s</error>', Lang::get('failed_to_create')));
+            print Lang::get('failed_to_create') . PHP_EOL;
-            $output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
+            print $ex->getMessage();
+            print PHP_EOL;
         }
     }
+
+    protected function ask($question, $emptyOk = false, $validationFilter = null)
+    {
+        print $question . ' ';
+
+        $rtn    = '';
+        $stdin     = fopen('php://stdin', 'r');
+        $rtn = fgets($stdin);
+        fclose($stdin);
+
+        $rtn = trim($rtn);
+
+        if (!$emptyOk && empty($rtn)) {
+            $rtn = $this->ask($question, $emptyOk, $validationFilter);
+        } elseif ($validationFilter != null  && ! empty($rtn)) {
+            if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) {
+                print $statusMessage;
+                $rtn = $this->ask($question, $emptyOk, $validationFilter);
+            }
+        }
+
+        return $rtn;
+    }
+    protected function controlFormat($valueToInspect, $filter, &$statusMessage)
+    {
+        $filters = !(is_array($filter))? array($filter) : $filter;
+        $statusMessage = '';
+        $status = true;
+        $options = array();
+
+        foreach ($filters as $filter) {
+            if (! is_int($filter)) {
+                $regexp = $filter;
+                $filter = FILTER_VALIDATE_REGEXP;
+                $options = array(
+                    'options' => array(
+                        'regexp' => $regexp,
+                    )
+                );
+            }
+            if (! filter_var($valueToInspect, $filter, $options)) {
+                $status = false;
+
+                switch ($filter)
+                {
+                    case FILTER_VALIDATE_URL:
+                        $statusMessage = Lang::get('must_be_valid_url') . PHP_EOL;
+                        break;
+                    case FILTER_VALIDATE_EMAIL:
+                        $statusMessage = Lang::get('must_be_valid_email') . PHP_EOL;
+                        break;
+                    case FILTER_VALIDATE_REGEXP:
+                        $statusMessage = Lang::get('incorrect_format') . PHP_EOL;
+                        break;
+                }
+            }
+        }
+
+        return $status;
+    }
 }

PHPCI/Command/CreateBuildCommand.php

@@ -1,85 +0,0 @@
-<?php
-/**
- * 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;
-
-use PHPCI\Helper\Lang;
-use PHPCI\Service\BuildService;
-use PHPCI\Store\ProjectStore;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Create build command - creates a build for a project
- * @author       Jérémy DECOOL (@jdecool)
- * @package      PHPCI
- * @subpackage   Console
- */
-class CreateBuildCommand extends Command
-{
-    /**
-     * @var ProjectStore
-     */
-    protected $projectStore;
-
-    /**
-     * @var BuildService
-     */
-    protected $buildService;
-
-    /**
-     * @param ProjectStore $projectStore
-     */
-    public function __construct(ProjectStore $projectStore, BuildService $buildService)
-    {
-        parent::__construct();
-
-        $this->projectStore = $projectStore;
-        $this->buildService = $buildService;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function configure()
-    {
-        $this
-            ->setName('phpci:create-build')
-            ->setDescription(Lang::get('create_build_project'))
-            ->addArgument('projectId', InputArgument::REQUIRED, Lang::get('project_id_argument'))
-            ->addOption('commit', null, InputOption::VALUE_OPTIONAL, Lang::get('commit_id_option'))
-            ->addOption('branch', null, InputOption::VALUE_OPTIONAL, Lang::get('branch_name_option'));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $projectId = $input->getArgument('projectId');
-        $commitId = $input->getOption('commit');
-        $branch = $input->getOption('branch');
-
-        $project = $this->projectStore->getById($projectId);
-        if (empty($project)) {
-            throw new \InvalidArgumentException('Project does not exist: ' . $projectId);
-        }
-
-        try {
-            $this->buildService->createBuild($project, $commitId, $branch);
-            $output->writeln(Lang::get('build_created'));
-        } catch (\Exception $e) {
-            $output->writeln(sprintf('<error>%s</error>', Lang::get('failed')));
-            $output->writeln(sprintf('<error>%s</error>', $e->getMessage()));
-        }
-    }
-}

PHPCI/Command/DaemonCommand.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * PHPCI - Continuous Integration for PHP
  *
@@ -11,48 +10,33 @@
 namespace PHPCI\Command;
 
 use Monolog\Logger;
-use PHPCI\ProcessControl\Factory;
-use PHPCI\ProcessControl\ProcessControlInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use b8\Store\Factory;
+use PHPCI\Builder;
+use PHPCI\BuildFactory;
 
 /**
- * Daemon that loops and call the run-command.
+* Daemon that loops and call the run-command.
- * @author       Gabriel Baker <gabriel.baker@autonomicpilot.co.uk>
+* @author       Gabriel Baker <gabriel.baker@autonomicpilot.co.uk>
- * @package      PHPCI
+* @package      PHPCI
- * @subpackage   Console
+* @subpackage   Console
- */
+*/
 class DaemonCommand extends Command
 {
-
     /**
-     * @var Logger
+     * @var \Monolog\Logger
      */
     protected $logger;
 
-    /**
+    public function __construct(Logger $logger, $name = null)
-     * @var string
-     */
-    protected $pidFilePath;
-
-    /**
-     * @var string
-     */
-    protected $logFilePath;
-
-    /**
-     * @var ProcessControlInterface
-     */
-    protected $processControl;
-
-    public function __construct(Logger $logger, ProcessControlInterface $processControl = null, $name = null)
     {
         parent::__construct($name);
         $this->logger = $logger;
-        $this->processControl = $processControl ?: Factory::getInstance();
     }
 
     protected function configure()
@@ -61,30 +45,17 @@ class DaemonCommand extends Command
             ->setName('phpci:daemon')
             ->setDescription('Initiates the daemon to run commands.')
             ->addArgument(
-                'state', InputArgument::REQUIRED, 'start|stop|status'
+                'state',
-            )
+                InputArgument::REQUIRED,
-            ->addOption(
+                'start|stop|status'
-                'pid-file', 'p', InputOption::VALUE_REQUIRED,
+            );
-                'Path of the PID file',
-                implode(DIRECTORY_SEPARATOR,
-                    array(PHPCI_DIR, 'daemon', 'daemon.pid'))
-            )
-            ->addOption(
-                'log-file', 'l', InputOption::VALUE_REQUIRED,
-                'Path of the log file',
-                implode(DIRECTORY_SEPARATOR,
-                    array(PHPCI_DIR, 'daemon', 'daemon.log'))
-        );
     }
 
     /**
-     * Loops through running.
+    * Loops through running.
-     */
+    */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->pidFilePath = $input->getOption('pid-file');
-        $this->logFilePath = $input->getOption('log-file');
-
         $state = $input->getArgument('state');
 
         switch ($state) {
@@ -95,108 +66,64 @@ class DaemonCommand extends Command
                 $this->stopDaemon();
                 break;
             case 'status':
-                $this->statusDaemon($output);
+                $this->statusDaemon();
                 break;
             default:
-                $this->output->writeln("<error>Not a valid choice, please use start, stop or status</error>");
+                echo "Not a valid choice, please use start stop or status";
                 break;
         }
+
     }
 
     protected function startDaemon()
     {
-        $pid = $this->getRunningPid();
+
-        if ($pid) {
+        if (file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            $this->logger->notice("Daemon already started", array('pid' => $pid));
+            echo "Already started\n";
+            $this->logger->warning("Daemon already started");
             return "alreadystarted";
         }
 
-        $this->logger->info("Trying to start the daemon");
+        $logfile = PHPCI_DIR."/daemon/daemon.log";
-
         $cmd = "nohup %s/daemonise phpci:daemonise > %s 2>&1 &";
-        $command = sprintf($cmd, PHPCI_DIR, $this->logFilePath);
+        $command = sprintf($cmd, PHPCI_DIR, $logfile);
-        $output = $exitCode = null;
+        $this->logger->info("Daemon started");
-        exec($command, $output, $exitCode);
+        exec($command);
-
-        if ($exitCode !== 0) {
-            $this->logger->error(sprintf("daemonise exited with status %d", $exitCode));
-            return "notstarted";
-        }
-
-        for ($i = 0; !($pid = $this->getRunningPid()) && $i < 5; $i++) {
-            sleep(1);
-        }
-
-        if (!$pid) {
-            $this->logger->error("Could not start the daemon");
-            return "notstarted";
-        }
-
-        $this->logger->notice("Daemon started", array('pid' => $pid));
-        return "started";
     }
 
     protected function stopDaemon()
     {
-        $pid = $this->getRunningPid();
+
-        if (!$pid) {
+        if (!file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            $this->logger->notice("Cannot stop the daemon as it is not started");
+            echo "Not started\n";
+            $this->logger->warning("Can't stop daemon as not started");
             return "notstarted";
         }
 
-        $this->logger->info("Trying to terminate the daemon", array('pid' => $pid));
+        $cmd = "kill $(cat %s/daemon/daemon.pid)";
-        $this->processControl->kill($pid);
+        $command = sprintf($cmd, PHPCI_DIR);
-
+        exec($command);
-        for ($i = 0; ($pid = $this->getRunningPid()) && $i < 5; $i++) {
+        $this->logger->info("Daemon stopped");
-            sleep(1);
+        unlink(PHPCI_DIR.'/daemon/daemon.pid');
-        }
-
-        if ($pid) {
-            $this->logger->warning("The daemon is resiting, trying to kill it", array('pid' => $pid));
-            $this->processControl->kill($pid, true);
-
-            for ($i = 0; ($pid = $this->getRunningPid()) && $i < 5; $i++) {
-                sleep(1);
-            }
-        }
-
-        if (!$pid) {
-            $this->logger->notice("Daemon stopped");
-            return "stopped";
-        }
-
-        $this->logger->error("Could not stop the daemon");
     }
 
-    protected function statusDaemon(OutputInterface $output)
+    protected function statusDaemon()
     {
-        $pid = $this->getRunningPid();
+
-        if ($pid) {
+        if (!file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            $output->writeln(sprintf('The daemon is running, PID: %d', $pid));
+            echo "Not running\n";
+            return "notrunning";
+        }
+
+        $pid = trim(file_get_contents(PHPCI_DIR.'/daemon/daemon.pid'));
+        $pidcheck = sprintf("/proc/%s", $pid);
+        if (is_dir($pidcheck)) {
+            echo "Running\n";
             return "running";
         }
 
-        $output->writeln('The daemon is not running');
+        unlink(PHPCI_DIR.'/daemon/daemon.pid');
+        echo "Not running\n";
         return "notrunning";
     }
-
-    /** Check if there is a running daemon
-     *
-     * @return int|null
-     */
-    protected function getRunningPid()
-    {
-        if (!file_exists($this->pidFilePath)) {
-            return;
-        }
-
-        $pid = intval(trim(file_get_contents($this->pidFilePath)));
-
-        if($this->processControl->isRunning($pid, true)) {
-            return $pid;
-        }
-
-        // Not found, remove the stale PID file
-        unlink($this->pidFilePath);
-    }
 }

PHPCI/Command/DaemoniseCommand.php

@@ -12,7 +12,9 @@ namespace PHPCI\Command;
 use Monolog\Logger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -74,7 +76,7 @@ class DaemoniseCommand extends Command
         $this->sleep = 0;
         $runner      = new RunCommand($this->logger);
         $runner->setMaxBuilds(1);
-        $runner->setDaemon(true);
+        $runner->setIsDaemon(true);
 
         $emptyInput = new ArgvInput(array());
 
@@ -85,8 +87,7 @@ class DaemoniseCommand extends Command
             try {
                 $buildCount = $runner->run($emptyInput, $output);
             } catch (\Exception $e) {
-                $output->writeln('<error>Exception: ' . $e->getMessage() . '</error>');
+                var_dump($e);
-                $output->writeln('<error>Line: ' . $e->getLine() . ' - File: ' . $e->getFile() . '</error>');
             }
 
             if (0 == $buildCount && $this->sleep < 15) {

PHPCI/Command/GenerateCommand.php

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

PHPCI/Command/InstallCommand.php

@@ -13,15 +13,16 @@ use Exception;
 use PDO;
 
 use b8\Config;
+use b8\Database;
 use b8\Store\Factory;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\DialogHelper;
 use PHPCI\Service\UserService;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 /**
  * Install console command - Installs PHPCI.
@@ -48,9 +49,6 @@ class InstallCommand extends Command
             ->addOption('admin-pass', null, InputOption::VALUE_OPTIONAL, Lang::get('admin_pass'))
             ->addOption('admin-mail', null, InputOption::VALUE_OPTIONAL, Lang::get('admin_email'))
             ->addOption('config-path', null, InputOption::VALUE_OPTIONAL, Lang::get('config_path'), $defaultPath)
-            ->addOption('queue-disabled', null, InputOption::VALUE_NONE, 'Don\'t ask for queue details')
-            ->addOption('queue-server', null, InputOption::VALUE_OPTIONAL, 'Beanstalkd queue server hostname')
-            ->addOption('queue-name', null, InputOption::VALUE_OPTIONAL, 'Beanstalkd queue name')
             ->setDescription(Lang::get('install_phpci'));
     }
 
@@ -61,9 +59,7 @@ class InstallCommand extends Command
     {
         $this->configFilePath = $input->getOption('config-path');
 
-        if (!$this->verifyNotInstalled($output)) {
+        $this->verifyNotInstalled($output);
-            return;
-        }
 
         $output->writeln('');
         $output->writeln('<info>******************</info>');
@@ -100,7 +96,7 @@ class InstallCommand extends Command
 
         $this->writeConfigFile($conf);
         $this->setupDatabase($output);
-        $admin = $this->getAdminInformation($input, $output);
+        $admin = $this->getAdminInforamtion($input, $output);
         $this->createAdminUser($admin, $output);
     }
 
@@ -165,7 +161,7 @@ class InstallCommand extends Command
      * @param OutputInterface $output
      * @return array
      */
-    protected function getAdminInformation(InputInterface $input, OutputInterface $output)
+    protected function getAdminInforamtion(InputInterface $input, OutputInterface $output)
     {
         $admin = array();
 
@@ -177,7 +173,7 @@ class InstallCommand extends Command
         // Function to validate mail address.
         $mailValidator = function ($answer) {
             if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) {
-                throw new \InvalidArgumentException(Lang::get('must_be_valid_email'));
+                throw new Exception(Lang::get('must_be_valid_email'));
             }
 
             return $answer;
@@ -234,45 +230,10 @@ class InstallCommand extends Command
         }
 
         $phpci['url'] = $url;
-        $phpci['worker'] = $this->getQueueInformation($input, $output, $dialog);
 
         return $phpci;
     }
 
-    /**
-     * If the user wants to use a queue, get the necessary details.
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param DialogHelper $dialog
-     * @return array
-     */
-    protected function getQueueInformation(InputInterface $input, OutputInterface $output, DialogHelper $dialog)
-    {
-        if ($input->getOption('queue-disabled')) {
-            return null;
-        }
-
-        $rtn = [];
-
-        $helper = $this->getHelper('question');
-        $question = new ConfirmationQuestion('Use beanstalkd to manage build queue? ', true);
-
-        if (!$helper->ask($input, $output, $question)) {
-            $output->writeln('<error>Skipping beanstalkd configuration.</error>');
-            return null;
-        }
-
-        if (!$rtn['host'] = $input->getOption('queue-server')) {
-            $rtn['host'] = $dialog->ask($output, 'Enter your beanstalkd hostname [localhost]: ', 'localhost');
-        }
-
-        if (!$rtn['queue'] = $input->getOption('queue-name')) {
-            $rtn['queue'] = $dialog->ask($output, 'Enter the queue (tube) name to use [phpci]: ', 'phpci');
-        }
-
-        return $rtn;
-    }
-
     /**
      * Load configuration for DB form CLI options or ask info to user.
      *
@@ -335,8 +296,6 @@ class InstallCommand extends Command
                 )
             );
 
-            unset($pdo);
-
             return true;
 
         } catch (Exception $ex) {
@@ -363,9 +322,7 @@ class InstallCommand extends Command
     {
         $output->write(Lang::get('setting_up_db'));
 
-        $phinxBinary = escapeshellarg(PHPCI_DIR . 'vendor/bin/phinx');
+        shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'phinx.php"');
-        $phinxScript = escapeshellarg(PHPCI_DIR . 'phinx.php');
-        shell_exec($phinxBinary . ' migrate -c ' . $phinxScript);
 
         $output->writeln('<info>'.Lang::get('ok').'</info>');
     }
@@ -389,6 +346,7 @@ class InstallCommand extends Command
         } catch (\Exception $ex) {
             $output->writeln('<error>'.Lang::get('failed_to_create').'</error>');
             $output->writeln('<error>' . $ex->getMessage() . '</error>');
+            die;
         }
     }
 
@@ -403,7 +361,6 @@ class InstallCommand extends Command
 
     /**
      * @param OutputInterface $output
-     * @return bool
      */
     protected function verifyNotInstalled(OutputInterface $output)
     {
@@ -413,10 +370,8 @@ class InstallCommand extends Command
             if (!empty($content)) {
                 $output->writeln('<error>'.Lang::get('config_exists').'</error>');
                 $output->writeln('<error>'.Lang::get('update_instead').'</error>');
-                return false;
+                die;
             }
         }
-
-        return true;
     }
 }

PHPCI/Command/PollCommand.php

@@ -14,7 +14,9 @@ use b8\HttpClient;
 use Monolog\Logger;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Parser;
 use PHPCI\Model\Build;
@@ -58,7 +60,7 @@ class PollCommand extends Command
 
         if (!$token) {
             $this->logger->error(Lang::get('no_token'));
-            return;
+            exit();
         }
 
         $buildStore = Factory::getStore('Build');

PHPCI/Command/RebuildCommand.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * 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;
-
-use b8\Store\Factory;
-use Monolog\Logger;
-use PHPCI\Service\BuildService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
-* Re-runs the last run build.
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Console
-*/
-class RebuildCommand extends Command
-{
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
-    /**
-     * @var OutputInterface
-     */
-    protected $output;
-
-    /**
-     * @var boolean
-     */
-    protected $run;
-
-    /**
-     * @var int
-     */
-    protected $sleep;
-
-    /**
-     * @param \Monolog\Logger $logger
-     * @param string $name
-     */
-    public function __construct(Logger $logger, $name = null)
-    {
-        parent::__construct($name);
-        $this->logger = $logger;
-    }
-
-    protected function configure()
-    {
-        $this
-            ->setName('phpci:rebuild')
-            ->setDescription('Re-runs the last run build.');
-    }
-
-    /**
-    * Loops through running.
-    */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $runner = new RunCommand($this->logger);
-        $runner->setMaxBuilds(1);
-        $runner->setDaemon(false);
-
-        /** @var \PHPCI\Store\BuildStore $store */
-        $store = Factory::getStore('Build');
-        $service = new BuildService($store);
-
-        $builds = $store->getLatestBuilds(null, 1);
-        $lastBuild = array_shift($builds);
-        $service->createDuplicateBuild($lastBuild);
-
-        $runner->run(new ArgvInput(array()), $output);
-    }
-
-    /**
-    * Called when log entries are made in Builder / the plugins.
-    * @see \PHPCI\Builder::log()
-    */
-    public function logCallback($log)
-    {
-        $this->output->writeln($log);
-    }
-}

PHPCI/Command/RebuildQueueCommand.php

@@ -1,85 +0,0 @@
-<?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-namespace PHPCI\Command;
-
-use b8\Config;
-use b8\Store\Factory;
-use Monolog\Logger;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\Lang;
-use PHPCI\Logging\OutputLogHandler;
-use PHPCI\Service\BuildService;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-
-/**
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Console
-*/
-class RebuildQueueCommand extends Command
-{
-    /**
-     * @var OutputInterface
-     */
-    protected $output;
-
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
-    /**
-     * @param \Monolog\Logger $logger
-     * @param string $name
-     */
-    public function __construct(Logger $logger, $name = null)
-    {
-        parent::__construct($name);
-        $this->logger = $logger;
-    }
-
-    protected function configure()
-    {
-        $this
-            ->setName('phpci:rebuild-queue')
-            ->setDescription('Rebuilds the PHPCI worker queue.');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->output = $output;
-
-        // For verbose mode we want to output all informational and above
-        // messages to the symphony output interface.
-        if ($input->hasOption('verbose') && $input->getOption('verbose')) {
-            $this->logger->pushHandler(
-                new OutputLogHandler($this->output, Logger::INFO)
-            );
-        }
-
-        $store = Factory::getStore('Build');
-        $result = $store->getByStatus(0);
-
-        $this->logger->addInfo(Lang::get('found_n_builds', count($result['items'])));
-
-        $buildService = new BuildService($store);
-
-        while (count($result['items'])) {
-            $build = array_shift($result['items']);
-            $build = BuildFactory::getBuild($build);
-
-            $this->logger->addInfo('Added build #' . $build->getId() . ' to queue.');
-            $buildService->addBuildToQueue($build);
-        }
-    }
-}

PHPCI/Command/RunCommand.php

@@ -15,8 +15,11 @@ use PHPCI\Helper\Lang;
 use PHPCI\Logging\BuildDBLogHandler;
 use PHPCI\Logging\LoggedBuildContextTidier;
 use PHPCI\Logging\OutputLogHandler;
+use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use b8\Store\Factory;
 use PHPCI\Builder;
@@ -44,7 +47,7 @@ class RunCommand extends Command
     /**
      * @var int
      */
-    protected $maxBuilds = 100;
+    protected $maxBuilds = null;
 
     /**
      * @var bool
@@ -140,7 +143,7 @@ class RunCommand extends Command
         $this->maxBuilds = (int)$numBuilds;
     }
 
-    public function setDaemon($fromDaemon)
+    public function setIsDaemon($fromDaemon)
     {
         $this->isFromDaemon = (bool)$fromDaemon;
     }
@@ -166,7 +169,7 @@ class RunCommand extends Command
                 $build->setStatus(Build::STATUS_FAILED);
                 $build->setFinished(new \DateTime());
                 $store->save($build);
-                $build->removeBuildDirectory();
+                $this->removeBuildDirectory($build);
                 continue;
             }
 
@@ -175,4 +178,19 @@ class RunCommand extends Command
 
         return $rtn;
     }
+
+    protected function removeBuildDirectory($build)
+    {
+        $buildPath = PHPCI_DIR . 'PHPCI/build/' . $build->getId() . '/';
+
+        if (is_dir($buildPath)) {
+            $cmd = 'rm -Rf "%s"';
+
+            if (IS_WIN) {
+                $cmd = 'rmdir /S /Q "%s"';
+            }
+
+            shell_exec($cmd);
+        }
+    }
 }

PHPCI/Command/UpdateCommand.php

@@ -9,11 +9,13 @@
 
 namespace PHPCI\Command;
 
-use b8\Config;
 use Monolog\Logger;
 use PHPCI\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -47,9 +49,7 @@ class UpdateCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        if (!$this->verifyInstalled($output)) {
+        $this->verifyInstalled($output);
-            return;
-        }
 
         $output->write(Lang::get('updating_phpci'));
 
@@ -60,9 +60,17 @@ class UpdateCommand extends Command
 
     protected function verifyInstalled(OutputInterface $output)
     {
-        $config = Config::getInstance();
+        if (!file_exists(PHPCI_DIR . 'PHPCI/config.yml')) {
-        $phpciUrl = $config->get('phpci.url');
+            $output->writeln('<error>'.Lang::get('not_installed').'</error>');
+            $output->writeln('<error>'.Lang::get('install_instead').'</error>');
+            die;
+        }
 
-        return !empty($phpciUrl);
+        $content = file_get_contents(PHPCI_DIR . 'PHPCI/config.yml');
+        if (empty($content)) {
+            $output->writeln('<error>'.Lang::get('not_installed').'</error>');
+            $output->writeln('<error>'.Lang::get('install_instead').'</error>');
+            die;
+        }
     }
 }

PHPCI/Command/WorkerCommand.php

@@ -1,87 +0,0 @@
-<?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-namespace PHPCI\Command;
-
-use b8\Config;
-use Monolog\Logger;
-use PHPCI\Logging\OutputLogHandler;
-use PHPCI\Worker\BuildWorker;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-
-/**
-* Worker Command - Starts the BuildWorker, which pulls jobs from beanstalkd
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Console
-*/
-class WorkerCommand extends Command
-{
-    /**
-     * @var OutputInterface
-     */
-    protected $output;
-
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
-    /**
-     * @param \Monolog\Logger $logger
-     * @param string $name
-     */
-    public function __construct(Logger $logger, $name = null)
-    {
-        parent::__construct($name);
-        $this->logger = $logger;
-    }
-
-    protected function configure()
-    {
-        $this
-            ->setName('phpci:worker')
-            ->setDescription('Runs the PHPCI build worker.')
-            ->addOption('debug', null, null, 'Run PHPCI in Debug Mode');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->output = $output;
-
-        // For verbose mode we want to output all informational and above
-        // messages to the symphony output interface.
-        if ($input->hasOption('verbose') && $input->getOption('verbose')) {
-            $this->logger->pushHandler(
-                new OutputLogHandler($this->output, Logger::INFO)
-            );
-        }
-
-        // Allow PHPCI to run in "debug mode"
-        if ($input->hasOption('debug') && $input->getOption('debug')) {
-            $output->writeln('<comment>Debug mode enabled.</comment>');
-            define('PHPCI_DEBUG_MODE', true);
-        }
-
-        $config = Config::getInstance()->get('phpci.worker', []);
-
-        if (empty($config['host']) || empty($config['queue'])) {
-            $error = 'The worker is not configured. You must set a host and queue in your config.yml file.';
-            throw new \Exception($error);
-        }
-
-        $worker = new BuildWorker($config['host'], $config['queue']);
-        $worker->setLogger($this->logger);
-        $worker->setMaxJobs(Config::getInstance()->get('phpci.worker.max_jobs', -1));
-        $worker->startWorker();
-    }
-}

PHPCI/Controller.php

@@ -10,7 +10,6 @@
 namespace PHPCI;
 
 use b8\Config;
-use b8\Exception\HttpException\ForbiddenException;
 use b8\Http\Request;
 use b8\Http\Response;
 use b8\View;
@@ -92,10 +91,6 @@ class Controller extends \b8\Controller
         $this->setView($action);
         $response = parent::handleAction($action, $actionParams);
 
-        if ($response instanceof Response) {
-            return $response;
-        }
-
         if (is_string($response)) {
             $this->controllerView->content = $response;
         } elseif (isset($this->view)) {

PHPCI/Controller/BuildController.php

@@ -11,9 +11,7 @@ namespace PHPCI\Controller;
 
 use b8;
 use b8\Exception\HttpException\NotFoundException;
-use b8\Http\Response\JsonResponse;
 use PHPCI\BuildFactory;
-use PHPCI\Helper\AnsiConverter;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 use PHPCI\Model\Project;
@@ -68,37 +66,19 @@ class BuildController extends \PHPCI\Controller
         $this->layout->title = Lang::get('build_n', $buildId);
         $this->layout->subtitle = $build->getProjectTitle();
 
-        switch ($build->getStatus()) {
+        $nav = array(
-            case 0:
+            'title' => Lang::get('build_n', $buildId),
-                $this->layout->skin = 'blue';
+            'icon' => 'cog',
-                break;
+            'links' => array(
-
+                'build/rebuild/' . $build->getId() => Lang::get('rebuild_now'),
-            case 1:
+            ),
-                $this->layout->skin = 'yellow';
+        );
-                break;
-
-            case 2:
-                $this->layout->skin = 'green';
-                break;
-
-            case 3:
-                $this->layout->skin = 'red';
-                break;
-        }
-
-        $rebuild = Lang::get('rebuild_now');
-        $rebuildLink = PHPCI_URL . 'build/rebuild/' . $build->getId();
-
-        $delete = Lang::get('delete_build');
-        $deleteLink = PHPCI_URL . 'build/delete/' . $build->getId();
-
-        $actions = "<a class=\"btn btn-default\" href=\"{$rebuildLink}\">{$rebuild}</a> ";
 
         if ($this->currentUserIsAdmin()) {
-            $actions .= " <a class=\"btn btn-danger\" href=\"{$deleteLink}\">{$delete}</a>";
+            $nav['links']['build/delete/' . $build->getId()] = Lang::get('delete_build');
         }
 
-        $this->layout->actions = $actions;
+        $this->layout->nav = $nav;
     }
 
     /**
@@ -127,17 +107,7 @@ class BuildController extends \PHPCI\Controller
     */
     public function data($buildId)
     {
-        $response = new JsonResponse();
+        die($this->getBuildData(BuildFactory::getBuildById($buildId)));
-        $build = BuildFactory::getBuildById($buildId);
-
-        if (!$build) {
-            $response->setResponseCode(404);
-            $response->setContent(array());
-            return $response;
-        }
-
-        $response->setContent($this->getBuildData($build));
-        return $response;
     }
 
     /**
@@ -154,15 +124,13 @@ class BuildController extends \PHPCI\Controller
             $data = $this->buildStore->getMeta($key, $build->getProjectId(), $buildId, $build->getBranch(), $numBuilds);
         }
 
-        $response = new JsonResponse();
+        die(json_encode($data));
-        $response->setContent($data);
-        return $response;
     }
 
     /**
     * Get build data from database and json encode it:
     */
-    protected function getBuildData(Build $build)
+    protected function getBuildData($build)
     {
         $data               = array();
         $data['status']     = (int)$build->getStatus();
@@ -170,21 +138,8 @@ class BuildController extends \PHPCI\Controller
         $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;
-        $data['duration']   = $build->getDuration();
 
-        /** @var \PHPCI\Store\BuildErrorStore $errorStore */
+        return json_encode($data);
-        $errorStore = b8\Store\Factory::getStore('BuildError');
-        $errors = $errorStore->getErrorsForBuild($build->getId(), $this->getParam('since', null));
-
-        $errorView = new b8\View('Build/errors');
-        $errorView->build = $build;
-        $errorView->errors = $errors;
-
-        $data['errors']     = $errorStore->getErrorTotalForBuild($build->getId());
-        $data['error_html'] = $errorView->render();
-        $data['since'] = (new \DateTime())->format('Y-m-d H:i:s');
-
-        return $data;
     }
 
     /**
@@ -200,13 +155,8 @@ class BuildController extends \PHPCI\Controller
 
         $build = $this->buildService->createDuplicateBuild($copy);
 
-        if ($this->buildService->queueError) {
+        header('Location: '.PHPCI_URL.'build/view/' . $build->getId());
-            $_SESSION['global_error'] = Lang::get('add_to_queue_failed');
+        exit;
-        }
-
-        $response = new b8\Http\Response\RedirectResponse();
-        $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
-        return $response;
     }
 
     /**
@@ -224,9 +174,8 @@ class BuildController extends \PHPCI\Controller
 
         $this->buildService->deleteBuild($build);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL.'project/view/' . $build->getProjectId());
-        $response->setHeader('Location', PHPCI_URL.'project/view/' . $build->getProjectId());
+        exit;
-        return $response;
     }
 
     /**
@@ -234,7 +183,11 @@ class BuildController extends \PHPCI\Controller
     */
     protected function cleanLog($log)
     {
-        return AnsiConverter::convert($log);
+        $log = str_replace('[0;32m', '<span style="color: green">', $log);
+        $log = str_replace('[0;31m', '<span style="color: red">', $log);
+        $log = str_replace('[0m', '</span>', $log);
+
+        return $log;
     }
 
     /**
@@ -247,9 +200,9 @@ class BuildController extends \PHPCI\Controller
             'running' => $this->formatBuilds($this->buildStore->getByStatus(Build::STATUS_RUNNING)),
         );
 
-        $response = new JsonResponse();
+        if ($this->request->isAjax()) {
-        $response->setContent($rtn);
+            die(json_encode($rtn));
-        return $response;
+        }
     }
 
     /**

PHPCI/Controller/BuildStatusController.php

@@ -15,7 +15,6 @@ use b8\Store;
 use PHPCI\BuildFactory;
 use PHPCI\Model\Project;
 use PHPCI\Model\Build;
-use PHPCI\Service\BuildStatusService;
 
 /**
 * Build Status Controller - Allows external access to build status information / images.
@@ -25,9 +24,10 @@ use PHPCI\Service\BuildStatusService;
 */
 class BuildStatusController extends \PHPCI\Controller
 {
-    /* @var \PHPCI\Store\ProjectStore */
+    /**
+     * @var \PHPCI\Store\ProjectStore
+     */
     protected $projectStore;
-    /* @var \PHPCI\Store\BuildStore */
     protected $buildStore;
 
     /**
@@ -53,7 +53,7 @@ class BuildStatusController extends \PHPCI\Controller
             $status = 'passing';
 
             if (!$project->getAllowPublicStatus()) {
-                return null;
+                die();
             }
 
             if (isset($project) && $project instanceof Project) {
@@ -70,90 +70,16 @@ class BuildStatusController extends \PHPCI\Controller
         return $status;
     }
 
-    /**
-     * Displays projects information in ccmenu format
-     *
-     * @param $projectId
-     * @return bool
-     * @throws \Exception
-     * @throws b8\Exception\HttpException
-     */
-    public function ccxml($projectId)
-    {
-        /* @var Project $project */
-        $project = $this->projectStore->getById($projectId);
-        $xml = new \SimpleXMLElement('<Projects/>');
-
-        if (!$project instanceof Project || !$project->getAllowPublicStatus()) {
-            return $this->renderXml($xml);
-        }
-
-        try {
-            $branchList = $this->buildStore->getBuildBranches($projectId);
-
-            if (!$branchList) {
-                $branchList = array($project->getBranch());
-            }
-
-            foreach ($branchList as $branch) {
-                $buildStatusService = new BuildStatusService($branch, $project, $project->getLatestBuild($branch));
-                if ($attributes = $buildStatusService->toArray()) {
-                    $projectXml = $xml->addChild('Project');
-                    foreach ($attributes as $attributeKey => $attributeValue) {
-                        $projectXml->addAttribute($attributeKey, $attributeValue);
-                    }
-                }
-            }
-        } catch (\Exception $e) {
-            $xml = new \SimpleXMLElement('<projects/>');
-        }
-
-        return $this->renderXml($xml);
-    }
-
-    /**
-     * @param \SimpleXMLElement $xml
-     * @return bool
-     */
-    protected function renderXml(\SimpleXMLElement $xml = null)
-    {
-        $this->response->setHeader('Content-Type', 'text/xml');
-        $this->response->setContent($xml->asXML());
-        $this->response->flush();
-        echo $xml->asXML();
-
-        return true;
-    }
-
     /**
     * Returns the appropriate build status image in SVG format for a given project.
     */
     public function image($projectId)
     {
-        $style = $this->getParam('style', 'plastic');
-        $label = $this->getParam('label', 'build');
-
         $status = $this->getStatus($projectId);
-
-        if (is_null($status)) {
-            $response = new b8\Http\Response\RedirectResponse();
-            $response->setHeader('Location', '/');
-            return $response;
-        }
-
         $color = ($status == 'passing') ? 'green' : 'red';
-        $image = file_get_contents(sprintf(
+        
-            'http://img.shields.io/badge/%s-%s-%s.svg?style=%s',
+        header('Content-Type: image/svg+xml');
-            $label,
+        die(file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg'));
-            $status,
-            $color,
-            $style
-        ));
-
-        $this->response->disableLayout();
-        $this->response->setHeader('Content-Type', 'image/svg+xml');
-        $this->response->setContent($image);
-        return $this->response;
     }
 
     /**

PHPCI/Controller/GroupController.php

@@ -1,120 +0,0 @@
-<?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-namespace PHPCI\Controller;
-
-use b8;
-use b8\Form;
-use b8\Store;
-use PHPCI\Controller;
-use PHPCI\Model\ProjectGroup;
-
-/**
- * Project Controller - Allows users to create, edit and view projects.
- * @author       Dan Cryer <dan@block8.co.uk>
- * @package      PHPCI
- * @subpackage   Web
- */
-class GroupController extends Controller
-{
-    /**
-     * @var \PHPCI\Store\ProjectGroupStore
-     */
-    protected $groupStore;
-
-    /**
-     * Set up this controller.
-     */
-    public function init()
-    {
-        $this->groupStore = b8\Store\Factory::getStore('ProjectGroup');
-    }
-
-    /**
-     * List project groups.
-     */
-    public function index()
-    {
-        $this->requireAdmin();
-
-        $groups = array();
-        $groupList = $this->groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
-
-        foreach ($groupList['items'] as $group) {
-            $thisGroup = array(
-                'title' => $group->getTitle(),
-                'id' => $group->getId(),
-            );
-            $projects = b8\Store\Factory::getStore('Project')->getByGroupId($group->getId());
-            $thisGroup['projects'] = $projects['items'];
-            $groups[] = $thisGroup;
-        }
-
-        $this->view->groups = $groups;
-    }
-
-    /**
-     * Add or edit a project group.
-     * @param null $groupId
-     * @return void|b8\Http\Response\RedirectResponse
-     */
-    public function edit($groupId = null)
-    {
-        $this->requireAdmin();
-
-        if (!is_null($groupId)) {
-            $group = $this->groupStore->getById($groupId);
-        } else {
-            $group = new ProjectGroup();
-        }
-
-        if ($this->request->getMethod() == 'POST') {
-            $group->setTitle($this->getParam('title'));
-            $this->groupStore->save($group);
-
-            $response = new b8\Http\Response\RedirectResponse();
-            $response->setHeader('Location', PHPCI_URL.'group');
-            return $response;
-        }
-
-        $form = new Form();
-        $form->setMethod('POST');
-        $form->setAction(PHPCI_URL . 'group/edit' . (!is_null($groupId) ? '/' . $groupId : ''));
-
-        $title = new Form\Element\Text('title');
-        $title->setContainerClass('form-group');
-        $title->setClass('form-control');
-        $title->setLabel('Group Title');
-        $title->setValue($group->getTitle());
-
-        $submit = new Form\Element\Submit();
-        $submit->setValue('Save Group');
-
-        $form->addField($title);
-        $form->addField($submit);
-
-        $this->view->form = $form;
-    }
-
-    /**
-     * Delete a project group.
-     * @param $groupId
-     * @return b8\Http\Response\RedirectResponse
-     */
-    public function delete($groupId)
-    {
-        $this->requireAdmin();
-        $group = $this->groupStore->getById($groupId);
-
-        $this->groupStore->delete($group);
-        $response = new b8\Http\Response\RedirectResponse();
-        $response->setHeader('Location', PHPCI_URL.'group');
-        return $response;
-    }
-}

PHPCI/Controller/HomeController.php

@@ -23,20 +23,15 @@ use PHPCI\Model\Build;
 class HomeController extends \PHPCI\Controller
 {
     /**
-     * @var \PHPCI\Store\BuildStore
+     * @var \b8\Store\BuildStore
      */
     protected $buildStore;
 
     /**
-     * @var \PHPCI\Store\ProjectStore
+     * @var \b8\Store\ProjectStore
      */
     protected $projectStore;
 
-    /**
-     * @var \PHPCI\Store\ProjectGroupStore
-     */
-    protected $groupStore;
-
     /**
      * Initialise the controller, set up stores and services.
      */
@@ -44,7 +39,6 @@ class HomeController extends \PHPCI\Controller
     {
         $this->buildStore      = b8\Store\Factory::getStore('Build');
         $this->projectStore    = b8\Store\Factory::getStore('Project');
-        $this->groupStore    = b8\Store\Factory::getStore('ProjectGroup');
     }
 
     /**
@@ -53,6 +47,9 @@ class HomeController extends \PHPCI\Controller
     public function index()
     {
         $this->layout->title = Lang::get('dashboard');
+
+        $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC'));
+
         $builds = $this->buildStore->getLatestBuilds(null, 10);
 
         foreach ($builds as &$build) {
@@ -60,7 +57,8 @@ class HomeController extends \PHPCI\Controller
         }
 
         $this->view->builds   = $builds;
-        $this->view->groups = $this->getGroupInfo();
+        $this->view->projects = $projects['items'];
+        $this->view->summary  = $this->getSummaryHtml($projects);
 
         return $this->view->render();
     }
@@ -70,9 +68,7 @@ class HomeController extends \PHPCI\Controller
     */
     public function latest()
     {
-        $this->response->disableLayout();
+        die($this->getLatestBuildsHtml());
-        $this->response->setContent($this->getLatestBuildsHtml());
-        return $this->response;
     }
 
     /**
@@ -80,10 +76,8 @@ class HomeController extends \PHPCI\Controller
      */
     public function summary()
     {
-        $this->response->disableLayout();
         $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC'));
-        $this->response->setContent($this->getSummaryHtml($projects));
+        die($this->getSummaryHtml($projects));
-        return $this->response;
     }
 
     /**
@@ -94,22 +88,12 @@ class HomeController extends \PHPCI\Controller
     protected function getSummaryHtml($projects)
     {
         $summaryBuilds = array();
-        $successes     = array();
+        $successes = array();
-        $failures      = array();
+        $failures = array();
-        $counts        = array();
 
-        foreach ($projects as $project) {
+        foreach ($projects['items'] as $project) {
             $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId());
 
-            $count = $this->buildStore->getWhere(
-                array('project_id' => $project->getId()),
-                1,
-                0,
-                array(),
-                array('id' => 'DESC')
-            );
-            $counts[$project->getId()] = $count['count'];
-
             $success = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_SUCCESS);
             $failure = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_FAILED);
 
@@ -118,11 +102,10 @@ class HomeController extends \PHPCI\Controller
         }
 
         $summaryView = new b8\View('SummaryTable');
-        $summaryView->projects   = $projects;
+        $summaryView->projects = $projects['items'];
-        $summaryView->builds     = $summaryBuilds;
+        $summaryView->builds = $summaryBuilds;
         $summaryView->successful = $successes;
-        $summaryView->failed     = $failures;
+        $summaryView->failed = $failures;
-        $summaryView->counts     = $counts;
 
         return $summaryView->render();
     }
@@ -143,24 +126,4 @@ class HomeController extends \PHPCI\Controller
 
         return $view->render();
     }
-
-    /**
-     * Get a summary of the project groups we have, and what projects they have in them.
-     * @return array
-     */
-    protected function getGroupInfo()
-    {
-        $rtn = array();
-        $groups = $this->groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
-
-        foreach ($groups['items'] as $group) {
-            $thisGroup = array('title' => $group->getTitle());
-            $projects = $this->projectStore->getByGroupId($group->getId());
-            $thisGroup['projects'] = $projects['items'];
-            $thisGroup['summary'] = $this->getSummaryHtml($thisGroup['projects']);
-            $rtn[] = $thisGroup;
-        }
-
-        return $rtn;
-    }
 }

PHPCI/Controller/PluginController.php

@@ -11,6 +11,7 @@ namespace PHPCI\Controller;
 
 use b8;
 use PHPCI\Helper\Lang;
+use PHPCI\Model\Build;
 use PHPCI\Plugin\Util\ComposerPluginInformation;
 use PHPCI\Plugin\Util\FilesPluginInformation;
 use PHPCI\Plugin\Util\PluginInformationCollection;
@@ -23,6 +24,24 @@ use PHPCI\Plugin\Util\PluginInformationCollection;
  */
 class PluginController extends \PHPCI\Controller
 {
+    protected $required = array(
+        'php',
+        'ext-pdo',
+        'ext-pdo_mysql',
+        'block8/b8framework',
+        'ircmaxell/password-compat',
+        'swiftmailer/swiftmailer',
+        'symfony/yaml',
+        'symfony/console',
+        'psr/log',
+        'monolog/monolog',
+        'pimple/pimple',
+        'robmorgan/phinx',
+    );
+
+    protected $canInstall;
+    protected $composerPath;
+
     /**
      * List all enabled plugins, installed and recommend packages.
      * @return string
@@ -31,8 +50,12 @@ class PluginController extends \PHPCI\Controller
     {
         $this->requireAdmin();
 
+        $this->view->canWrite = is_writable(APPLICATION_PATH . 'composer.json');
+        $this->view->required = $this->required;
+
         $json = $this->getComposerJson();
         $this->view->installedPackages = $json['require'];
+        $this->view->suggestedPackages = $json['suggest'];
 
         $pluginInfo = new PluginInformationCollection();
         $pluginInfo->add(FilesPluginInformation::newFromDir(
@@ -49,6 +72,46 @@ class PluginController extends \PHPCI\Controller
         return $this->view->render();
     }
 
+    /**
+     * Remove a given package.
+     */
+    public function remove()
+    {
+        $this->requireAdmin();
+
+        $package = $this->getParam('package', null);
+        $json = $this->getComposerJson();
+
+        if (!in_array($package, $this->required)) {
+            unset($json['require'][$package]);
+            $this->setComposerJson($json);
+
+            header('Location: ' . PHPCI_URL . 'plugin?r=' . $package);
+            die;
+        }
+
+        header('Location: ' . PHPCI_URL);
+        die;
+    }
+
+    /**
+     * Install a given package.
+     */
+    public function install()
+    {
+        $this->requireAdmin();
+
+        $package = $this->getParam('package', null);
+        $version = $this->getParam('version', '*');
+
+        $json = $this->getComposerJson();
+        $json['require'][$package] = $version;
+        $this->setComposerJson($json);
+
+        header('Location: ' . PHPCI_URL . 'plugin?w=' . $package);
+        die;
+    }
+
     /**
      * Get the json-decoded contents of the composer.json file.
      * @return mixed
@@ -58,4 +121,79 @@ class PluginController extends \PHPCI\Controller
         $json = file_get_contents(APPLICATION_PATH . 'composer.json');
         return json_decode($json, true);
     }
+
+    /**
+     * Convert array to json and save composer.json
+     * 
+     * @param $array
+     */
+    protected function setComposerJson($array)
+    {
+        if (defined('JSON_PRETTY_PRINT')) {
+            $json = json_encode($array, JSON_PRETTY_PRINT);
+        } else {
+            $json = json_encode($array);
+        }
+
+        file_put_contents(APPLICATION_PATH . 'composer.json', $json);
+    }
+
+    /**
+     * Find a system binary.
+     * @param $binary
+     * @return null|string
+     */
+    protected function findBinary($binary)
+    {
+        if (is_string($binary)) {
+            $binary = array($binary);
+        }
+
+        foreach ($binary as $bin) {
+            // Check project root directory:
+            if (is_file(APPLICATION_PATH . $bin)) {
+                return APPLICATION_PATH . $bin;
+            }
+
+            // Check Composer bin dir:
+            if (is_file(APPLICATION_PATH . 'vendor/bin/' . $bin)) {
+                return APPLICATION_PATH . 'vendor/bin/' . $bin;
+            }
+
+            // Use "which"
+            $which = trim(shell_exec('which ' . $bin));
+
+            if (!empty($which)) {
+                return $which;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Perform a search on packagist.org.
+     */
+    public function packagistSearch()
+    {
+        $searchQuery = $this->getParam('q', '');
+        $http = new \b8\HttpClient();
+        $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']));
+    }
+
+    /**
+     * Look up available versions of a given package on packagist.org
+     */
+    public function packagistVersions()
+    {
+        $name = $this->getParam('p', '');
+        $http = new \b8\HttpClient();
+        $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']));
+    }
 }

PHPCI/Controller/ProjectController.php

@@ -10,14 +10,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;
 use PHPCI\BuildFactory;
 use PHPCI\Helper\Github;
 use PHPCI\Helper\Lang;
 use PHPCI\Helper\SshKey;
+use PHPCI\Model\Build;
+use PHPCI\Model\Project;
 use PHPCI\Service\BuildService;
 use PHPCI\Service\ProjectService;
 
@@ -27,7 +30,7 @@ use PHPCI\Service\ProjectService;
 * @package      PHPCI
 * @subpackage   Web
 */
-class ProjectController extends PHPCI\Controller
+class ProjectController extends \PHPCI\Controller
 {
     /**
      * @var \PHPCI\Store\ProjectStore
@@ -78,15 +81,14 @@ class ProjectController extends PHPCI\Controller
         $pages    = $builds[1] == 0 ? 1 : ceil($builds[1] / $per_page);
 
         if ($page > $pages) {
-            $response = new b8\Http\Response\RedirectResponse();
+            header('Location: '.PHPCI_URL.'project/view/'.$projectId);
-            $response->setHeader('Location', PHPCI_URL.'project/view/'.$projectId);
+            die;
-            return $response;
         }
 
         $this->view->builds   = $builds[0];
         $this->view->total    = $builds[1];
         $this->view->project  = $project;
-        $this->view->branch   = urldecode($branch);
+        $this->view->branch = urldecode($branch);
         $this->view->branches = $this->projectStore->getKnownBranches($projectId);
         $this->view->page     = $page;
         $this->view->pages    = $pages;
@@ -116,13 +118,8 @@ class ProjectController extends PHPCI\Controller
         $email = $_SESSION['phpci_user']->getEmail();
         $build = $this->buildService->createBuild($project, null, urldecode($branch), $email);
 
-        if ($this->buildService->queueError) {
+        header('Location: '.PHPCI_URL.'build/view/' . $build->getId());
-            $_SESSION['global_error'] = Lang::get('add_to_queue_failed');
+        exit;
-        }
-
-        $response = new b8\Http\Response\RedirectResponse();
-        $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
-        return $response;
     }
 
     /**
@@ -135,9 +132,8 @@ class ProjectController extends PHPCI\Controller
         $project = $this->projectStore->getById($projectId);
         $this->projectService->deleteProject($project);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL);
-        $response->setHeader('Location', PHPCI_URL);
+        exit;
-        return $response;
     }
 
     /**
@@ -147,10 +143,7 @@ class ProjectController extends PHPCI\Controller
     {
         $branch = $this->getParam('branch', '');
         $builds = $this->getLatestBuildsHtml($projectId, urldecode($branch));
-
+        die($builds[0]);
-        $this->response->disableLayout();
-        $this->response->setContent($builds[0]);
-        return $this->response;
     }
 
     /**
@@ -224,14 +217,11 @@ class ProjectController extends PHPCI\Controller
                 'build_config' => $this->getParam('build_config', null),
                 'allow_public_status' => $this->getParam('allow_public_status', 0),
                 'branch' => $this->getParam('branch', null),
-                'group' => $this->getParam('group_id', null),
             );
 
             $project = $this->projectService->createProject($title, $type, $reference, $options);
-
+            header('Location: '.PHPCI_URL.'project/view/' . $project->getId());
-            $response = new b8\Http\Response\RedirectResponse();
+            die;
-            $response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId());
-            return $response;
         }
     }
 
@@ -273,7 +263,7 @@ class ProjectController extends PHPCI\Controller
             $view->type     = 'edit';
             $view->project  = $project;
             $view->form     = $form;
-            $view->key      = $values['pubkey'];
+            $view->key      = null;
 
             return $view->render();
         }
@@ -287,16 +277,13 @@ class ProjectController extends PHPCI\Controller
             'ssh_public_key' => $this->getParam('pubkey', null),
             'build_config' => $this->getParam('build_config', null),
             'allow_public_status' => $this->getParam('allow_public_status', 0),
-            'archived' => $this->getParam('archived', 0),
             'branch' => $this->getParam('branch', null),
-            'group' => $this->getParam('group_id', null),
         );
 
         $project = $this->projectService->updateProject($project, $title, $type, $reference, $options);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL.'project/view/' . $project->getId());
-        $response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId());
+        die;
-        return $response;
     }
 
     /**
@@ -318,11 +305,10 @@ class ProjectController extends PHPCI\Controller
             'remote' => Lang::get('remote'),
             'local' => Lang::get('local'),
             'hg'    => Lang::get('hg'),
-            'svn'    => Lang::get('svn'),
             );
 
         $field = Form\Element\Select::create('type', Lang::get('where_hosted'), true);
-        $field->setPattern('^(github|bitbucket|gitlab|remote|local|hg|svn)');
+        $field->setPattern('^(github|bitbucket|gitlab|remote|local|hg)');
         $field->setOptions($options);
         $field->setClass('form-control')->setContainerClass('form-group');
         $form->addField($field);
@@ -358,32 +344,12 @@ class ProjectController extends PHPCI\Controller
         $field->setClass('form-control')->setContainerClass('form-group')->setValue('master');
         $form->addField($field);
 
-        $field = Form\Element\Select::create('group_id', 'Project Group', true);
-        $field->setClass('form-control')->setContainerClass('form-group')->setValue(1);
-
-        $groups = array();
-        $groupStore = b8\Store\Factory::getStore('ProjectGroup');
-        $groupList = $groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
-
-        foreach ($groupList['items'] as $group) {
-            $groups[$group->getId()] = $group->getTitle();
-        }
-
-        $field->setOptions($groups);
-        $form->addField($field);
-
         $field = Form\Element\Checkbox::create('allow_public_status', Lang::get('allow_public_status'), false);
         $field->setContainerClass('form-group');
         $field->setCheckedValue(1);
         $field->setValue(0);
         $form->addField($field);
 
-        $field = Form\Element\Checkbox::create('archived', Lang::get('archived'), false);
-        $field->setContainerClass('form-group');
-        $field->setCheckedValue(1);
-        $field->setValue(0);
-        $form->addField($field);
-
         $field = new Form\Element\Submit();
         $field->setValue(Lang::get('save_project'));
         $field->setContainerClass('form-group');
@@ -400,10 +366,7 @@ class ProjectController extends PHPCI\Controller
     protected function githubRepositories()
     {
         $github = new Github();
-
+        die(json_encode($github->getRepositories()));
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent($github->getRepositories());
-        return $response;
     }
 
     /**

PHPCI/Controller/SessionController.php

@@ -43,23 +43,14 @@ class SessionController extends \PHPCI\Controller
         $isLoginFailure = false;
 
         if ($this->request->getMethod() == 'POST') {
-            $token = $this->getParam('token');
+            $user = $this->userStore->getByEmail($this->getParam('email'));
-            if (!isset($token, $_SESSION['login_token']) || $token !== $_SESSION['login_token']) {
+
-                $isLoginFailure = true;
+            if ($user && password_verify($this->getParam('password', ''), $user->getHash())) {
+                $_SESSION['phpci_user_id']    = $user->getId();
+                header('Location: ' . $this->getLoginRedirect());
+                die;
             } else {
-                unset($_SESSION['login_token']);
+                $isLoginFailure = true;
-
-                $user = $this->userStore->getByEmail($this->getParam('email'));
-
-                if ($user && password_verify($this->getParam('password', ''), $user->getHash())) {
-                    session_regenerate_id(true);
-                    $_SESSION['phpci_user_id']    = $user->getId();
-                    $response = new b8\Http\Response\RedirectResponse();
-                    $response->setHeader('Location', $this->getLoginRedirect());
-                    return $response;
-                } else {
-                    $isLoginFailure = true;
-                }
             }
         }
 
@@ -86,15 +77,9 @@ class SessionController extends \PHPCI\Controller
         $pwd->setClass('btn-success');
         $form->addField($pwd);
 
-        $tokenValue = $this->generateToken();
-        $_SESSION['login_token'] = $tokenValue;
-        $token = new b8\Form\Element\Hidden('token');
-        $token->setValue($tokenValue);
-        $form->addField($token);
-
         $this->view->form = $form->render();
         $this->view->failed = $isLoginFailure;
-
+        
         return $this->view->render();
     }
 
@@ -107,10 +92,8 @@ class SessionController extends \PHPCI\Controller
         unset($_SESSION['phpci_user_id']);
 
         session_destroy();
-
+        header('Location: ' . PHPCI_URL);
-        $response = new b8\Http\Response\RedirectResponse();
+        die;
-        $response->setHeader('Location', PHPCI_URL);
-        return $response;
     }
 
     /**
@@ -168,9 +151,8 @@ class SessionController extends \PHPCI\Controller
             $_SESSION['phpci_user'] = $this->userStore->save($user);
             $_SESSION['phpci_user_id'] = $user->getId();
 
-            $response = new b8\Http\Response\RedirectResponse();
+            header('Location: ' . PHPCI_URL);
-            $response->setHeader('Location', PHPCI_URL);
+            die;
-            return $response;
         }
 
         $this->view->id = $userId;
@@ -194,20 +176,4 @@ class SessionController extends \PHPCI\Controller
 
         return $rtn;
     }
-
-    /** Generate a random token.
-     *
-     * @return string
-     */
-    protected function generateToken()
-    {
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            return bin2hex(openssl_random_pseudo_bytes(16));
-        }
-
-        return sprintf("%04x", mt_rand(0, 0xFFFF))
-            . sprintf("%04x", mt_rand(0, 0xFFFF))
-            . sprintf("%04x", mt_rand(0, 0xFFFF))
-            . sprintf("%04x", mt_rand(0, 0xFFFF));
-    }
 }

PHPCI/Controller/SettingsController.php

@@ -14,6 +14,7 @@ use b8\Form;
 use b8\HttpClient;
 use PHPCI\Controller;
 use PHPCI\Helper\Lang;
+use PHPCI\Model\Build;
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
 
@@ -40,7 +41,7 @@ class SettingsController extends Controller
         parent::init();
 
         $parser         = new Parser();
-        $yaml           = file_get_contents(PHPCI_CONFIG_FILE);
+        $yaml           = file_get_contents(APPLICATION_PATH . 'PHPCI/config.yml');
         $this->settings = $parser->parse($yaml);
     }
 
@@ -76,7 +77,6 @@ class SettingsController extends Controller
             $authSettings = $this->settings['phpci']['authentication_settings'];
         }
 
-        $this->view->configFile = PHPCI_CONFIG_FILE;
         $this->view->basicSettings = $this->getBasicForm($basicSettings);
         $this->view->buildSettings = $this->getBuildForm($buildSettings);
         $this->view->github = $this->getGithubForm();
@@ -102,15 +102,13 @@ class SettingsController extends Controller
         $this->settings['phpci']['github']['secret'] = $this->getParam('githubsecret', '');
         $error                                       = $this->storeSettings();
 
-        $response = new b8\Http\Response\RedirectResponse();
-
         if ($error) {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
+            header('Location: ' . PHPCI_URL . 'settings?saved=2');
         } else {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
+            header('Location: ' . PHPCI_URL . 'settings?saved=1');
         }
 
-        return $response;
+        die;
     }
 
     /**
@@ -125,15 +123,13 @@ class SettingsController extends Controller
 
         $error = $this->storeSettings();
 
-        $response = new b8\Http\Response\RedirectResponse();
-
         if ($error) {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
+            header('Location: ' . PHPCI_URL . 'settings?saved=2');
         } else {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
+            header('Location: ' . PHPCI_URL . 'settings?saved=1');
         }
 
-        return $response;
+        die;
     }
 
     /**
@@ -147,15 +143,13 @@ class SettingsController extends Controller
 
         $error = $this->storeSettings();
 
-        $response = new b8\Http\Response\RedirectResponse();
-
         if ($error) {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
+            header('Location: ' . PHPCI_URL . 'settings?saved=2');
         } else {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
+            header('Location: ' . PHPCI_URL . 'settings?saved=1');
         }
 
-        return $response;
+        die;
     }
 
     /**
@@ -168,15 +162,13 @@ class SettingsController extends Controller
         $this->settings['phpci']['basic'] = $this->getParams();
         $error = $this->storeSettings();
 
-        $response = new b8\Http\Response\RedirectResponse();
-
         if ($error) {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
+            header('Location: ' . PHPCI_URL . 'settings?saved=2');
         } else {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
+            header('Location: ' . PHPCI_URL . 'settings?saved=1');
         }
 
-        return $response;
+        die;
     }
 
     /**
@@ -191,15 +183,13 @@ class SettingsController extends Controller
 
         $error = $this->storeSettings();
 
-        $response = new b8\Http\Response\RedirectResponse();
-
         if ($error) {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
+            header('Location: ' . PHPCI_URL . 'settings?saved=2');
         } else {
-            $response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
+            header('Location: ' . PHPCI_URL . 'settings?saved=1');
         }
 
-        return $response;
+        die;
     }
 
     /**
@@ -222,15 +212,14 @@ class SettingsController extends Controller
                 $this->settings['phpci']['github']['token'] = $resp['access_token'];
                 $this->storeSettings();
 
-                $response = new b8\Http\Response\RedirectResponse();
+                header('Location: ' . PHPCI_URL . 'settings?linked=1');
-                $response->setHeader('Location', PHPCI_URL . 'settings?linked=1');
+                die;
-                return $response;
             }
         }
 
-        $response = new b8\Http\Response\RedirectResponse();
+
-        $response->setHeader('Location', PHPCI_URL . 'settings?linked=2');
+        header('Location: ' . PHPCI_URL . 'settings?linked=2');
-        return $response;
+        die;
     }
 
     /**
@@ -242,7 +231,7 @@ class SettingsController extends Controller
     {
         $dumper = new Dumper();
         $yaml   = $dumper->dump($this->settings, 4);
-        file_put_contents(PHPCI_CONFIG_FILE, $yaml);
+        file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml);
 
         if (error_get_last()) {
             $error_get_last = error_get_last();
@@ -329,7 +318,7 @@ class SettingsController extends Controller
         $field->setContainerClass('form-group');
         $form->addField($field);
 
-        $field = new Form\Element\Password('smtp_password');
+        $field = new Form\Element\Text('smtp_password');
         $field->setRequired(false);
         $field->setLabel(Lang::get('smtp_password'));
         $field->setClass('form-control');
@@ -351,7 +340,7 @@ class SettingsController extends Controller
         $form->addField($field);
 
         $field = new Form\Element\Select('smtp_encryption');
-        $field->setOptions(array('' => Lang::get('none'), 'tls' => Lang::get('tls'), 'ssl' => Lang::get('ssl')));
+        $field->setOptions(['' => Lang::get('none'), 'tls' => Lang::get('tls'), 'ssl' => Lang::get('ssl')]);
         $field->setRequired(false);
         $field->setLabel(Lang::get('use_smtp_encryption'));
         $field->setContainerClass('form-group');
@@ -387,7 +376,7 @@ class SettingsController extends Controller
      */
     protected function canWriteConfig()
     {
-        return is_writeable(PHPCI_CONFIG_FILE);
+        return is_writeable(APPLICATION_PATH . 'PHPCI/config.yml');
     }
 
     /**
@@ -406,13 +395,13 @@ class SettingsController extends Controller
         $field->setLabel(Lang::get('failed_after'));
         $field->setClass('form-control');
         $field->setContainerClass('form-group');
-        $field->setOptions(array(
+        $field->setOptions([
             300 => Lang::get('5_mins'),
             900 => Lang::get('15_mins'),
             1800 => Lang::get('30_mins'),
             3600 => Lang::get('1_hour'),
             10800 => Lang::get('3_hours'),
-        ));
+        ]);
         $field->setValue(1800);
         $form->addField($field);
 
@@ -444,7 +433,7 @@ class SettingsController extends Controller
         $field->setClass('form-control');
         $field->setContainerClass('form-group');
         $field->setOptions(Lang::getLanguageOptions());
-        $field->setValue(Lang::getLanguage());
+        $field->setValue('en');
         $form->addField($field);
 
 

PHPCI/Controller/UserController.php

@@ -10,10 +10,12 @@
 namespace PHPCI\Controller;
 
 use b8;
+use b8\Exception\HttpException\ForbiddenException;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Form;
 use PHPCI\Controller;
 use PHPCI\Helper\Lang;
+use PHPCI\Model\User;
 use PHPCI\Service\UserService;
 
 /**
@@ -123,7 +125,6 @@ class UserController extends Controller
         $lang->setLabel(Lang::get('language'));
         $lang->setRequired(true);
         $lang->setOptions(Lang::getLanguageOptions());
-        $lang->setValue(Lang::getLanguage());
         $form->addField($lang);
 
         $submit = new Form\Element\Submit();
@@ -174,9 +175,8 @@ class UserController extends Controller
 
         $this->userService->createUser($name, $email, $password, $isAdmin);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL.'user');
-        $response->setHeader('Location', PHPCI_URL . 'user');
+        die;
-        return $response;
     }
 
     /**
@@ -215,9 +215,8 @@ class UserController extends Controller
 
         $this->userService->updateUser($user, $name, $email, $password, $isAdmin);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL.'user');
-        $response->setHeader('Location', PHPCI_URL . 'user');
+        die;
-        return $response;
     }
 
     /**
@@ -289,8 +288,7 @@ class UserController extends Controller
 
         $this->userService->deleteUser($user);
 
-        $response = new b8\Http\Response\RedirectResponse();
+        header('Location: '.PHPCI_URL.'user');
-        $response->setHeader('Location', PHPCI_URL . 'user');
+        die;
-        return $response;
     }
 }

PHPCI/Controller/WebhookController.php

@@ -2,7 +2,7 @@
 /**
  * PHPCI - Continuous Integration for PHP
  *
- * @copyright    Copyright 2014-2015, Block 8 Limited.
+ * @copyright    Copyright 2014, Block 8 Limited.
  * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
  * @link         https://www.phptesting.org/
  */
@@ -11,39 +11,32 @@ namespace PHPCI\Controller;
 
 use b8;
 use b8\Store;
-use Exception;
 use PHPCI\BuildFactory;
-use PHPCI\Model\Project;
+use PHPCI\Model\Build;
 use PHPCI\Service\BuildService;
-use PHPCI\Store\BuildStore;
-use PHPCI\Store\ProjectStore;
 
 /**
  * Webhook Controller - Processes webhook pings from BitBucket, Github, Gitlab, etc.
- *
  * @author       Dan Cryer <dan@block8.co.uk>
  * @author       Sami Tikka <stikka@iki.fi>
  * @author       Alex Russell <alex@clevercherry.com>
- * @author       Guillaume Perréal <adirelle@gmail.com>
  * @package      PHPCI
  * @subpackage   Web
- *
- * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class WebhookController extends \b8\Controller
+class WebhookController extends \PHPCI\Controller
 {
     /**
-     * @var BuildStore
+     * @var \PHPCI\Store\BuildStore
      */
     protected $buildStore;
 
     /**
-     * @var ProjectStore
+     * @var \PHPCI\Store\ProjectStore
      */
     protected $projectStore;
 
     /**
-     * @var BuildService
+     * @var \PHPCI\Service\BuildService
      */
     protected $buildService;
 
@@ -57,147 +50,86 @@ class WebhookController extends \b8\Controller
         $this->buildService = new BuildService($this->buildStore);
     }
 
-    /** Handle the action, Ensuring to return a JsonResponse.
-     *
-     * @param string $action
-     * @param mixed $actionParams
-     *
-     * @return \b8\Http\Response
-     */
-    public function handleAction($action, $actionParams)
-    {
-        $response = new b8\Http\Response\JsonResponse();
-        try {
-            $data = parent::handleAction($action, $actionParams);
-            if (isset($data['responseCode'])) {
-                $response->setResponseCode($data['responseCode']);
-                unset($data['responseCode']);
-            }
-            $response->setContent($data);
-        } catch (Exception $ex) {
-            $response->setResponseCode(500);
-            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
-        }
-        return $response;
-    }
-
     /**
-     * Called by Bitbucket.
+     * Called by Bitbucket POST service.
      */
-    public function bitbucket($projectId)
+    public function bitbucket($project)
-    {
-        $project = $this->fetchProject($projectId, 'bitbucket');
-    
-        // Support both old services and new webhooks
-        if ($payload = $this->getParam('payload')) {
-            return $this->bitbucketService(json_decode($payload, true), $project);
-        }
-
-        $payload = json_decode(file_get_contents("php://input"), true);
-
-        if (empty($payload['push']['changes'])) {
-            // Invalid event from bitbucket
-            return [
-                'status' => 'failed',
-                'commits' => []
-            ];
-        }
-
-        return $this->bitbucketWebhook($payload, $project);
-    }
-
-    /**
-     * Bitbucket webhooks.
-     */
-    protected function bitbucketWebhook($payload, $project)
-    {
-        $results = array();
-        $status = 'failed';
-        foreach ($payload['push']['changes'] as $commit) {
-            try {
-                $email = $commit['new']['target']['author']['raw'];
-                $email = substr($email, 0, strpos($email, '>'));
-                $email = substr($email, strpos($email, '<') + 1);
-
-                $results[$commit['new']['target']['hash']] = $this->createBuild(
-                    $project,
-                    $commit['new']['target']['hash'],
-                    $commit['new']['name'],
-                    $email,
-                    $commit['new']['target']['message']
-                );
-                $status = 'ok';
-            } catch (Exception $ex) {
-                $results[$commit['new']['target']['hash']] = array('status' => 'failed', 'error' => $ex->getMessage());
-            }
-        }
-
-        return array('status' => $status, 'commits' => $results);
-    }
-
-    /**
-     * Bitbucket POST service.
-     */
-    protected function bitbucketService($payload, $project)
     {
         $payload = json_decode($this->getParam('payload'), true);
 
-        $results = array();
-        $status = 'failed';
         foreach ($payload['commits'] as $commit) {
             try {
                 $email = $commit['raw_author'];
                 $email = substr($email, 0, strpos($email, '>'));
                 $email = substr($email, strpos($email, '<') + 1);
 
-                $results[$commit['raw_node']] = $this->createBuild(
+                $this->createBuild($project, $commit['raw_node'], $commit['branch'], $email, $commit['message']);
-                    $project,
+            } catch (\Exception $ex) {
-                    $commit['raw_node'],
+                header('HTTP/1.1 500 Internal Server Error');
-                    $commit['branch'],
+                header('Ex: ' . $ex->getMessage());
-                    $email,
+                die('FAIL');
-                    $commit['message']
-                );
-                $status = 'ok';
-            } catch (Exception $ex) {
-                $results[$commit['raw_node']] = array('status' => 'failed', 'error' => $ex->getMessage());
             }
         }
 
-        return array('status' => $status, 'commits' => $results);
+        die('OK');
     }
 
     /**
      * Called by POSTing to /webhook/git/<project_id>?branch=<branch>&commit=<commit>
      *
-     * @param string $projectId
+     * @param string $project
      */
-    public function git($projectId)
+    public function git($project)
     {
-        $project = $this->fetchProject($projectId, array('local', 'remote'));
+        $branch = $this->getParam('branch');
-        $branch = $this->getParam('branch', $project->getBranch());
         $commit = $this->getParam('commit');
         $commitMessage = $this->getParam('message');
         $committer = $this->getParam('committer');
 
-        return $this->createBuild($project, $commit, $branch, $committer, $commitMessage);
+        try {
+            if (empty($branch)) {
+                $branch = 'master';
+            }
+
+            if (empty($commit)) {
+                $commit = null;
+            }
+
+            if (empty($commitMessage)) {
+                $commitMessage = null;
+            }
+
+            if (empty($committer)) {
+                $committer = null;
+            }
+
+            $this->createBuild($project, $commit, $branch, $committer, $commitMessage);
+        } catch (\Exception $ex) {
+            header('HTTP/1.1 400 Bad Request');
+            header('Ex: ' . $ex->getMessage());
+            die('FAIL');
+        }
+
+        die('OK');
     }
 
     /**
      * Called by Github Webhooks:
      */
-    public function github($projectId)
+    public function github($project)
     {
-        $project = $this->fetchProject($projectId, 'github');
-
         switch ($_SERVER['CONTENT_TYPE']) {
             case 'application/json':
                 $payload = json_decode(file_get_contents('php://input'), true);
                 break;
+
             case 'application/x-www-form-urlencoded':
                 $payload = json_decode($this->getParam('payload'), true);
                 break;
+
             default:
-                return array('status' => 'failed', 'error' => 'Content type not supported.', 'responseCode' => 401);
+                header('HTTP/1.1 400 Bad Request');
+                die('Request content type not supported');
         }
 
         // Handle Pull Request web hooks:
@@ -210,244 +142,187 @@ class WebhookController extends \b8\Controller
             return $this->githubCommitRequest($project, $payload);
         }
 
-        return array('status' => 'ignored', 'message' => 'Unusable payload.');
+        header('HTTP/1.1 200 OK');
+        die('This request type is not supported, this is not an error.');
     }
 
     /**
      * Handle the payload when Github sends a commit webhook.
-     *
+     * @param $project
-     * @param Project $project
      * @param array $payload
-     * @param b8\Http\Response\JsonResponse $response
-     *
-     * @return b8\Http\Response\JsonResponse
      */
-    protected function githubCommitRequest(Project $project, array $payload)
+    protected function githubCommitRequest($project, array $payload)
     {
         // Github sends a payload when you close a pull request with a
-        // non-existent commit. We don't want this.
+        // non-existant commit. We don't want this.
         if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') {
-            return array('status' => 'ignored');
+            die('OK');
         }
 
-        if (isset($payload['commits']) && is_array($payload['commits'])) {
+        try {
-            // If we have a list of commits, then add them all as builds to be tested:
 
-            $results = array();
+            if (isset($payload['commits']) && is_array($payload['commits'])) {
-            $status = 'failed';
+                // If we have a list of commits, then add them all as builds to be tested:
-            foreach ($payload['commits'] as $commit) {
+
-                if (!$commit['distinct']) {
+                foreach ($payload['commits'] as $commit) {
-                    $results[$commit['id']] = array('status' => 'ignored');
+                    if (!$commit['distinct']) {
-                    continue;
+                        continue;
-                }
+                    }
 
-                try {
                     $branch = str_replace('refs/heads/', '', $payload['ref']);
                     $committer = $commit['committer']['email'];
-                    $results[$commit['id']] = $this->createBuild(
+                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
-                        $project,
-                        $commit['id'],
-                        $branch,
-                        $committer,
-                        $commit['message']
-                    );
-                    $status = 'ok';
-                } catch (Exception $ex) {
-                    $results[$commit['id']] = array('status' => 'failed', 'error' => $ex->getMessage());
                 }
+            } elseif (substr($payload['ref'], 0, 10) == 'refs/tags/') {
+                // If we don't, but we're dealing with a tag, add that instead:
+                $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);
             }
-            return array('status' => $status, 'commits' => $results);
+
+        } catch (\Exception $ex) {
+            header('HTTP/1.1 500 Internal Server Error');
+            header('Ex: ' . $ex->getMessage());
+            die('FAIL');
         }
 
-        if (substr($payload['ref'], 0, 10) == 'refs/tags/') {
+        die('OK');
-            // If we don't, but we're dealing with a tag, add that instead:
-            $branch = str_replace('refs/tags/', 'Tag: ', $payload['ref']);
-            $committer = $payload['pusher']['email'];
-            $message = $payload['head_commit']['message'];
-            return $this->createBuild($project, $payload['after'], $branch, $committer, $message);
-        }
-
-        return array('status' => 'ignored', 'message' => 'Unusable payload.');
     }
 
     /**
      * Handle the payload when Github sends a Pull Request webhook.
-     *
+     * @param $projectId
-     * @param Project $project
      * @param array $payload
      */
-    protected function githubPullRequest(Project $project, array $payload)
+    protected function githubPullRequest($projectId, array $payload)
     {
         // We only want to know about open pull requests:
         if (!in_array($payload['action'], array('opened', 'synchronize', 'reopened'))) {
-            return array('status' => 'ok');
+            die('OK');
         }
 
-        $headers = array();
+        try {
-        $token = \b8\Config::getInstance()->get('phpci.github.token');
+            $headers = array();
+            $token = \b8\Config::getInstance()->get('phpci.github.token');
 
-        if (!empty($token)) {
+            if (!empty($token)) {
-            $headers[] = 'Authorization: token ' . $token;
+                $headers[] = 'Authorization: token ' . $token;
-        }
-
-        $url    = $payload['pull_request']['commits_url'];
-        $http   = new \b8\HttpClient();
-        $http->setHeaders($headers);
-        $response = $http->get($url);
-
-        // Check we got a success response:
-        if (!$response['success']) {
-            throw new Exception('Could not get commits, failed API request.');
-        }
-
-        $results = array();
-        $status = 'failed';
-        foreach ($response['body'] as $commit) {
-            // Skip all but the current HEAD commit ID:
-            $id = $commit['sha'];
-            if ($id != $payload['pull_request']['head']['sha']) {
-                $results[$id] = array('status' => 'ignored', 'message' => 'not branch head');
-                continue;
             }
 
-            try {
+            $url    = $payload['pull_request']['commits_url'];
+            $http   = new \b8\HttpClient();
+            $http->setHeaders($headers);
+            $response = $http->get($url);
+
+            // 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) {
                 $branch = str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']);
                 $committer = $commit['commit']['author']['email'];
                 $message = $commit['commit']['message'];
 
-                $remoteUrlKey = $payload['pull_request']['head']['repo']['private'] ? 'ssh_url' : 'clone_url';
-
                 $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'][$remoteUrlKey],
+                    'remote_url' => $payload['pull_request']['head']['repo']['clone_url'],
                 );
 
-                $results[$id] = $this->createBuild($project, $id, $branch, $committer, $message, $extra);
+                $this->createBuild($projectId, $commit['sha'], $branch, $committer, $message, $extra);
-                $status = 'ok';
-            } catch (Exception $ex) {
-                $results[$id] = array('status' => 'failed', 'error' => $ex->getMessage());
             }
+        } catch (\Exception $ex) {
+            header('HTTP/1.1 500 Internal Server Error');
+            header('Ex: ' . $ex->getMessage());
+            die('FAIL');
         }
 
-        return array('status' => $status, 'commits' => $results);
+        die('OK');
     }
 
     /**
      * Called by Gitlab Webhooks:
      */
-    public function gitlab($projectId)
+    public function gitlab($project)
     {
-        $project = $this->fetchProject($projectId, 'gitlab');
-
         $payloadString = file_get_contents("php://input");
         $payload = json_decode($payloadString, true);
 
-        // build on merge request events
+        try {
-        if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') {
-            $attributes = $payload['object_attributes'];
-            if ($attributes['state'] == 'opened' || $attributes['state'] == 'reopened') {
-                $branch = $attributes['source_branch'];
-                $commit = $attributes['last_commit'];
-                $committer = $commit['author']['email'];
 
-                return $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
-            }
-        }
 
-        // build on push events
+            // build on merge request events
-        if (isset($payload['commits']) && is_array($payload['commits'])) {
+            if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') {
-            // If we have a list of commits, then add them all as builds to be tested:
+                $attributes = $payload['object_attributes'];
+                if ($attributes['state'] == 'opened' || $attributes['state'] == 'reopened') {
 
-            $results = array();
+                    $branch = $attributes['source_branch'];
-            $status = 'failed';
+                    $commit = $attributes['last_commit'];
-            foreach ($payload['commits'] as $commit) {
-                try {
-                    $branch = str_replace('refs/heads/', '', $payload['ref']);
                     $committer = $commit['author']['email'];
-                    $results[$commit['id']] = $this->createBuild(
+
-                        $project,
+                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
-                        $commit['id'],
-                        $branch,
-                        $committer,
-                        $commit['message']
-                    );
-                    $status = 'ok';
-                } catch (Exception $ex) {
-                    $results[$commit['id']] = array('status' => 'failed', 'error' => $ex->getMessage());
                 }
             }
-            return array('status' => $status, 'commits' => $results);
+
+            // build on push events
+            if (isset($payload['commits']) && is_array($payload['commits'])) {
+                // If we have a list of commits, then add them all as builds to be tested:
+
+                foreach ($payload['commits'] as $commit) {
+                    $branch = str_replace('refs/heads/', '', $payload['ref']);
+                    $committer = $commit['author']['email'];
+                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
+                }
+            }
+
+        } catch (\Exception $ex) {
+            header('HTTP/1.1 500 Internal Server Error');
+            header('Ex: ' . $ex->getMessage());
+            die('FAIL');
         }
 
-        return array('status' => 'ignored', 'message' => 'Unusable payload.');
+        die('OK');
     }
 
     /**
      * Wrapper for creating a new build.
-     *
+     * @param $projectId
-     * @param Project $project
+     * @param $commitId
-     * @param string $commitId
+     * @param $branch
-     * @param string $branch
+     * @param $committer
-     * @param string $committer
+     * @param $commitMessage
-     * @param string $commitMessage
+     * @param null $extra
-     * @param array $extra
+     * @return bool
-     *
+     * @throws \Exception
-     * @return array
-     *
-     * @throws Exception
      */
-    protected function createBuild(
+    protected function createBuild($projectId, $commitId, $branch, $committer, $commitMessage, $extra = null)
-        Project $project,
+    {
-        $commitId,
-        $branch,
-        $committer,
-        $commitMessage,
-        array $extra = null
-    ) {
         // Check if a build already exists for this commit ID:
-        $builds = $this->buildStore->getByProjectAndCommit($project->getId(), $commitId);
+        $builds = $this->buildStore->getByProjectAndCommit($projectId, $commitId);
 
         if ($builds['count']) {
-            return array(
+            return true;
-                'status' => 'ignored',
+        }
-                'message' => sprintf('Duplicate of build #%d', $builds['items'][0]->getId())
+
-            );
+        $project = $this->projectStore->getById($projectId);
+
+        if (empty($project)) {
+            throw new \Exception('Project does not exist:' . $projectId);
         }
 
         // If not, create a new build job for it:
         $build = $this->buildService->createBuild($project, $commitId, $branch, $committer, $commitMessage, $extra);
+        $build = BuildFactory::getBuild($build);
 
-        return array('status' => 'ok', 'buildID' => $build->getID());
+        // Send a status postback if the build type provides one:
-    }
+        $build->sendStatusPostback();
 
-    /**
+        return true;
-     * Fetch a project and check its type.
-     *
-     * @param int $projectId
-     * @param array|string $expectedType
-     *
-     * @return Project
-     *
-     * @throws Exception If the project does not exist or is not of the expected type.
-     */
-    protected function fetchProject($projectId, $expectedType)
-    {
-        $project = $this->projectStore->getById($projectId);
-
-        if (empty($projectId)) {
-            throw new Exception('Project does not exist: ' . $projectId);
-        }
-
-        if (is_array($expectedType)
-            ? !in_array($project->getType(), $expectedType)
-            : $project->getType() !== $expectedType
-        ) {
-            throw new Exception('Wrong project type: ' . $project->getType());
-        }
-
-        return $project;
     }
 }

PHPCI/ErrorHandler.php

@@ -1,68 +0,0 @@
-<?php
-/**
- * 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;
-
-/**
- * Error Handler
- *
- * @package PHPCI\Logging
- */
-class ErrorHandler
-{
-    /**
-     * @var array
-     */
-    protected $levels = array(
-        E_WARNING           => 'Warning',
-        E_NOTICE            => 'Notice',
-        E_USER_ERROR        => 'User Error',
-        E_USER_WARNING      => 'User Warning',
-        E_USER_NOTICE       => 'User Notice',
-        E_STRICT            => 'Runtime Notice',
-        E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
-        E_DEPRECATED        => 'Deprecated',
-        E_USER_DEPRECATED   => 'User Deprecated',
-    );
-
-    /**
-     * Registers an instance of the error handler to throw ErrorException.
-     */
-    public static function register()
-    {
-        $handler = new static();
-        set_error_handler(array($handler, 'handleError'));
-    }
-
-    /**
-     * @param integer $level
-     * @param string  $message
-     * @param string  $file
-     * @param integer $line
-     *
-     * @throws \ErrorException
-     *
-     * @internal
-     */
-    public function handleError($level, $message, $file, $line)
-    {
-        if (error_reporting() & $level === 0) {
-            return;
-        }
-
-        $exceptionLevel = isset($this->levels[$level]) ? $this->levels[$level] : $level;
-        throw new \ErrorException(
-            sprintf('%s: %s in %s line %d', $exceptionLevel, $message, $file, $line),
-            0,
-            $level,
-            $file,
-            $line
-        );
-    }
-}

PHPCI/Helper/AnsiConverter.php

@@ -1,55 +0,0 @@
-<?php
-/**
- * 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\Helper;
-
-use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
-
-/**
- * Converts ANSI output to HTML.
- *
- * @package PHPCI\Helper
- */
-final class AnsiConverter
-{
-    static private $converter = null;
-
-    /**
-     * Initialize the singleton.
-     *
-     * @return AnsiToHtmlConverter
-     */
-    private static function getInstance()
-    {
-        if (self::$converter === null) {
-            self::$converter = new AnsiToHtmlConverter(null, false);
-        }
-
-        return self::$converter;
-    }
-
-    /**
-     * Convert a text containing ANSI color sequences into HTML code.
-     *
-     * @param string $text The text to convert
-     *
-     * @return string The HTML code.
-     */
-    public static function convert($text)
-    {
-        return self::getInstance()->convert($text);
-    }
-
-    /**
-     * Do not instantiate this class.
-     */
-    private function __construct()
-    {
-    }
-}

PHPCI/Helper/BaseCommandExecutor.php

@@ -9,9 +9,9 @@
 
 namespace PHPCI\Helper;
 
-use Exception;
+use \PHPCI\Logging\BuildLogger;
-use PHPCI\Logging\BuildLogger;
 use Psr\Log\LogLevel;
+use PHPCI\Helper\Lang;
 
 /**
  * Handles running system commands with variables.
@@ -20,7 +20,7 @@ use Psr\Log\LogLevel;
 abstract class BaseCommandExecutor implements CommandExecutor
 {
     /**
-     * @var BuildLogger
+     * @var \PHPCI\Logging\BuildLogger
      */
     protected $logger;
 
@@ -62,7 +62,9 @@ abstract class BaseCommandExecutor implements CommandExecutor
         $this->logger = $logger;
         $this->quiet = $quiet;
         $this->verbose = $verbose;
+
         $this->lastOutput = array();
+
         $this->rootDir = $rootDir;
     }
 
@@ -76,7 +78,6 @@ 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);
@@ -90,7 +91,8 @@ abstract class BaseCommandExecutor implements CommandExecutor
         );
 
         $pipes = array();
-        $process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null);
+
+        $process = proc_open($command, $descriptorSpec, $pipes, dirname($this->buildPath), null);
 
         if (is_resource($process)) {
             fclose($pipes[0]);
@@ -144,12 +146,13 @@ abstract class BaseCommandExecutor implements CommandExecutor
     /**
      * Find a binary required by a plugin.
      * @param string $binary
-     * @param bool $quiet
+     * @param null $buildPath
      * @return null|string
      */
-    public function findBinary($binary, $quiet = false)
+    public function findBinary($binary, $buildPath = null)
     {
-        $composerBin = $this->getComposerBinDir(realpath($this->buildPath));
+        $binaryPath = null;
+        $composerBin = $this->getComposerBinDir(realpath($buildPath));
 
         if (is_string($binary)) {
             $binary = array($binary);
@@ -159,31 +162,32 @@ abstract class BaseCommandExecutor implements CommandExecutor
             $this->logger->log(Lang::get('looking_for_binary', $bin), LogLevel::DEBUG);
 
             if (is_dir($composerBin) && is_file($composerBin.'/'.$bin)) {
+
                 $this->logger->log(Lang::get('found_in_path', $composerBin, $bin), LogLevel::DEBUG);
-                return $composerBin . '/' . $bin;
+                $binaryPath = $composerBin . '/' . $bin;
+                break;
             }
 
             if (is_file($this->rootDir . $bin)) {
                 $this->logger->log(Lang::get('found_in_path', 'root', $bin), LogLevel::DEBUG);
-                return $this->rootDir . $bin;
+                $binaryPath = $this->rootDir . $bin;
+                break;
             }
 
             if (is_file($this->rootDir . 'vendor/bin/' . $bin)) {
                 $this->logger->log(Lang::get('found_in_path', 'vendor/bin', $bin), LogLevel::DEBUG);
-                return $this->rootDir . 'vendor/bin/' . $bin;
+                $binaryPath = $this->rootDir . 'vendor/bin/' . $bin;
+                break;
             }
 
             $findCmdResult = $this->findGlobalBinary($bin);
             if (is_file($findCmdResult)) {
                 $this->logger->log(Lang::get('found_in_path', '', $bin), LogLevel::DEBUG);
-                return $findCmdResult;
+                $binaryPath = $findCmdResult;
+                break;
             }
         }
-
+        return $binaryPath;
-        if ($quiet) {
-            return;
-        }
-        throw new Exception(Lang::get('could_not_find', implode('/', $binary)));
     }
 
     /**
@@ -215,13 +219,4 @@ abstract class BaseCommandExecutor implements CommandExecutor
         }
         return null;
     }
-
-    /**
-     * Set the buildPath property.
-     * @param string $path
-     */
-    public function setBuildPath($path)
-    {
-        $this->buildPath = $path;
-    }
 }

PHPCI/Helper/BuildInterpolator.php

@@ -38,7 +38,6 @@ class BuildInterpolator
         $this->interpolation_vars['%COMMIT%'] = $build->getCommitId();
         $this->interpolation_vars['%SHORT_COMMIT%'] = substr($build->getCommitId(), 0, 7);
         $this->interpolation_vars['%COMMIT_EMAIL%'] = $build->getCommitterEmail();
-        $this->interpolation_vars['%COMMIT_MESSAGE%'] = $build->getCommitMessage();
         $this->interpolation_vars['%COMMIT_URI%'] = $build->getCommitLink();
         $this->interpolation_vars['%BRANCH%'] = $build->getBranch();
         $this->interpolation_vars['%BRANCH_URI%'] = $build->getBranchLink();
@@ -50,7 +49,6 @@ class BuildInterpolator
         $this->interpolation_vars['%BUILD_URI%'] = $phpCiUrl . "build/view/" . $build->getId();
         $this->interpolation_vars['%PHPCI_COMMIT%'] = $this->interpolation_vars['%COMMIT%'];
         $this->interpolation_vars['%PHPCI_SHORT_COMMIT%'] = $this->interpolation_vars['%SHORT_COMMIT%'];
-        $this->interpolation_vars['%PHPCI_COMMIT_MESSAGE%'] = $this->interpolation_vars['%COMMIT_MESSAGE%'];
         $this->interpolation_vars['%PHPCI_COMMIT_EMAIL%'] = $this->interpolation_vars['%COMMIT_EMAIL%'];
         $this->interpolation_vars['%PHPCI_COMMIT_URI%'] = $this->interpolation_vars['%COMMIT_URI%'];
         $this->interpolation_vars['%PHPCI_PROJECT%'] = $this->interpolation_vars['%PROJECT%'];
@@ -63,7 +61,6 @@ class BuildInterpolator
         putenv('PHPCI=1');
         putenv('PHPCI_COMMIT=' . $this->interpolation_vars['%COMMIT%']);
         putenv('PHPCI_SHORT_COMMIT=' . $this->interpolation_vars['%SHORT_COMMIT%']);
-        putenv('PHPCI_COMMIT_MESSAGE=' . $this->interpolation_vars['%COMMIT_MESSAGE%']);
         putenv('PHPCI_COMMIT_EMAIL=' . $this->interpolation_vars['%COMMIT_EMAIL%']);
         putenv('PHPCI_COMMIT_URI=' . $this->interpolation_vars['%COMMIT_URI%']);
         putenv('PHPCI_PROJECT=' . $this->interpolation_vars['%PROJECT%']);

PHPCI/Helper/CommandExecutor.php

@@ -26,17 +26,8 @@ interface CommandExecutor
     /**
      * Find a binary required by a plugin.
      * @param string $binary
-     * @param bool $quiet Returns null instead of throwing an execption.
+     * @param string $buildPath the current build path
-     *
      * @return null|string
-     *
-     * @throws \Exception when no binary has been found and $quiet is false.
      */
-    public function findBinary($binary, $quiet = false);
+    public function findBinary($binary, $buildPath = null);
-
-    /**
-     * Set the buildPath property.
-     * @param string $path
-     */
-    public function setBuildPath($path);
 }

PHPCI/Helper/Diff.php

@@ -1,62 +0,0 @@
-<?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-namespace PHPCI\Helper;
-
-use b8\Cache;
-use b8\Config;
-use b8\HttpClient;
-
-/**
- * Provides some basic diff processing functionality.
- * @package PHPCI\Helper
- */
-class Diff
-{
-    /**
-     * Take a diff
-     * @param string $diff
-     * @return array
-     */
-    public function getLinePositions($diff)
-    {
-        if (empty($diff)) {
-            return null;
-        }
-
-        $rtn = array();
-
-        $diffLines = explode(PHP_EOL, $diff);
-
-        while (count($diffLines)) {
-            $line = array_shift($diffLines);
-
-            if (substr($line, 0, 2) == '@@') {
-                array_unshift($diffLines, $line);
-                break;
-            }
-        }
-
-        $lineNumber = 0;
-        $position = 0;
-
-        foreach ($diffLines as $diffLine) {
-            if (preg_match('/@@\s+\-[0-9]+\,[0-9]+\s+\+([0-9]+)\,([0-9]+)/', $diffLine, $matches)) {
-                $lineNumber = (int)$matches[1] - 1;
-            }
-
-            $rtn[$lineNumber] = $position;
-
-            $lineNumber++;
-            $position++;
-        }
-
-        return $rtn;
-    }
-}

PHPCI/Helper/Email.php

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

PHPCI/Helper/Github.php

@@ -48,18 +48,24 @@ class Github
         $res = $http->get($url, $params);
 
         foreach ($res['body'] as $item) {
+
             $results[] = $item;
+
         }
 
         foreach ($res['headers'] as $header) {
+
             if (preg_match('/^Link: <([^>]+)>; rel="next"/', $header, $r)) {
+
                 $host = parse_url($r[1]);
 
                 parse_str($host['query'], $params);
                 $results = $this->makeRecursiveRequest($host['path'], $params, $results);
 
                 break;
+
             }
+
         }
 
         return $results;
@@ -73,7 +79,7 @@ class Github
         $token = Config::getInstance()->get('phpci.github.token');
 
         if (!$token) {
-            return null;
+            die(json_encode(null));
         }
 
         $cache = Cache::getCache(Cache::TYPE_APC);
@@ -102,74 +108,4 @@ class Github
 
         return $rtn;
     }
-
-    /**
-     * Create a comment on a specific file (and commit) in a Github Pull Request.
-     * @param $repo
-     * @param $pullId
-     * @param $commitId
-     * @param $file
-     * @param $line
-     * @param $comment
-     * @return null
-     */
-    public function createPullRequestComment($repo, $pullId, $commitId, $file, $line, $comment)
-    {
-        $token = Config::getInstance()->get('phpci.github.token');
-
-        if (!$token) {
-            return null;
-        }
-
-        $url = '/repos/' . strtolower($repo) . '/pulls/' . $pullId . '/comments';
-
-        $params = array(
-            'body' => $comment,
-            'commit_id' => $commitId,
-            'path' => $file,
-            'position' => $line,
-        );
-
-        $http = new HttpClient('https://api.github.com');
-        $http->setHeaders(array(
-            'Content-Type: application/x-www-form-urlencoded',
-            'Authorization: Basic ' . base64_encode($token . ':x-oauth-basic'),
-        ));
-
-        $http->post($url, json_encode($params));
-    }
-
-    /**
-     * Create a comment on a Github commit.
-     * @param $repo
-     * @param $commitId
-     * @param $file
-     * @param $line
-     * @param $comment
-     * @return null
-     */
-    public function createCommitComment($repo, $commitId, $file, $line, $comment)
-    {
-        $token = Config::getInstance()->get('phpci.github.token');
-
-        if (!$token) {
-            return null;
-        }
-
-        $url = '/repos/' . strtolower($repo) . '/commits/' . $commitId . '/comments';
-
-        $params = array(
-            'body' => $comment,
-            'path' => $file,
-            'position' => $line,
-        );
-
-        $http = new HttpClient('https://api.github.com');
-        $http->setHeaders(array(
-            'Content-Type: application/x-www-form-urlencoded',
-            'Authorization: Basic ' . base64_encode($token . ':x-oauth-basic'),
-        ));
-
-        $http->post($url, json_encode($params));
-    }
 }

PHPCI/Helper/Lang.php

@@ -156,7 +156,7 @@ class Lang
             return null;
         }
 
-        require($langFile);
+        require_once($langFile);
 
         if (is_null($strings) || !is_array($strings) || !count($strings)) {
             return null;

PHPCI/Helper/LoginIsDisabled.php

@@ -12,7 +12,7 @@ namespace PHPCI\Helper;
 use b8\Config;
 
 /**
-* Login Is Disabled Helper - Checks if login is disabled in the view
+* Login Is Disabled Helper - Checks if login is disalbed in the view
 * @author       Stephen Ball <phpci@stephen.rebelinblue.com>
 * @package      PHPCI
 * @subpackage   Web
@@ -20,7 +20,7 @@ use b8\Config;
 class LoginIsDisabled
 {
     /**
-     * Checks if
+     * Checks if 
      * @param $method
      * @param array $params
      * @return mixed|null

PHPCI/Helper/MailerFactory.php

@@ -71,7 +71,7 @@ class MailerFactory
         } else {
             // Check defaults
 
-            switch ($configName) {
+            switch($configName) {
                 case 'smtp_address':
                     return "localhost";
                 case 'default_mailto_address':

PHPCI/Helper/SshKey.php

@@ -39,9 +39,9 @@ class SshKey
 
         $return = array('private_key' => '', 'public_key' => '');
 
-        $output = @shell_exec('ssh-keygen -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"');
+        if ($this->canGenerateKeys()) {
+            shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"');
 
-        if (!empty($output)) {
             $pub = file_get_contents($keyFile . '.pub');
             $prv = file_get_contents($keyFile);
 
@@ -56,4 +56,16 @@ class SshKey
 
         return $return;
     }
+
+    /**
+     * Checks whether or not we can generate keys, by quietly test running ssh-keygen.
+     * @return bool
+     */
+    public function canGenerateKeys()
+    {
+        $keygen = @shell_exec('ssh-keygen --help');
+        $canGenerateKeys = !empty($keygen);
+
+        return $canGenerateKeys;
+    }
 }

PHPCI/Helper/WindowsCommandExecutor.php

@@ -22,9 +22,6 @@ class WindowsCommandExecutor extends BaseCommandExecutor
      */
     protected function findGlobalBinary($binary)
     {
-        $command = sprintf('where %s', $binary);
+        return trim(shell_exec('where ' . $binary));
-        $result = shell_exec($command);
-
-        return trim($result);
     }
 }

PHPCI/Languages/lang.da.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'PHPCI Adgangskode-nulstilling for %s',
     'reset_invalid' => 'Ugyldig anmodning om adgangskode-nulstilling.',
     'email_address' => 'Email-addresse',
-    'login' => 'Login / Email Address',
     'password' => 'Adgangskode',
     'log_in' => 'Log ind',
 
@@ -113,8 +112,6 @@ i din foretrukne hosting-platform.',
 (hvis du ikke har mulighed for at tilføje en phpci.yml fil i projektets repository)',
     'default_branch' => 'Default branch navn',
     'allow_public_status' => 'Tillad offentlig status-side og -billede for dette projekt?',
-    'archived' => 'Archived',
-    'archived_menu' => 'Archived',
     'save_project' => 'Gem Projekt',
 
     'error_mercurial' => 'Mercurial repository-URL skal starte med http:// eller https://',
@@ -128,7 +125,6 @@ i din foretrukne hosting-platform.',
     'all_branches' => 'Alle branches',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Date',
     'project' => 'Projekt',
     'commit' => 'Commit',
     'branch' => 'Branch',
@@ -170,7 +166,6 @@ Services</a> sektionen under dit Bitbucket-repository.',
     'lines_of_code' => 'Kode-linjer',
     'build_log' => 'Build-log',
     'quality_trend' => 'Kvalitets-trend',
-    'codeception_errors' => 'Codeception-fejl',
     'phpmd_warnings' => 'PHPMD-advarsler',
     'phpcs_warnings' => 'PHPCS-advarsler',
     'phpcs_errors' => 'PHPCS-fejl',
@@ -179,7 +174,6 @@ Services</a> sektionen under dit Bitbucket-repository.',
     'phpdoccheck_warnings' => 'Manglende Docblocks',
     'issues' => 'Sager',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Manglende Docblocks',
@@ -196,20 +190,14 @@ Services</a> sektionen under dit Bitbucket-repository.',
     'end' => 'Slut',
     'from' => 'Fra',
     'to' => 'Til',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Tog %d sekunder',
     'build_created' => 'Build Oprettet',
     'build_started' => 'Build Startet',
     'build_finished' => 'Build Afsluttet',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Navn',
@@ -305,15 +293,15 @@ du kører composer update.',
 Kontrollér venligst nedenstående fejl før du fortsætter.',
     'must_be_valid_email' => 'Skal være en gyldig email-adresse.',
     'must_be_valid_url' => 'Skal være en gyldig URL.',
-    'enter_name' => 'Administrator-navn: ',
+    'enter_name' => 'Administrator-navn:',
-    'enter_email' => 'Administrators email-adresse: ',
+    'enter_email' => 'Administrators email-adresse:',
-    'enter_password' => 'Administrator-adgangskode: ',
+    'enter_password' => 'Administrator-adgangskode:',
-    'enter_phpci_url' => 'Din PHPCI URL (eksempelvis "http://phpci.local"): ',
+    'enter_phpci_url' => 'Din PHPCI URL (eksempelvis "http://phpci.local"):',
 
-    'enter_db_host' => 'Indtast dit MySQL-hostnavn [localhost]: ',
+    'enter_db_host' => 'Indtast dit MySQL-hostnavn [localhost]:',
-    'enter_db_name' => 'Indtast dit MySQL database-navn [phpci]: ',
+    'enter_db_name' => 'Indtast dit MySQL database-navn [phpci]:',
-    'enter_db_user' => 'Indtast dit MySQL-brugernavn [phpci]: ',
+    'enter_db_user' => 'Indtast dit MySQL-brugernavn [phpci]:',
-    'enter_db_pass' => 'Indtast dit MySQL-password: ',
+    'enter_db_pass' => 'Indtast dit MySQL-password:',
     'could_not_connect' => 'PHPCI kunne ikke forbinde til MySQL med de angivning oplysninger. Forsøg igen.',
     'setting_up_db' => 'Indlæser database...',
     'user_created' => 'Brugerkonto oprettet!',
@@ -340,12 +328,6 @@ Kontrollér venligst nedenstående fejl før du fortsætter.',
     'create_admin_user' => 'Tilføj en administrator',
     'incorrect_format' => 'Forkert format',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Kør alle PHPCI builds i køen.',
     'finding_builds' => 'Finder builds der skal køres',

PHPCI/Languages/lang.de.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'PHPCI Passwort zurücksetzen für %s',
     'reset_invalid' => 'Fehlerhafte Anfrage für das Zurücksetzen eines Passwortes',
     'email_address' => 'Emailadresse',
-    'login' => 'Login / Emailadresse',
     'password' => 'Passwort',
     'log_in' => 'Einloggen',
 
@@ -102,7 +101,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'remote' => 'Externe URL',
     'local' => 'Lokaler Pfad',
     'hg'    => 'Mercurial',
-    'svn'   => 'Subversion',
 
     'where_hosted' => 'Wo wird Ihr Projekt gehostet?',
     'choose_github' => 'Wählen Sie ein GitHub Repository:',
@@ -115,8 +113,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
                                 (falls Sie Ihrem Projektrepository kein phpci.yml hinzufügen können)',
     'default_branch' => 'Name des Standardbranches',
     'allow_public_status' => 'Öffentliche Statusseite und -bild für dieses Projekt einschalten?',
-    'archived' => 'Archiviert',
-    'archived_menu' => 'Archiviert',
     'save_project' => 'Projekt speichern',
 
     'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen',
@@ -130,7 +126,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'all_branches' => 'Alle Branches',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Datum',
     'project' => 'Projekt',
     'commit' => 'Commit',
     'branch' => 'Branch',
@@ -151,9 +146,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'webhooks_help_bitbucket' => 'Um für dieses Projekt automatisch einen Build zu starten, wenn neue Commits gepushed werden, fügen Sie die untenstehende URL als "POST" Service in der <a href="https://bitbucket.org/%s/admin/services">Services</a>-Sektion Ihres Bitbucket Repositories hinzu.',
 
     // View Build
-    'errors' => 'Fehler',
-    'information' => 'Information',
-
     'build_x_not_found' => 'Build mit ID %d existiert nicht.',
     'build_n' => 'Build %d',
     'rebuild_now' => 'Build neu starten',
@@ -172,7 +164,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'lines_of_code' => 'Anzahl Codezeilen',
     'build_log' => 'Buildprotokoll',
     'quality_trend' => 'Qualitätstrend',
-    'codeception_errors' => 'Codeception Errors',
     'phpmd_warnings' => 'PHPMD Warnings',
     'phpcs_warnings' => 'PHPCS Warnings',
     'phpcs_errors' => 'PHPCS Errors',
@@ -181,21 +172,12 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'phpdoccheck_warnings' => 'Fehlende Docblocks',
     'issues' => 'Probleme',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Fehlende Docblocks',
     'phpmd' => 'PHP Mess Detector',
     'phpspec' => 'PHP Spec',
     'phpunit' => 'PHP Unit',
-    'technical_debt' => 'Technische Schulden',
-    'behat' => 'Behat',
-
-    'codeception_feature' => 'Feature',
-    'codeception_suite' => 'Suite',
-    'codeception_time' => 'Zeit',
-    'codeception_synopsis' => '<strong>%1$d</strong> Tests in <strong>%2$f</strong> Sekunden ausgeführt.
-                               <strong>%3$d</strong> Fehler.',
 
     'file' => 'Datei',
     'line' => 'Zeile',
@@ -206,20 +188,14 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'end' => 'Ende',
     'from' => 'Von',
     'to' => 'Bis',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Benötigte %d Sekunden',
     'build_created' => 'Build erstellt',
     'build_started' => 'Build gestartet',
     'build_finished' => 'Build abgeschlossen',
-    'test_message' => 'Nachricht',
-    'test_no_message' => 'Keine Nachricht',
-    'test_success' => 'Erfolgreich: %d',
-    'test_fail' => 'Fehlschläge: %d',
-    'test_skipped' => 'Übersprungen: %d',
-    'test_error' => 'Fehler: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d Test(s)',
 
     // Users
     'name' => 'Name',
@@ -295,19 +271,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'search_packagist_for_more' => 'Packagist nach mehr Packages durchsuchen',
     'search' => 'Suchen &raquo;',
 
-    // Summary plugin
-    'build-summary' => 'Zusammenfassung',
-    'stage' => 'Abschnitt',
-    'duration' => 'Dauer',
-    'plugin' => 'Plugin',
-    'stage_setup' => 'Vorbereitung',
-    'stage_test' => 'Test',
-    'stage_complete' => 'Vollständig',
-    'stage_success' => 'Erfolg',
-    'stage_failure' => 'Fehlschlag',
-    'stage_broken'  => 'Defekt',
-    'stage_fixed' => 'Behoben',
-
     // Installer
     'installation_url' => 'PHPCI Installations-URL',
     'db_host' => 'Datenbankserver',
@@ -328,9 +291,9 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
                                 Bitte überprüfen Sie die Fehler, bevor Sie fortfahren,',
     'must_be_valid_email' => 'Muss eine gültige Emailadresse sein.',
     'must_be_valid_url' => 'Muss eine valide URL sein.',
-    'enter_name' => 'Name des Administrators: ',
+    'enter_name' => 'Name des Administrators:',
-    'enter_email' => 'Emailadresse des Administrators: ',
+    'enter_email' => 'Emailadresse des Administrators:',
-    'enter_password' => 'Passwort des Administrators: ',
+    'enter_password' => 'Passwort des Administrators:',
     'enter_phpci_url' => 'Ihre PHPCI-URL (z.B. "http://phpci.local"): ',
 
     'enter_db_host' => 'Bitte geben Sie Ihren MySQL-Host ein [localhost]: ',
@@ -363,12 +326,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'create_admin_user' => 'Administratorenbenutzer erstellen',
     'incorrect_format' => 'Falsches Format',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Führe alle ausstehenden PHPCI Builds aus.',
     'finding_builds' => 'Suche verarbeitbare Builds',
@@ -416,18 +373,5 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'build_file_missing' => 'Angegebene Builddatei existiert nicht.',
     'property_file_missing' => 'Angegebene Eigenschaftsdatei existiert nicht.',
     'could_not_process_report' => 'Konnte den von diesem Tool erstellten Bericht nicht verarbeiten.',
-    'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.',
+    'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.'
-
-    // Error Levels:
-    'critical' => 'Kritisch',
-    'high' => 'Hoch',
-    'normal' => 'Normal',
-    'low' => 'Niedrig',
-
-    // Plugins that generate errors:
-    'php_mess_detector' => 'PHP Mess Detector',
-    'php_code_sniffer' => 'PHP Code Sniffer',
-    'php_unit' => 'PHP Unit',
-    'php_cpd' => 'PHP Copy/Paste Detector',
-    'php_docblock_checker' => 'PHP Docblock Checker',
 );

PHPCI/Languages/lang.el.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'PHPCI Επαναφορά Κωδικού για %s',
     'reset_invalid' => 'Μη έγκυρο αίτημα επαναφοράς κωδικού πρόσβασης.',
     'email_address' => 'Διεύθυνση email',
-    'login' => 'Login / Email Address',
     'password' => 'Κωδικός πρόσβασης',
     'log_in' => 'Είσοδος',
 
@@ -114,8 +113,6 @@ PHPCI',
 (αν δεν μπορείτε να προσθέσετε ένα αρχείο phpci.yml στο αποθετήριο έργων)',
     'default_branch' => 'Προκαθορισμένο όνομα διακλάδωσης',
     'allow_public_status' => 'Ενεργοποίηση της σελίδας δημόσιας κατάστασης και την εικόνα για το έργο αυτό;',
-    'archived' => 'Archived',
-    'archived_menu' => 'Archived',
     'save_project' => 'Αποθήκευση έργου',
 
     'error_mercurial' => 'Ο σύνδεσμος URL του ευμετάβλητου αποθετηρίου πρέπει να ξεκινάει με http:// ή https://',
@@ -129,7 +126,6 @@ PHPCI',
     'all_branches' => 'Όλες οι διακλαδώσεις',
     'builds' => 'Κατασκευές',
     'id' => 'Αριθμός αναγνώρισης',
-    'date' => 'Date',
     'project' => 'Έργο',
     'commit' => 'Συνεισφορά',
     'branch' => 'Διακλάδωση',
@@ -170,17 +166,14 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'lines_of_code' => 'Γραμμές Κώδικα',
     'build_log' => 'Αρχείο καταγραφής κατασκευών',
     'quality_trend' => 'Ποιότητα τρέντ',
-    'codeception_errors' => 'Λάθη Codeception',
     'phpmd_warnings' => 'Προειδοποιήσεις PHPMD',
     'phpcs_warnings' => 'Προειδοποιήσεις PHPCS ',
-    'codeception_errors' => 'Λάθη Codeception',
     'phpcs_errors' => 'Λάθη PHPCS',
     'phplint_errors' => 'Λάθη Lint',
     'phpunit_errors' => 'Λάθη PHPUnit ',
     'phpdoccheck_warnings' => 'Χαμένα Docblocks',
     'issues' => 'Θέματα',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Ανιχνευτής Αντιγραφής/Επικόλλησης',
     'phpcs' => 'Sniffer Κώδικα PHP',
     'phpdoccheck' => 'Χαμένα Docblocks',
@@ -197,20 +190,14 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'end' => 'Τέλος',
     'from' => 'Από',
     'to' => 'Προς',
+    'suite' => 'Σουίτα',
+    'test' => 'Τέστ',
     'result' => 'Αποτέλεσμα',
     'ok' => 'ΟΚ',
     'took_n_seconds' => 'Χρειάστηκαν %d δευτερόλεπτα',
     'build_created' => 'Η κατασκευή δημιουργήθηκε',
     'build_started' => 'Η κατασκευή άρχισε',
     'build_finished' => 'Η κατασκευή ολοκληρώθηκε',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Όνομα',
@@ -307,15 +294,15 @@ Services</a> του Bitbucket αποθετηρίου σας.',
 Παρακαλούμε διαβάστε τα παραπάνω λάθη πριν συνεχίσετε.',
     'must_be_valid_email' => 'Πρέπει να είναι μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.',
     'must_be_valid_url' => 'Πρέπει να είναι μια έγκυρη διεύθυνση URL.',
-    'enter_name' => 'Όνομα διαχειριστή: ',
+    'enter_name' => 'Όνομα διαχειριστή:',
-    'enter_email' => 'Ηλ. Διεύθυνση διαχειριστή: ',
+    'enter_email' => 'Ηλ. Διεύθυνση διαχειριστή:',
-    'enter_password' => 'Κωδικός πρόσβασης διαχειριστή: ',
+    'enter_password' => 'Κωδικός πρόσβασης διαχειριστή:',
     'enter_phpci_url' => 'Ο URL σύνδεσμος σας για το PHPCI ("http://phpci.local" για παράδειγμα): ',
 
-    'enter_db_host' => 'Παρακαλώ εισάγετε τον MySQL οικοδεσπότη σας [localhost]: ',
+    'enter_db_host' => 'Παρακαλώ εισάγετε τον MySQL οικοδεσπότη σας [localhost]:',
     'enter_db_name' => 'Παρακαλώ εισάγετε το όνομα της MySQL βάσης δεδομένων σας [phpci]: ',
-    'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της MySQL σας  [phpci]: ',
+    'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της MySQL σας  [phpci]:',
-    'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της MySQL σας: ',
+    'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της MySQL σας:',
     'could_not_connect' => 'Το PHPCI δεν μπόρεσε να συνδεθεί με την MySQL με τα στοχεία που δώσατε. Παρακαλώ δοκιμάστε ξανά.',
     'setting_up_db' => 'Γίνεται ρύθμιση της βάσης δεδομένων σας ...',
     'user_created' => 'Λογαριασμός χρήστη δημιουργήθηκε!',
@@ -342,12 +329,6 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'create_admin_user' => 'Δημιουργήστε ένα χρήστη διαχειριστή',
     'incorrect_format' => 'Λανθασμένη μορφοποίηση',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Εκτελέστε όλες τις εκκρεμείς PHPCI κατασκευές.',
     'finding_builds' => 'Αναζήτηση κατασκευών για επεξεργασία',

PHPCI/Languages/lang.en.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'PHPCI Password Reset for %s',
     'reset_invalid' => 'Invalid password reset request.',
     'email_address' => 'Email Address',
-    'login' => 'Login / Email Address',
     'password' => 'Password',
     'log_in' => 'Log in',
 
@@ -102,7 +101,6 @@ PHPCI',
     'remote' => 'Remote URL',
     'local' => 'Local Path',
     'hg'    => 'Mercurial',
-    'svn'   => 'Subversion',
 
     'where_hosted' => 'Where is your project hosted?',
     'choose_github' => 'Choose a GitHub repository:',
@@ -115,8 +113,6 @@ PHPCI',
                                 (if you cannot add a phpci.yml file in the project repository)',
     'default_branch' => 'Default branch name',
     'allow_public_status' => 'Enable public status page and image for this project?',
-    'archived' => 'Archived',
-    'archived_menu' => 'Archived',
     'save_project' => 'Save Project',
 
     'error_mercurial' => 'Mercurial repository URL must be start with http:// or https://',
@@ -130,7 +126,6 @@ PHPCI',
     'all_branches' => 'All Branches',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Date',
     'project' => 'Project',
     'commit' => 'Commit',
     'branch' => 'Branch',
@@ -154,9 +149,6 @@ PHPCI',
                                 Services</a> section of your Bitbucket repository.',
 
     // View Build
-    'errors' => 'Errors',
-    'information' => 'Information',
-
     'build_x_not_found' => 'Build with ID %d does not exist.',
     'build_n' => 'Build %d',
     'rebuild_now' => 'Rebuild Now',
@@ -175,7 +167,6 @@ PHPCI',
     'lines_of_code' => 'Lines of Code',
     'build_log' => 'Build Log',
     'quality_trend' => 'Quality Trend',
-    'codeception_errors' => 'Codeception Errors',
     'phpmd_warnings' => 'PHPMD Warnings',
     'phpcs_warnings' => 'PHPCS Warnings',
     'phpcs_errors' => 'PHPCS Errors',
@@ -184,21 +175,12 @@ PHPCI',
     'phpdoccheck_warnings' => 'Missing Docblocks',
     'issues' => 'Issues',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Missing Docblocks',
     'phpmd' => 'PHP Mess Detector',
     'phpspec' => 'PHP Spec',
     'phpunit' => 'PHP Unit',
-    'technical_debt' => 'Technical Debt',
-    'behat' => 'Behat',
-
-    'codeception_feature' => 'Feature',
-    'codeception_suite' => 'Suite',
-    'codeception_time' => 'Time',
-    'codeception_synopsis' => '<strong>%1$d</strong> tests carried out in <strong>%2$f</strong> seconds.
-                               <strong>%3$d</strong> failures.',
 
     'file' => 'File',
     'line' => 'Line',
@@ -209,20 +191,14 @@ PHPCI',
     'end' => 'End',
     'from' => 'From',
     'to' => 'To',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Result',
     'ok' => 'OK',
     'took_n_seconds' => 'Took %d seconds',
     'build_created' => 'Build Created',
     'build_started' => 'Build Started',
     'build_finished' => 'Build Finished',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Name',
@@ -299,19 +275,6 @@ PHPCI',
     'search_packagist_for_more' => 'Search Packagist for more packages',
     'search' => 'Search &raquo;',
 
-    // Summary plugin
-    'build-summary' => 'Summary',
-    'stage' => 'Stage',
-    'duration' => 'Duration',
-    'plugin' => 'Plugin',
-    'stage_setup' => 'Setup',
-    'stage_test' => 'Test',
-    'stage_complete' => 'Complete',
-    'stage_success' => 'Success',
-    'stage_failure' => 'Failure',
-    'stage_broken'  => 'Broken',
-    'stage_fixed' => 'Fixed',
-
     // Installer
     'installation_url' => 'PHPCI Installation URL',
     'db_host' => 'Database Host',
@@ -332,9 +295,9 @@ PHPCI',
                                 Please review the errors above before continuing.',
     'must_be_valid_email' => 'Must be a valid email address.',
     'must_be_valid_url' => 'Must be a valid URL.',
-    'enter_name' => 'Admin Name: ',
+    'enter_name' => 'Admin Name:',
-    'enter_email' => 'Admin Email: ',
+    'enter_email' => 'Admin Email:',
-    'enter_password' => 'Admin Password: ',
+    'enter_password' => 'Admin Password:',
     'enter_phpci_url' => 'Your PHPCI URL ("http://phpci.local" for example): ',
 
     'enter_db_host' => 'Please enter your MySQL host [localhost]: ',
@@ -367,15 +330,6 @@ PHPCI',
     'create_admin_user' => 'Create an admin user',
     'incorrect_format' => 'Incorrect format',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    '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.',
     'finding_builds' => 'Finding builds to process',
@@ -423,22 +377,5 @@ PHPCI',
     'build_file_missing' => 'Specified build file does not exist.',
     'property_file_missing' => 'Specified property file does not exist.',
     'could_not_process_report' => 'Could not process the report generated by this tool.',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
+    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.'
-
-
-    // Error Levels:
-    'critical' => 'Critical',
-    'high' => 'High',
-    'normal' => 'Normal',
-    'low' => 'Low',
-
-    // Plugins that generate errors:
-    'php_mess_detector' => 'PHP Mess Detector',
-    'php_code_sniffer' => 'PHP Code Sniffer',
-    'php_unit' => 'PHP Unit',
-    'php_cpd' => 'PHP Copy/Paste Detector',
-    'php_docblock_checker' => 'PHP Docblock Checker',
-    'behat' => 'Behat',
-    'technical_debt' => 'Technical Debt',
-
 );

PHPCI/Languages/lang.es.php

@@ -1,387 +0,0 @@
-<?php
-/**
- * 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/
- */
-
-$strings = array(
-    'language_name' => 'Español',
-    'language' => 'Lenguaje',
-
-    // Log in:
-    'log_in_to_phpci' => 'Ingresar a PHPCI',
-    'login_error' => 'Email o contraseña incorrectos',
-    'forgotten_password_link' => '¿Olvidaste tu contraseña?',
-    'reset_emailed' => 'Te hemos enviado un email para reiniciar tu contraseña.',
-    'reset_header' => '<strong>¡No te preocupes!</strong><br>Solo tienes que ingresar tu dirección de email
-                            y te enviaremos por email un enlace para reiniciar tu contraseña.',
-    'reset_email_address' => 'Ingresa tu dirección de email:',
-    'reset_send_email' => 'Enviar enlace',
-    'reset_enter_password' => 'Ingresa una nueva contraseña',
-    'reset_new_password' => 'Nueva contraseña:',
-    'reset_change_password' => 'Cambiar contraseña',
-    'reset_no_user_exists' => 'No existe ningún usuario con ese email, por favor intenta  nuevamente.',
-    'reset_email_body' => 'Hola %s,
-
-Has recibido este correo porque tú, o alguien más, ha solicitado reiniciar la contraseña de PHPCI
-
-Si fuiste tú, por favor haz click en el siguiente enlace para reiniciar tu contraseña: %ssession/reset-password/%d/%s
-
-De lo contrario, por favor ignora este correo y ninguna acción será realizada.
-
-Gracias,
-
-PHPCI',
-
-    'reset_email_title' => 'Reiniciar contraseña de PHPCI para %s',
-    'reset_invalid' => 'Pedido inválido.',
-    'email_address' => 'Dirección de email',
-    'password' => 'Contraseña',
-    'log_in' => 'Ingresar',
-
-
-    // Top Nav
-    'toggle_navigation' => 'Activar navegación',
-    'n_builds_pending' => '%d builds pendientes',
-    'n_builds_running' => '%d builds ejecutándose',
-    'edit_profile' => 'Editar Perfil',
-    'sign_out' => 'Cerrar Sesión',
-    'branch_x' => 'Rama: %s',
-    'created_x' => 'Creada el: %s',
-    'started_x' => 'Comenzó: %s',
-
-    // Sidebar
-    'hello_name' => 'Hola, %s',
-    'dashboard' => 'Escritorio',
-    'admin_options' => 'Opciones de Admin.',
-    'add_project' => 'Agregar Proyecto',
-    'settings' => 'Configuración',
-    'manage_users' => 'Administrar Usuarios',
-    'plugins' => 'Plugins',
-    'view' => 'Vista',
-    'build_now' => 'Ejecutar Build',
-    'edit_project' => 'Editar Proyecto',
-    'delete_project' => 'Eliminar Proyecto',
-
-    // Project Summary:
-    'no_builds_yet' => '¡No existen builds aún!',
-    'x_of_x_failed' => '%d de los últimos %d builds fallaron.',
-    'x_of_x_failed_short' => '%d / %d fallaron.',
-    'last_successful_build' => ' El último build exitoso fue %s.',
-    'never_built_successfully' => ' Este proyecto nunca tuvo un build exitoso.',
-    'all_builds_passed' => 'Todos los últimos %d builds pasaron.',
-    'all_builds_passed_short' => '%d / %d pasaron.',
-    'last_failed_build' => ' El último build en fallar fue %s.',
-    'never_failed_build' => ' Este proyecto no tiene ningún build fallido.',
-    'view_project' => 'Ver Proyecto',
-
-    // Timeline:
-    'latest_builds' => 'Últimos builds',
-    'pending' => 'Pediente',
-    'running' => 'Ejecutando',
-    'success' => 'Éxito',
-    'successful' => 'Exitoso',
-    'failed' => 'Falló',
-    'manual_build' => 'Build Manual',
-
-    // Add/Edit Project:
-    'new_project' => 'Nuevo Proyecto',
-    'project_x_not_found' => 'El Proyecto con ID %d no existe.',
-    'project_details' => 'Detalles del Proyecto',
-    'public_key_help' => 'Para facilitarte, hemos generado un par de llaves SSH para que uses en este proyecto.
-    Para usarlo, sólo agrega la siguiente llave pública a la sección de "deploy keys"
-                            de tu plataforma de hosting de versionado de código.',
-    'select_repository_type' => 'Selecciona tipo de repositorio...',
-    'github' => 'GitHub',
-    'bitbucket' => 'Bitbucket',
-    'gitlab' => 'GitLab',
-    'remote' => 'URL Remota',
-    'local' => 'Path local',
-    'hg'    => 'Mercurial',
-    'svn'   => 'Subversion',
-
-    'where_hosted' => '¿Dónde está alojado tu proyecto?',
-    'choose_github' => 'Selecciona un repositorio de GitHub:',
-
-    'repo_name' => 'Nombre del repositorio / URL (Remoto) o Ruta (Local)',
-    'project_title' => 'Titulo del proyecto',
-    'project_private_key' => 'Clave privada a usar para acceder al repositorio
-                                (dejar en blanco para remotos locales o anónimos)',
-    'build_config' => 'Configuración PHPCI para builds del proyecto
-                                (en caso que no puedas agregar el archivo phpci.yml al repositorio)',
-    'default_branch' => 'Nombre de la rama por defecto',
-    'allow_public_status' => '¿Activar página pública con el estado del proyecto?',
-    'archived' => 'Archivado',
-    'archived_menu' => 'Archivado',
-    'save_project' => 'Guardar Proyecto',
-
-    'error_mercurial' => 'La URL del repositorio de Mercurial debe comenzar con http:// or https://',
-    'error_remote' => 'La URL del repositorio debe comenzar con git://, http:// or https://',
-    'error_gitlab' => 'El nombre del repositorio de GitLab debe tener el formato "user@domain.tld:owner/repo.git"',
-    'error_github' => 'El nombre del repositorio debe tener el formato "owner/repo"',
-    'error_bitbucket' => 'El nombre del repo debe tener el formato "owner/repo"',
-    'error_path' => 'La ruta especificada no existe.',
-
-    // View Project:
-    'all_branches' => 'Todas las ramas',
-    'builds' => 'Builds',
-    'id' => 'ID',
-    'project' => 'Proyecto',
-    'commit' => 'Commit',
-    'branch' => 'Rama',
-    'status' => 'Estado',
-    'prev_link' => '&laquo; Anterior',
-    'next_link' => 'Siguiente &raquo;',
-    'public_key' => 'Llave pública',
-    'delete_build' => 'Eliminar Build',
-
-    'webhooks' => 'Webhooks',
-    'webhooks_help_github' => 'Para compilar automáticamente este proyecto cada vez que se realiza un commit, agreagar la siguiente URL
-                                como un nuevo "webhook" en la sección <a href="https://github.com/%s/settings/hooks">Webhooks
-                                and Services</a>  de tu repositorio en GitHub.',
-
-    'webhooks_help_gitlab' => 'Para compilar automáticamente este proyecto, cada vez que se realiza un commit, agreagar la siguiente URL
-                                como una "WebHook URL" en la sección "web hooks" de tu repositorio en GitLab.',
-
-    'webhooks_help_bitbucket' => 'Para compilar automáticamente este proyecto, cada vez que se realiza un commit, agreagar la siguiente URL
-                                como un servicio "POST" en la sección
-                                <a href="https://bitbucket.org/%s/admin/services">
-                                Services</a> de tu repositorio en Bitbucket.',
-
-    // View Build
-    'build_x_not_found' => 'El build con ID %d no existe.',
-    'build_n' => 'Build %d',
-    'rebuild_now' => 'Rebuild Ahora',
-
-
-    'committed_by_x' => 'Commit hecho por %s',
-    'commit_id_x' => 'Commit: %s',
-
-    'chart_display' => 'Este gráfico será mostrado una vez que el build se haya completado.',
-
-    'build' => 'Build',
-    'lines' => 'Líneas',
-    'comment_lines' => 'Líneas de comentario',
-    'noncomment_lines' => 'Líneas no comentario',
-    'logical_lines' => 'Líneas lógicas',
-    'lines_of_code' => 'Líneas de código',
-    'build_log' => 'Log',
-    'quality_trend' => 'Tendencia de calidad',
-    'codeception_errors' => 'Errores de Codeception',
-    'phpmd_warnings' => 'PHPMD Warnings',
-    'phpcs_warnings' => 'PHPCS Warnings',
-    'phpcs_errors' => 'PHPCS Errors',
-    'phplint_errors' => 'Lint Errors',
-    'phpunit_errors' => 'PHPUnit Errors',
-    'phpdoccheck_warnings' => 'Docblocks faltantes',
-    'issues' => 'Incidencias',
-
-    'codeception' => 'Codeception',
-    'phpcpd' => 'PHP Copy/Paste Detector',
-    'phpcs' => 'PHP Code Sniffer',
-    'phpdoccheck' => 'Missing Docblocks',
-    'phpmd' => 'PHP Mess Detector',
-    'phpspec' => 'PHP Spec',
-    'phpunit' => 'PHP Unit',
-    'technical_debt' => 'Deuda Técnica',
-    'behat' => 'Behat',
-
-    'file' => 'Archivo',
-    'line' => 'Línea',
-    'class' => 'Clase',
-    'method' => 'Método',
-    'message' => 'Mensaje',
-    'start' => 'Inicio',
-    'end' => 'Fin',
-    'from' => 'De',
-    'to' => 'Para',
-    'suite' => 'Suite',
-    'test' => 'Test',
-    'result' => 'Resultado',
-    'ok' => 'OK',
-    'took_n_seconds' => 'Tomó %d segundos',
-    'build_created' => 'Build Creado',
-    'build_started' => 'Build Comenzado',
-    'build_finished' => 'Build Terminado',
-
-    // Users
-    'name' => 'Nombre',
-    'password_change' => 'Contraseña (dejar en blanco si no quiere cambiarla)',
-    'save' => 'Guardar &raquo;',
-    'update_your_details' => 'Actualizar los detalles',
-    'your_details_updated' => 'Tus detalles han sido actualizados.',
-    'add_user' => 'Agregar Usuario',
-    'is_admin' => '¿Es Admin?',
-    'yes' => 'Si',
-    'no' => 'No',
-    'edit' => 'Editar',
-    'edit_user' => 'Editar Usuario',
-    'delete_user' => 'Delete Usuario',
-    'user_n_not_found' => 'Usuario con ID %d no existe.',
-    'is_user_admin' => '¿Es un usuario administrador?',
-    'save_user' => 'Guardar Usuario',
-
-    // Settings:
-    'settings_saved' => 'Tu configuración ha sido guardada.',
-    'settings_check_perms' => 'Tu configuración no fue guardada, verificar los permisos del archivo config.yml.',
-    'settings_cannot_write' => 'PHPCI no puede escribir en el archivo config.yml file, la configuración no será guardada correctamente
-                                hasta no corregir esto.',
-    'settings_github_linked' => 'Tu cuenta GitHub ha sido conectada.',
-    'settings_github_not_linked' => 'No se pudo conectar a tu cuenta GitHub.',
-    'build_settings' => 'Configuración del Build ',
-    'github_application' => 'Aplicación GitHub',
-    'github_sign_in' => 'Antes de comenzar a utilizar GitHub, tienes que <a href="%s">ingresar</a> y permitir
-                            el acceso a tu cuenta a PHPCI.',
-    'github_phpci_linked' => 'PHPCI ha sido conectado a tu cuenta GitHub.',
-    'github_where_to_find' => 'Donde encontrar estos...',
-    'github_where_help' => 'Si eres priopietario de la aplicaión que quieres usar, puedes encontrar esta información en
-                            el área de configuración de <a href="https://github.com/settings/applications">aplicaciones</a>.',
-
-    'email_settings' => 'Configuraciones de Email',
-    'email_settings_help' => 'Para que PHPCI pueda enviar email con el status de los builds,
-                                debes configurar las siguientes propiedades SMTP.',
-
-    'application_id' => 'ID de aplicación',
-    'application_secret' => 'Application Secret',
-
-    'smtp_server' => 'Servidor SMTP',
-    'smtp_port' => 'Puerto SMTP',
-    'smtp_username' => 'Usuario SMTP',
-    'smtp_password' => 'Contraseña SMTP',
-    'from_email_address' => 'Dirección de email DE',
-    'default_notification_address' => 'Dirección de correo de notificación por defecto',
-    'use_smtp_encryption' => 'Usar encriptación SMTP?',
-    'none' => 'None',
-    'ssl' => 'SSL',
-    'tls' => 'TLS',
-
-    'failed_after' => 'Considerar el build como fallido luego de ',
-    '5_mins' => '5 Minutos',
-    '15_mins' => '15 Minutos',
-    '30_mins' => '30 Minutos',
-    '1_hour' => '1 Hora',
-    '3_hours' => '3 Horas',
-
-    // Plugins
-    'cannot_update_composer' => 'PHPCI no puede actualizar composer.json porque no tiene permisos de escritura.',
-    'x_has_been_removed' => '%s ha sido elimiando.',
-    'x_has_been_added' => '%s ha sido agregado a composer.json y será instalado la próxima vez que ejecutes composer update.',
-    'enabled_plugins' => 'Activar Plugins',
-    'provided_by_package' => 'Provisto por Paquete',
-    'installed_packages' => 'Paquetes Instalados',
-    'suggested_packages' => 'Paquetes Sugeridos',
-    'title' => 'Título',
-    'description' => 'Descripción',
-    'version' => 'Versión',
-    'install' => 'Instalar &raquo;',
-    'remove' => 'Eliminar &raquo;',
-    'search_packagist_for_more' => 'Buscar más paquetes en Packagist',
-    'search' => 'Buscar &raquo;',
-
-    // Installer
-    'installation_url' => 'URL de la instalación PHPCI',
-    'db_host' => 'Host',
-    'db_name' => 'Nombre de la base de datos',
-    'db_user' => 'Usuario de la base de datos',
-    'db_pass' => 'Clave de la base de datos',
-    'admin_name' => 'Nombre del Admin',
-    'admin_pass' => 'Clave del Admin',
-    'admin_email' => 'Email de Admin',
-    'config_path' => 'Ruta al archivo config',
-    'install_phpci' => 'Instalar PHPCI',
-    'welcome_to_phpci' => 'Bienvenido a PHPCI',
-    'please_answer' => 'Por favor, responde las siguientes preguntas:',
-    'phpci_php_req' => 'PHPCI requiere al menos PHP 5.3.8 para funcionar.',
-    'extension_required' => 'Extensión requerida: %s',
-    'function_required' => 'PHPCI debe poder invocar la función %s(). Está deshabilitada en php.ini?',
-    'requirements_not_met' => 'PHPCI no pudo ser instalado, ya que no se cumplen todos los requerimientos.
-                                Por favor, corrige los errores antes de continuar.',
-    'must_be_valid_email' => 'Debe ser una dirección de correos válida.',
-    'must_be_valid_url' => 'Debe ser una URL válida.',
-    'enter_name' => 'Nombre del Admin:',
-    'enter_email' => 'Email del Admin:',
-    'enter_password' => 'Contraseña de Admin:',
-    'enter_phpci_url' => 'La URL de PHPCI ("Por ejemplo: http://phpci.local"): ',
-
-    'enter_db_host' => 'Por favor, ingresa el servidor MySQL [localhost]: ',
-    'enter_db_name' => 'Por favor, ingresa el nombre de la base de datos MySQL [phpci]: ',
-    'enter_db_user' => 'Por favor, ingresa el usuario MySQL [phpci]: ',
-    'enter_db_pass' => 'Por favor, ingresa la contraseña MySQL: ',
-    'could_not_connect' => 'PHPCI no pudo conectarse a MySQL con los datos dados. Por favor, intenta nuevamente.',
-    'setting_up_db' => 'Configurando base de datos... ',
-    'user_created' => '¡Cuenta de usuario creada!',
-    'failed_to_create' => 'PHPCI no pudo crear la cuenta de admin.',
-    'config_exists' => 'El archivo config de PHPCI ya existe y no es vacío.',
-    'update_instead' => 'Si está intentando actualizar PHPCI, por favor, utiliza phpci:update.',
-
-    // Update
-    'update_phpci' => 'Actuliza la base de datos para reflejar los modelos actualizados.',
-    'updating_phpci' => 'Actualizando base de datos PHPCI: ',
-    'not_installed' => 'PHPCI no está instalado.',
-    'install_instead' => 'Por favor, instala PHPCI via phpci:install.',
-
-    // Poll Command
-    'poll_github' => 'Chequear en GitHub si se necesita comenzar un Build.',
-    'no_token' => 'No se encontró ningún token GitHub',
-    'finding_projects' => 'Buscando proyectos para chequear',
-    'found_n_projects' => 'Se encontraron %d proyectos',
-    'last_commit_is' => 'El último commit en GitHub para %s es %s',
-    'adding_new_build' => 'Último commit es diferente a la base de datos, agregando nuevo build.',
-    'finished_processing_builds' => 'Fin de procesamiento de builds.',
-
-    // Create Admin
-    'create_admin_user' => 'Crear un usuario Admin',
-    'incorrect_format' => 'Formato incorrecto',
-
-    // Run Command
-    'run_all_pending' => 'Ejecutar todos los builds PHPCI pendientes.',
-    'finding_builds' => 'Buscando builds a procesar',
-    'found_n_builds' => 'Se encontraron %d builds',
-    'skipping_build' => 'Saltando Build %d - Build del proyecto ya en ejecución.',
-    'marked_as_failed' => 'Build %d falló debido a timeout.',
-
-    // Builder
-    'missing_phpci_yml' => 'Este proyecto no contiene el archivo phpci.yml o está vacío.',
-    'build_success' => 'BUILD EXITOSO',
-    'build_failed' => 'BUILD FALLIDO',
-    'removing_build' => 'Eliminando Build.',
-    'exception' => 'Excepción: ',
-    'could_not_create_working' => 'Imposible crear copia de trabajo.',
-    'working_copy_created' => 'Copia de trabajo creada: %s',
-    'looking_for_binary' => 'Buscando binario: %s',
-    'found_in_path' => 'Encontrado en %s: %s',
-    'running_plugin' => 'EJECUTANDO PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: EXITO',
-    'plugin_failed' => 'PLUGIN: FALLÓ',
-    'plugin_missing' => 'No existe el plugin: %s',
-    'tap_version' => 'TapParser únicamente soporta la verisón 13 de TAP',
-    'tap_error' => 'Cadena de caracteres TAP inválida, el número de tests no coincide con la cuenta de tests declarada.',
-
-    // Build Plugins:
-    'no_tests_performed' => 'No se ejecutaron tests.',
-    'could_not_find' => 'No se encontró %s',
-    'no_campfire_settings' => 'No se especificaron parámetros de conexión para el plugin Campfire',
-    'failed_to_wipe' => 'Imposible eliminar directorio existente %s antes de copiarlo',
-    'passing_build' => 'Build Exitoso',
-    'failing_build' => 'Build Fallido',
-    'log_output' => 'Log de Salida: ',
-    'n_emails_sent' => '%d emails enviados.',
-    'n_emails_failed' => '%d emails no pudieron ser enviados.',
-    'unable_to_set_env' => 'Imposible setear variable de entorno',
-    'tag_created' => 'Tag creado por PHPCI: %s',
-    'x_built_at_x' => 'Build de %PROJECT_TITLE% en %BUILD_URI%',
-    'hipchat_settings' => 'Por favor, definir room y authToken para el plugin hipchat_notify',
-    'irc_settings' => 'Debes configurar un servidor, room y apodo.',
-    'invalid_command' => 'Comando inválido',
-    'import_file_key' => 'Sentencia de importación debe contener una llave \'file\'',
-    'cannot_open_import' => 'Imposible abrir archivo de importación SQL: %s',
-    'unable_to_execute' => 'Imposible ejecutar archivo SQL',
-    'phar_internal_error' => 'Error interno en plugin Phar',
-    'build_file_missing' => 'El archivo de build especificado no existe.',
-    'property_file_missing' => 'El archivo de propiedades especificado no existe.',
-    'could_not_process_report' => 'Imposible procesar el reporte generado por la herramienta.',
-    'shell_not_enabled' => 'El plugin shell no está habilitado. Por favor, habilitalo desde config.yml.'
-);

PHPCI/Languages/lang.fr.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'Réinitialisation du mot de passe PHPCI pour %s',
     'reset_invalid' => 'Requête de réinitialisation de mot de passe invalide.',
     'email_address' => 'Adresse email',
-    'login' => 'Login / Email Address',
     'password' => 'Mot de passe',
     'log_in' => 'Connexion',
 
@@ -114,8 +113,6 @@ PHPCI',
                                 (si vous ne pouvez pas ajouter de fichier phpci.yml à la racine du dépôt)',
     'default_branch' => 'Nom de la branche par défaut',
     'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?',
-    'archived' => 'Archived',
-    'archived_menu' => 'Archived',
     'save_project' => 'Enregistrer le projet',
 
     'error_mercurial' => 'Les URLs de dépôt Mercurial doivent commencer par http:// ou https://',
@@ -129,7 +126,6 @@ PHPCI',
     'all_branches' => 'Toutes les branches',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Date',
     'project' => 'Projet',
     'commit' => 'Commit',
     'branch' => 'Branche',
@@ -171,7 +167,6 @@ PHPCI',
     'lines_of_code' => 'Lignes de code',
     'build_log' => 'Log du build',
     'quality_trend' => 'Tendance de la qualité',
-    'codeception_errors' => 'Erreurs Codeception',
     'phpmd_warnings' => 'Alertes PHPMD',
     'phpcs_warnings' => 'Alertes PHPCS',
     'phpcs_errors' => 'Erreurs PHPCS',
@@ -180,7 +175,6 @@ PHPCI',
     'phpdoccheck_warnings' => 'Blocs de documentation manquants',
     'issues' => 'Tickets',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Missing Docblocks',
@@ -197,20 +191,14 @@ PHPCI',
     'end' => 'Fin',
     'from' => 'À partir de',
     'to' => 'jusque',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Exécuté en %d secondes',
     'build_created' => 'Build créé',
     'build_started' => 'Build démarré',
     'build_finished' => 'Build terminé',
-    'test_message' => 'Message',
-    'test_no_message' => 'Pas de message',
-    'test_success' => 'Réussi(s): %d',
-    'test_fail' => 'Echec(s): %d',
-    'test_skipped' => 'Passé(s): %d',
-    'test_error' => 'Erreurs: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Nom',
@@ -273,7 +261,7 @@ PHPCI',
     // Plugins
     'cannot_update_composer' => 'PHPCI ne peut pas mettre à jour le fichier composer.json pour vous, il n\'est pas modifiable.',
     'x_has_been_removed' => '%s a été supprimé.',
-    'x_has_been_added' => '%s a été ajouté au fichier composer.json pour vous et il sera installé la prochaine fois
+    'x_has_been_added' => '%s a été ajouté au fichier composer.json poru vous et il sera installé la prochaine fois
                             que vous lancerez "composer update".',
     'enabled_plugins' => 'Plugins activés',
     'provided_by_package' => 'Fournis par le paquet',
@@ -287,17 +275,6 @@ PHPCI',
     'search_packagist_for_more' => 'Rechercher sur Packagist pour trouver plus de paquets',
     'search' => 'Rechercher »',
 
-    // Summary plugin
-    'build-summary' => 'Résumé',
-    'stage' => 'Étape',
-    'duration' => 'Durée',
-    'plugin' => 'Plugin',
-    'stage_setup' => 'Préparation',
-    'stage_test' => 'Test',
-    'stage_complete' => 'Terminé',
-    'stage_success' => 'Succes',
-    'stage_failure' => 'Échec',
-
     // Installer
     'installation_url' => 'URL d\'installation de PHPCI',
     'db_host' => 'Hôte de la BDD',
@@ -318,9 +295,9 @@ PHPCI',
                                 Merci de corriger les erreurs ci-dessus avant de continuer.',
     'must_be_valid_email' => 'Doit être une adresse email valide.',
     'must_be_valid_url' => 'Doit être une URL valide.',
-    'enter_name' => 'Nom de l\'admin: ',
+    'enter_name' => 'Nom de l\'admin :',
-    'enter_email' => 'Email de l\'admin: ',
+    'enter_email' => 'Email de l\'admin :',
-    'enter_password' => 'Mot de passe de l\'admin: ',
+    'enter_password' => 'Mot de passe de l\'admin :',
     'enter_phpci_url' => 'Votre URL vers PHPCI (par exemple "http://phpci.local"): ',
 
     'enter_db_host' => 'Merci d\'entrer le nom d\'hôte MySQL [localhost]: ',
@@ -353,12 +330,6 @@ PHPCI',
     'create_admin_user' => 'Créer un utilisateur admin',
     'incorrect_format' => 'Format incorrect',
 
-    // Create Build Command
-    'create_build_project' => 'Créer un build projet',
-    'project_id_argument' => 'ID du projet',
-    'commit_id_option' => 'ID du commit',
-    'branch_name_option' => 'Branche',
-
     // Run Command
     'run_all_pending' => 'Démarrage de tout les builds PHPCI en attente.',
     'finding_builds' => 'Découverte des builds à traiter',

PHPCI/Languages/lang.it.php

@@ -11,24 +11,25 @@ $strings = array(
 
     'language_name' => 'Italiano',
     'language' => 'Lingua',
-
+    
     // Log in:
     'log_in_to_phpci' => 'Accedi a PHPCI',
     'login_error' => 'Indirizzo email o password errati',
     'forgotten_password_link' => 'Hai dimenticato la tua password?',
-    'reset_emailed' => 'Ti abbiamo inviato un link via email per ripristinare la tua password.',
+    'reset_emailed' => 'Ti abbiamo inviato un link per ripristinare la tua password via email.',
     'reset_header' => '<strong>Non preoccuparti!</strong><br>E\' sufficiente inserire il tuo indirizzo email di seguito e ti invieremo una email con il link per il ripristino della tua password.',
     'reset_email_address' => 'Inserisci il tuo indirizzo email:',
     'reset_send_email' => 'Invia il link di reset della password',
     'reset_enter_password' => 'Per favore inserisci la nuova password',
     'reset_new_password' => 'Nuova password:',
     'reset_change_password' => 'Cambia password',
+    'reset_no_user_exists' => 'No user exists with that email address, please try again.',
     'reset_no_user_exists' => 'Non esiste nessun utente con questo indirizzo email, per favore prova ancora.',
     'reset_email_body' => 'Ciao %s,
 
 hai ricevuto questa email perché tu, o qualcun\'altro, ha richiesto un reset della password per PHPCI.
 
-Se questa mail è tua, per favore apri il seguente link per ripristinare la tua password: %ssession/reset-password/%d/%s
+Se questa mail è tua, per favore apri il seguente link per resettare la tua password: %ssession/reset-password/%d/%s
 
 altrimenti, per favore, ignora questa email e nessuna azione verrà intrapresa.
 
@@ -39,7 +40,6 @@ PHPCI',
     'reset_email_title' => 'Ripristino della password di PHPCI per %s',
     'reset_invalid' => 'Richeista di ripristino password non valida.',
     'email_address' => 'Indirizzo Email',
-    'login' => 'Login / Email Address',
     'password' => 'Password',
     'log_in' => 'Accedi',
 
@@ -113,9 +113,7 @@ PHPCI',
                                 (se non puoi aggiungere il file phpci.yml nel repository di questo progetto)',
     'default_branch' => 'Nome del branch di default',
     'allow_public_status' => 'Vuoi rendere pubblica la pagina dello stato e l\'immagine per questo progetto?',
-    'archived' => 'Archived',
+    'save_project' => 'Salca il Progetto',
-    'archived_menu' => 'Archived',
-    'save_project' => 'Salva il Progetto',
 
     'error_mercurial' => 'L\'URL del repository Mercurial URL deve iniziare con http:// o https://',
     'error_remote' => 'L\'URL del repository deve iniziare con git://, http:// o https://',
@@ -129,7 +127,6 @@ PHPCI',
     'all_branches' => 'Tutti i Branche',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Data',
     'project' => 'Progetto',
     'commit' => 'Commit',
     'branch' => 'Branch',
@@ -140,16 +137,16 @@ PHPCI',
     'delete_build' => 'Rimuovi build',
 
     'webhooks' => 'Webhooks',
-    'webhooks_help_github' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi commit,
+    'webhooks_help_github' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi commit,
                                 aggiungi l\'URL seguente come "Webhook" nella sezione
                                 <a href="https://github.com/%s/settings/hooks">Webhooks and Services</a> del tuo
                                 repository su GitHub.',
 
-    'webhooks_help_gitlab' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi commit,
+    'webhooks_help_gitlab' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi commit,
                                 aggiungi l\'URL seguente come "Webhook URL" nella sezione "WebHook URL" del tuo
                                 repository GitLab.',
 
-    'webhooks_help_bitbucket' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi
+    'webhooks_help_bitbucket' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi
                                     commit, aggiungi l\'URL seguente come serizio "POST" nella sezione
                                     <a href="https://bitbucket.org/%s/admin/services">Services</a> del tuo repository su
                                     BITBUCKET.',
@@ -160,7 +157,7 @@ PHPCI',
     'rebuild_now' => 'Esegui nuovamente la build ora',
 
 
-    'committed_by_x' => 'Inviato da %s',
+    'committed_by_x' => 'Committato da %s',
     'commit_id_x' => 'Commit: %s',
 
     'chart_display' => 'Questo grafico verrà mostrato una volta terminata la build.',
@@ -172,17 +169,15 @@ PHPCI',
     'logical_lines' => 'Linee di logica',
     'lines_of_code' => 'Linee di codice',
     'build_log' => 'Log della build',
-    'quality_trend' => 'Trend della qualità',
+    'quality_trend' => 'Trand della qualità',
-    'codeception_errors' => 'Errori di Codeception',
+    'phpmd_warnings' => 'Warning di PHPMD',
-    'phpmd_warnings' => 'Avvisi di PHPMD',
+    'phpcs_warnings' => 'Warning di PHPCS',
-    'phpcs_warnings' => 'Avvisi di PHPCS',
     'phpcs_errors' => 'Errori di PHPCS',
     'phplint_errors' => 'Errori di Lint',
     'phpunit_errors' => 'Errori di PHPUnit',
     'phpdoccheck_warnings' => 'Docblocks mancanti',
     'issues' => 'Segnalazioni',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Docblocks mancanti',
@@ -199,20 +194,14 @@ PHPCI',
     'end' => 'Finisci',
     'from' => 'Da',
     'to' => 'A',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Risultati',
     'ok' => 'OK',
     'took_n_seconds' => 'Sono stati impiegati %d seconds',
     'build_created' => 'Build Creata',
     'build_started' => 'Build Avviata',
     'build_finished' => 'Build Terminata',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Nome',
@@ -239,16 +228,16 @@ PHPCI',
     'settings_github_linked' => 'Il tuo account GitHub è stato collegato.',
     'settings_github_not_linked' => 'Il tuo account GitHub non può essere collegato.',
     'build_settings' => 'Configurazioni della build',
-    'github_application' => 'Applicazione GitHub',
+    'github_application' => 'Applicatzione GitHub',
     'github_sign_in' => 'Prima di poter iniziare ad usare GitHub, è necessario <a href="%s">collegarsi</a> e garantire
                             a PHPCI l\'accesso al tuo account.',
     'github_phpci_linked' => 'PHPCI è stato collegato correttamente al tuo account GitHub.',
     'github_where_to_find' => 'Dove trovare queste...',
-    'github_where_help' => 'Se sei il proprietario dell\'applicazione, puoi trovare queste informazioni nell\'area delle
+    'github_where_help' => 'Se sei il proprietario dell\'applicazione, puoi trovare queste informazioni nell\'are delle
                               configurazioni dell\'<a href="https://github.com/settings/applications">applicazione</a>.',
 
     'email_settings' => 'Impostazioni Email',
-    'email_settings_help' => 'Prima che possa inviare le email con lo status PHPCI, devi configurare l\'SMTP qui sotto.',
+    'email_settings_help' => 'Prima che possa inviare le email con lo status PHPCI, devi configurare l\'SMTP qio sotto.',
 
     'application_id' => 'ID dell\'Applicazione',
     'application_secret' => 'Secret dell\'Applicazione',
@@ -274,7 +263,7 @@ PHPCI',
     // Plugins
     'cannot_update_composer' => 'PHPCI non può aggiornare composer.json per te non essendo scrivibile.',
     'x_has_been_removed' => '%s è stato rimosso.',
-    'x_has_been_added' => '%s è stato aggiunto al file composer.json per te, verrà installato la prossima volta che eseguirai
+    'x_has_been_added' => '%s è stato aggiunto al composer.json per te verrà installato la prossima volta che eseguirai
                             composer update.',
     'enabled_plugins' => 'Plugins attivati',
     'provided_by_package' => 'Fornito dal pacchetto',
@@ -309,9 +298,9 @@ PHPCI',
                                 Per favore controlla gli errori riportati prima di proseguire.',
     'must_be_valid_email' => 'Deve essere un indirizzo email valido.',
     'must_be_valid_url' => 'Deve essere un URL valido.',
-    'enter_name' => 'Nome dell\'amministratore: ',
+    'enter_name' => 'Nome dell\'amministratore:',
-    'enter_email' => 'Email dell\'amministratore: ',
+    'enter_email' => 'Email dell\'amministratore:',
-    'enter_password' => 'Password dell\'amministratore: ',
+    'enter_password' => 'Password dell\'amministratore:',
     'enter_phpci_url' => 'L\'URL di PHPCI ("http://phpci.locale" ad esempio): ',
 
     'enter_db_host' => 'Per favore inserisci l\'host MySQL [localhost]: ',
@@ -344,18 +333,12 @@ PHPCI',
     'create_admin_user' => 'Crea un nuovo utente amministrarore',
     'incorrect_format' => 'Formato errato',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Esegui tutte le build in attesa su PHPCI.',
     'finding_builds' => 'Ricerca delel build da processare',
     'found_n_builds' => 'Trovate %d build',
     'skipping_build' => 'Saltata la build %d - La build del progetto è già in corso.',
-    'marked_as_failed' => 'Build %d è stata contrassegnata come fallita per un timeout.',
+    'marked_as_failed' => 'Build %d è satata contrassegnata come come fallita per un timeout.',
 
     // Builder
     'missing_phpci_yml' => 'Questo progetto non contiene il file phpci.yml, o il file è vuoto.',

PHPCI/Languages/lang.nl.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'PHPCI wachtwoord reset voor %s',
     'reset_invalid' => 'Ongeldig wachtwoord reset verzoek',
     'email_address' => 'E-mailadres',
-    'login' => 'Login / Email Address',
     'password' => 'Wachtwoord',
     'log_in' => 'Log in',
 
@@ -114,8 +113,6 @@ van je gekozen source code hosting platform',
 (indien je geen phpci.yml bestand aan de project repository kan toevoegen)',
     'default_branch' => 'Standaard branch naam',
     'allow_public_status' => 'Publieke statuspagina en afbeelding beschikbaar maken voor dit project?',
-    'archived' => 'Archived',
-    'archived_menu' => 'Archived',
     'save_project' => 'Project opslaan',
 
     'error_mercurial' => 'Mercurial repository URL dient te starten met http:// of https://',
@@ -129,7 +126,6 @@ van je gekozen source code hosting platform',
     'all_branches' => 'Alle brances',
     'builds' => 'Builds',
     'id' => 'ID',
-    'date' => 'Datum',
     'project' => 'Project',
     'commit' => 'Commit',
     'branch' => 'Branch',
@@ -171,7 +167,6 @@ Services</a> sectie van je Bitbucket repository toegevoegd worden.',
     'lines_of_code' => 'Lijnen code',
     'build_log' => 'Build Log',
     'quality_trend' => 'Kwaliteitstrend',
-    'codeception_errors' => 'Codeception Fouten',
     'phpmd_warnings' => 'PHPMD Waarschuwingen',
     'phpcs_warnings' => 'PHPCS Waarschuwingen',
     'phpcs_errors' => 'PHPCS Fouten',
@@ -180,7 +175,6 @@ Services</a> sectie van je Bitbucket repository toegevoegd worden.',
     'phpdoccheck_warnings' => 'Ontbrekende Docblocks',
     'issues' => 'Problemen',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Ontbrekende Docblocks',
@@ -197,20 +191,14 @@ Services</a> sectie van je Bitbucket repository toegevoegd worden.',
     'end' => 'Einde',
     'from' => 'Van',
     'to' => 'Tot',
+    'suite' => 'Suite',
+    'test' => 'Test',
     'result' => 'Resultaat',
     'ok' => 'OK',
     'took_n_seconds' => 'Duurde %d seconden',
     'build_created' => 'Build aangemaakt',
     'build_started' => 'Build gestart',
     'build_finished' => 'Build beëindigd',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Naam',
@@ -307,15 +295,15 @@ keer je composer update uitvoert.',
 Gelieve de fouten na te kijken vooraleer verder te gaan.',
     'must_be_valid_email' => 'Moet een geldig e-mailadres zijn.',
     'must_be_valid_url' => 'Moet een geldige URL zijn.',
-    'enter_name' => 'Administrator naam: ',
+    'enter_name' => 'Administrator naam:',
-    'enter_email' => 'Administrator e-mailadres: ',
+    'enter_email' => 'Administrator e-mailadres:',
-    'enter_password' => 'Administrator wachtwoord: ',
+    'enter_password' => 'Administrator wachtwoord:',
-    'enter_phpci_url' => 'Je PHPCI URL (bijvoorbeeld "http://phpci.local"): ',
+    'enter_phpci_url' => 'Je PHPCI URL (bijvoorbeeld "http://phpci.local")',
 
-    'enter_db_host' => 'Vul je MySQL host in [localhost]: ',
+    'enter_db_host' => 'Vul je MySQL host in [localhost]:',
-    'enter_db_name' => 'Vul je MySQL databasenaam in [phpci]: ',
+    'enter_db_name' => 'Vul je MySQL databasenaam in [phpci]:',
-    'enter_db_user' => 'Vul je MySQL gebruikersnaam in [phpci]: ',
+    'enter_db_user' => 'Vul je MySQL gebruikersnaam in [phpci]:',
-    'enter_db_pass' => 'Vul je MySQL watchtwoord in: ',
+    'enter_db_pass' => 'Vul je MySQL watchtwoord in:',
     'could_not_connect' => 'PHPCI kon met deze gegevens geen verbinding maken met MySQL. Gelieve opnieuw te proberen.',
     'setting_up_db' => 'Database wordt aangemaakt...',
     'user_created' => 'Gebruikersprofiel aangemaakt!',
@@ -342,12 +330,6 @@ Gelieve de fouten na te kijken vooraleer verder te gaan.',
     'create_admin_user' => 'Administrator-gebruiker aanmaken',
     'incorrect_format' => 'Incorrect formaat',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Voer alle wachtende PHPCI builds uit.',
     'finding_builds' => 'Zoekt builds om te verwerken',

PHPCI/Languages/lang.pl.php

@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'Reset Hasła PHPCI dla %s',
     'reset_invalid' => 'Prośba o zmianę hasła jest nieważna.',
     'email_address' => 'Adres email',
-    'login' => 'Login / Email Address',
     'password' => 'Hasło',
     'log_in' => 'Zaloguj się',
 
@@ -102,7 +101,6 @@ od wybranego kodu źródłowego platformy hostingowej.',
     'remote' => 'Zdalny URL ',
     'local' => 'Lokalna Ścieżka ',
     'hg'    => 'Mercurial',
-    'svn' => 'Subversion',
 
     'where_hosted' => 'Gdzie hostowany jest Twój projekt?',
     'choose_github' => 'Wybierz repozytorium GitHub:',
@@ -115,8 +113,6 @@ od wybranego kodu źródłowego platformy hostingowej.',
 (jeśli nie możesz dodać pliku phpci.yml do repozytorium projektu)',
     'default_branch' => 'Domyślna nazwa gałęzi',
     'allow_public_status' => 'Włączyć status publiczny dla tego projektu?',
-    'archived' => 'W archiwum',
-    'archived_menu' => 'W archiwum',
     'save_project' => 'Zachowaj Projekt',
 
     'error_mercurial' => 'URL repozytorium Mercurialnego powinno zaczynać się od http:// and https://',
@@ -130,7 +126,6 @@ od wybranego kodu źródłowego platformy hostingowej.',
     'all_branches' => 'Wszystkie Gałęzie',
     'builds' => 'Budowania',
     'id' => 'ID',
-    'date' => 'Data',
     'project' => 'Projekt',
     'commit' => 'Commit',
     'branch' => 'Gałąź',
@@ -172,7 +167,6 @@ Services</a> repozytoria Bitbucket.',
     'lines_of_code' => 'Linie Kodu',
     'build_log' => 'Log Budowania',
     'quality_trend' => 'Trend Jakości',
-    'codeception_errors' => 'Błędy Codeception',
     'phpmd_warnings' => 'Alerty PHPMD',
     'phpcs_warnings' => 'Alerty PHPCS',
     'phpcs_errors' => 'Błędy PHPCS',
@@ -181,15 +175,12 @@ Services</a> repozytoria Bitbucket.',
     'phpdoccheck_warnings' => 'Brakuje sekcji DocBlock',
     'issues' => 'Problemy',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Brakuje sekcji DocBlock',
     'phpmd' => 'PHP Mess Detector',
-    'phpspec' => 'PHPSpec',
+    'phpspec' => 'Speck PHP',
-    'phpunit' => 'PHPUnit',
+    'phpunit' => 'Jednostka PHP',
-    'technical_debt' => 'Dług technologiczny',
-    'behat' => 'Behat',
 
     'file' => 'Plik',
     'line' => 'Linia',
@@ -200,20 +191,14 @@ Services</a> repozytoria Bitbucket.',
     'end' => 'Koniec',
     'from' => 'Od',
     'to' => 'Do',
+    'suite' => 'Zestaw ',
+    'test' => 'Test',
     'result' => 'Wynik',
     'ok' => 'OK',
     'took_n_seconds' => 'Zajęło %d sekund',
     'build_created' => 'Budowanie Stworzone',
     'build_started' => 'Budowanie Rozpoczęte',
     'build_finished' => 'Budowanie Zakończone',
-    'test_message' => 'Wiadomość',
-    'test_no_message' => 'Brak wiadomości',
-    'test_success' => 'Powodzenie: %d',
-    'test_fail' => 'Niepowodzenia: %d',
-    'test_skipped' => 'Pominęte: %d',
-    'test_error' => 'Błędy: %d',
-    'test_todo' => 'Do zrobienia: %d',
-    'test_total' => '%d test(ów)',
 
     // Users
     'name' => 'Nazwa',
@@ -308,15 +293,15 @@ wywołaniu polecenia composer update.',
 Przejrzyj powyższą listę błędów przed kontynuowaniem.',
     'must_be_valid_email' => 'Poprawny adres email jest wymagany.',
     'must_be_valid_url' => 'Poprawny URL jest wymagany.',
-    'enter_name' => 'Imię Admina: ',
+    'enter_name' => 'Imię Admina:',
-    'enter_email' => 'Email Admina: ',
+    'enter_email' => 'Email Admina:',
-    'enter_password' => 'Hasło Admina: ',
+    'enter_password' => 'Hasło Admina:',
-    'enter_phpci_url' => 'URL PHPCI (na przykład "http://phpci.local"): ',
+    'enter_phpci_url' => 'URL PHPCI (na przykład "http://phpci.local"):',
 
-    'enter_db_host' => 'Wpisz hosta MySQL [host lokalny]: ',
+    'enter_db_host' => 'Wpisz hosta MySQL [host lokalny]:',
-    'enter_db_name' => 'Wpisz nazwę bazy danych MySQL [phpci]: ',
+    'enter_db_name' => 'Wpisz nazwę bazy danych MySQL [phpci]:',
-    'enter_db_user' => 'Wpisz nazwę użytkownika MySQL [phpci]: ',
+    'enter_db_user' => 'Wpisz nazwę użytkownika MySQL [phpci]:',
-    'enter_db_pass' => 'Wpisz hasło MySQL: ',
+    'enter_db_pass' => 'Wpisz hasło MySQL:',
     'could_not_connect' => 'Z podanymi ustawieniami PHPCI nie udało się połączyć z MySQL. Spróbuj ponownie.',
     'setting_up_db' => 'Ustawianie Twojej bazy danych...',
     'user_created' => 'Utworzono konto użytkownika!',
@@ -343,12 +328,6 @@ Przejrzyj powyższą listę błędów przed kontynuowaniem.',
     'create_admin_user' => 'Utwórz admina',
     'incorrect_format' => 'Niepoprawny format',
 
-    // Create Build Command
-    'create_build_project' => 'Utwórz budowanie dla projektu',
-    'project_id_argument' => 'ID projektu',
-    'commit_id_option' => 'ID Commita do budowania',
-    'branch_name_option' => 'Gałąź do budowania',
-
     // Run Command
     'run_all_pending' => 'Uruchom wszystkie oczekujące budowy w PHPCI',
     'finding_builds' => 'Szukam budów do przetwarzania.',

PHPCI/Languages/lang.ru.php

@@ -38,10 +38,10 @@ PHPCI',
     'reset_email_title' => 'Сброс пароля PHPCI для %s',
     'reset_invalid' => 'Некорректный запрос на сброс пароля.',
     'email_address' => 'Email',
-    'login' => 'Логин / Email',
     'password' => 'Пароль',
     'log_in' => 'Войти',
 
+
     // Top Nav
     'toggle_navigation' => 'Скрыть/показать панель навигации',
     'n_builds_pending' => '%d сборок ожидает',
@@ -99,7 +99,6 @@ PHPCI',
     'remote' => 'Внешний URL',
     'local' => 'Локальный путь',
     'hg'    => 'Mercurial',
-    'svn'   => 'Subversion',
 
     'where_hosted' => 'Расположение проекта',
     'choose_github' => 'Выберите GitHub репозиторий:',
@@ -107,13 +106,11 @@ PHPCI',
     'repo_name' => 'Репозиторий / Внешний URL / Локальный путь',
     'project_title' => 'Название проекта',
     'project_private_key' => 'Приватный ключ для доступа к репозиторию
-                              (оставьте поле пустым для локального использования и/или анонимного доступа)',
+                                (оставьте поле пустым для локального использования и/или анонимного доступа)',
     'build_config' => 'Конфигурация сборки проекта для PHPCI
-                       (если вы не добавили файл phpci.yml в репозиторий вашего проекта)',
+                                (если вы не добавили файл phpci.yml в репозиторий вашего проекта)',
     'default_branch' => 'Ветка по умолчанию',
     'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта',
-    'archived' => 'Архивный',
-    'archived_menu' => 'Архив',
     'save_project' => 'Сохранить проект',
 
     'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://',
@@ -127,7 +124,6 @@ PHPCI',
     'all_branches' => 'Все ветки',
     'builds' => 'Сборки',
     'id' => 'ID',
-    'date' => 'Дата',
     'project' => 'Проект',
     'commit' => 'Коммит',
     'branch' => 'Ветка',
@@ -139,13 +135,13 @@ PHPCI',
 
     'webhooks' => 'Webhooks',
     'webhooks_help_github' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже в качестве нового хука в разделе настроек <a href="https://github.com/%s/settings/hooks">Webhooks
-                               and Services</a> вашего GitHub репозитория.',
+                                and Services</a> вашего GitHub репозитория.',
 
     'webhooks_help_gitlab' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже в качестве "WebHook URL"
                                 в разделе "Web Hooks" вашего GitLab репозитория.',
 
     'webhooks_help_bitbucket' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже как "POST" сервис в разделе <a href="https://bitbucket.org/%s/admin/services">
-                                  Services</a> вашего Bitbucket репозитория.',
+                                Services</a> вашего Bitbucket репозитория.',
 
     // View Build
     'build_x_not_found' => 'Сборки с ID %d не существует.',
@@ -166,7 +162,6 @@ PHPCI',
     'lines_of_code' => 'Строк кода',
     'build_log' => 'Лог сборки',
     'quality_trend' => 'Тенденция качества',
-    'codeception_errors' => 'Ошибки Codeception',
     'phpmd_warnings' => 'Предупреждения PHPMD',
     'phpcs_warnings' => 'Предупреждения PHPCS',
     'phpcs_errors' => 'Ошибки PHPCS',
@@ -175,44 +170,30 @@ PHPCI',
     'phpdoccheck_warnings' => 'Пропущенные Docblocks',
     'issues' => 'Проблемы',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Missing Docblocks',
     'phpmd' => 'PHP Mess Detector',
     'phpspec' => 'PHP Spec',
     'phpunit' => 'PHP Unit',
-    'technical_debt' => 'Технические долги',
-    'behat' => 'Behat',
-
-    'codeception_feature' => 'Свойство',
-    'codeception_suite' => 'Набор',
-    'codeception_time' => 'Время',
-    'codeception_synopsis' => 'Тестов выполнено: <strong>%1$d</strong> (за <strong>%2$f</strong> сек.). Провалов: <strong>%3$d</strong>.',
 
     'file' => 'Файл',
     'line' => 'Строка',
     'class' => 'Класс',
     'method' => 'Метод',
     'message' => 'Сообщение',
-    'start' => 'Начало',
+    'start' => 'Запуск',
     'end' => 'Конец',
-    'from' => 'Из',
+    'from' => 'От',
-    'to' => 'В',
+    'to' => 'До',
+    'suite' => 'Комплект',
+    'test' => 'Тест',
     'result' => 'Результат',
     'ok' => 'OK',
     'took_n_seconds' => 'Заняло секунд: %d',
     'build_created' => 'Сборка создана',
     'build_started' => 'Сборка запущена',
     'build_finished' => 'Сборка окончена',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Успешно: %d',
-    'test_fail' => 'Провалено: %d',
-    'test_skipped' => 'Пропущено: %d',
-    'test_error' => 'Ошибок: %d',
-    'test_todo' => 'Todo: %d',
-    'test_total' => 'Тестов: %d',
 
     // Users
     'name' => 'Имя',
@@ -287,19 +268,6 @@ PHPCI',
     'search_packagist_for_more' => 'Искать на Packagist',
     'search' => 'Искать &raquo;',
 
-    // Summary plugin
-    'build-summary' => 'Сводка',
-    'stage' => 'Этап',
-    'duration' => 'Продолжительность',
-    'plugin' => 'Плагин',
-    'stage_setup' => 'Установка',
-    'stage_test' => 'тестирование',
-    'stage_complete' => 'Завершение',
-    'stage_success' => 'Успешное завершение',
-    'stage_failure' => 'Провал',
-    'stage_broken'  => 'Поломка',
-    'stage_fixed' => 'Исправление',
-
     // Installer
     'installation_url' => 'URL-адрес PHPCI для установки',
     'db_host' => 'Хост базы данных',
@@ -320,9 +288,9 @@ PHPCI',
                                 Пожалуйста, просмотрите возникшие ошибки перед тем, как продолжить.',
     'must_be_valid_email' => 'Должен быть корректным email-адресом.',
     'must_be_valid_url' => 'Должен быть корректным URL-адресом.',
-    'enter_name' => 'Имя администратора: ',
+    'enter_name' => 'Имя администратора:',
-    'enter_email' => 'Email администратора: ',
+    'enter_email' => 'Email администратора:',
-    'enter_password' => 'Пароль администратора: ',
+    'enter_password' => 'Пароль администратора:',
     'enter_phpci_url' => 'URL-адрес вашего PHPCI (например: "http://phpci.local"): ',
 
     'enter_db_host' => 'Пожалуйста, введите хост MySQL [localhost]: ',
@@ -355,12 +323,6 @@ PHPCI',
     'create_admin_user' => 'Добавить аккаунт администратора',
     'incorrect_format' => 'Неверный формат',
 
-    // Create Build Command
-    'create_build_project' => 'Создать сборку проекта',
-    'project_id_argument' => 'ID проекта',
-    'commit_id_option' => 'ID коммита для сборки',
-    'branch_name_option' => 'Ветка для сборки',
-
     // Run Command
     'run_all_pending' => 'Запустить все ожидающие PHPCI сборки.',
     'finding_builds' => 'Поиск сборок для запуска',

PHPCI/Languages/lang.uk.php

@@ -8,7 +8,7 @@
  */
 
 $strings = array(
-    'language_name' => 'Українська',
+    'language_name' => 'Український',
     'language' => 'Мова',
 
     // Log in:
@@ -20,10 +20,10 @@ $strings = array(
 і вам буде надіслано листа із посиланням на скидання паролю.',
     'reset_email_address' => 'Введіть свою email адресу:',
     'reset_send_email' => 'Скидання пароля',
-    'reset_enter_password' => 'Введіть, будь ласка, новий пароль',
+    'reset_enter_password' => 'Введіть будь-ласка новий пароль',
     'reset_new_password' => 'Новий пароль:',
     'reset_change_password' => 'Змінити пароль',
-    'reset_no_user_exists' => 'Не існує користувача з такою email адресою, будь ласка, повторіть знову.',
+    'reset_no_user_exists' => 'Не існує користувача з такою email адресою, будь-ласка повторіть знову.',
     'reset_email_body' => 'Привіт, %s,
 
 Ви отримали цей лист, тому що ви або хтось інший запросили скидання пароля в PHPCI.
@@ -39,7 +39,6 @@ PHPCI',
     'reset_email_title' => 'Скидання пароль PHPCI для %s',
     'reset_invalid' => 'Невірний запит скидання паролю.',
     'email_address' => 'Email адреса',
-    'login' => 'Логин / Email адреса',
     'password' => 'Пароль',
     'log_in' => 'Увійти',
 
@@ -63,7 +62,7 @@ PHPCI',
     'manage_users' => 'Управління користувачами',
     'plugins' => 'Плагіни',
     'view' => 'Переглянути',
-    'build_now' => 'Зібрати',
+    'build_now' => 'Збірати',
     'edit_project' => 'Редагувати проект',
     'delete_project' => 'Видалити проект',
 
@@ -113,8 +112,6 @@ PHPCI',
 (якщо ви не додали файл phpci.yml до репозиторію вашого проекту)',
     'default_branch' => 'Назва гілки за замовчуванням',
     'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?',
-    'archived' => 'Архівний',
-    'archived_menu' => 'Архів',
     'save_project' => 'Зберегти проект',
 
     'error_mercurial' => 'URL репозиторію Mercurial повинен починатись із http:// або https://',
@@ -128,7 +125,6 @@ PHPCI',
     'all_branches' => 'Усі гілки',
     'builds' => 'Збірки',
     'id' => 'ID',
-    'date' => 'Дата',
     'project' => 'Проект',
     'commit' => 'Комміт',
     'branch' => 'Гілка',
@@ -171,16 +167,14 @@ PHPCI',
     'lines_of_code' => 'Рядки коду',
     'build_log' => 'Лог збірки',
     'quality_trend' => 'Тенденція якості',
-    'codeception_errors' => 'Помилки Codeception',
     'phpmd_warnings' => 'Попередження PHPMD',
     'phpcs_warnings' => 'Попередження PHPCS',
     'phpcs_errors' => 'Помилки PHPCS',
     'phplint_errors' => 'Помилки Lint',
-    'phpunit_errors' => 'Помилки PHPUnit',
+    'phpunit_errors' => 'Помилки PHPCS',
     'phpdoccheck_warnings' => 'Відсутні Docblocks',
     'issues' => 'Проблеми',
 
-    'codeception' => 'Codeception',
     'phpcpd' => 'PHP Copy/Paste Detector',
     'phpcs' => 'PHP Code Sniffer',
     'phpdoccheck' => 'Відсутні Docblocks',
@@ -189,7 +183,7 @@ PHPCI',
     'phpunit' => 'PHP Unit',
 
     'file' => 'Файл',
-    'line' => 'Рядок',
+    'line' => 'Строка',
     'class' => 'Клас',
     'method' => 'Метод',
     'message' => 'Повідомлення',
@@ -197,20 +191,14 @@ PHPCI',
     'end' => 'Кінець',
     'from' => 'Від',
     'to' => 'До',
+    'suite' => 'Комплект',
+    'test' => 'Тест',
     'result' => 'Результат',
     'ok' => 'OK',
     'took_n_seconds' => 'Зайняло %d секунд',
     'build_created' => 'Збірка створена',
     'build_started' => 'Збірка розпочата',
     'build_finished' => 'Збірка завершена',
-    'test_message' => 'Message',
-    'test_no_message' => 'No message',
-    'test_success' => 'Successful: %d',
-    'test_fail' => 'Failures: %d',
-    'test_skipped' => 'Skipped: %d',
-    'test_error' => 'Errors: %d',
-    'test_todo' => 'Todos: %d',
-    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Ім’я',
@@ -307,15 +295,15 @@ PHPCI',
 Будь ласка, продивіться наявні помилки перед тим, як продовжити.',
     'must_be_valid_email' => 'Повинно бути коректною email адресою.',
     'must_be_valid_url' => 'Повинно бути коректним URL.',
-    'enter_name' => 'Ім’я адміністратора: ',
+    'enter_name' => 'Ім’я адміністратора:',
-    'enter_email' => 'Email адміністратора: ',
+    'enter_email' => 'Email адміністратора:',
-    'enter_password' => 'Пароль адміністратора: ',
+    'enter_password' => 'Пароль адміністратора:',
-    'enter_phpci_url' => 'URL адреса вашого PHPCI (наприклад, "http://phpci.local"): ',
+    'enter_phpci_url' => 'URL адреса вашого PHPCI (наприклад, "http://phpci.local"):',
 
-    'enter_db_host' => 'Будь ласка, введіть хост MySQL [localhost]: ',
+    'enter_db_host' => 'Будь ласка, введіть хост MySQL [localhost]:',
-    'enter_db_name' => 'Будь ласка, введить ім’я бази даних MySQL [phpci]: ',
+    'enter_db_name' => 'Будь ласка, введить ім’я бази даних MySQL [phpci]:',
-    'enter_db_user' => 'Будь ласка, введить ім’я користувача MySQL [phpci]: ',
+    'enter_db_user' => 'Будь ласка, введить ім’я користувача MySQL [phpci]:',
-    'enter_db_pass' => 'Будь ласка, введить ваш пароль MySQL: ',
+    'enter_db_pass' => 'Будь ласка, введить ваш пароль MySQL:',
     'could_not_connect' => 'PHPCI не може підключитися до MySQL із наданими параметрами. Будь ласка, спробуйте ще раз.',
     'setting_up_db' => 'Налаштування вашої бази даних...',
     'user_created' => 'Аккаунт користувача створено!',
@@ -342,12 +330,6 @@ PHPCI',
     'create_admin_user' => 'Створити аккаунт адміністратора',
     'incorrect_format' => 'Невірний формат',
 
-    // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
-
     // Run Command
     'run_all_pending' => 'Запустити всі PHPCI збірки, які очікують.',
     'finding_builds' => 'Пошук збірок для обробки',

PHPCI/Logging/BuildDBLogHandler.php

@@ -12,7 +12,6 @@ namespace PHPCI\Logging;
 use b8\Store\Factory;
 use Monolog\Handler\AbstractProcessingHandler;
 use PHPCI\Model\Build;
-use Psr\Log\LogLevel;
 
 /**
  * Class BuildDBLogHandler writes the build log to the database.

PHPCI/Logging/BuildLogger.php

@@ -67,7 +67,7 @@ class BuildLogger implements LoggerAwareInterface
         }
     }
 
-    /**
+   /**
      * Add a success-coloured message to the log.
      * @param string
      */
@@ -98,17 +98,6 @@ 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
      *

PHPCI/Logging/Handler.php

@@ -70,6 +70,7 @@ class Handler
     public function handleError($level, $message, $file, $line)
     {
         if (error_reporting() & $level) {
+
             $exception_level = isset($this->levels[$level]) ? $this->levels[$level] : $level;
 
             throw new \ErrorException(
@@ -139,6 +140,7 @@ class Handler
     protected function log(\Exception $exception)
     {
         if (null !== $this->logger) {
+
             $message = sprintf(
                 '%s: %s (uncaught exception) at %s line %s',
                 get_class($exception),

PHPCI/Logging/LoggerConfig.php

@@ -9,7 +9,6 @@
 
 namespace PHPCI\Logging;
 
-use Monolog\ErrorHandler;
 use Monolog\Logger;
 
 /**
@@ -20,7 +19,6 @@ class LoggerConfig
 {
     const KEY_ALWAYS_LOADED = "_";
     private $config;
-    private $cache = array();
 
     /**
      * The filepath is expected to return an array which will be
@@ -58,20 +56,9 @@ class LoggerConfig
      */
     public function getFor($name)
     {
-        if (isset($this->cache[$name])) {
-            return $this->cache[$name];
-        }
-
         $handlers = $this->getHandlers(self::KEY_ALWAYS_LOADED);
-        if ($name !== self::KEY_ALWAYS_LOADED) {
+        $handlers = array_merge($handlers, $this->getHandlers($name));
-            $handlers = array_merge($handlers, $this->getHandlers($name));
+        return new Logger($name, $handlers);
-        }
-
-        $logger = new Logger($name, $handlers);
-        ErrorHandler::register($logger);
-        $this->cache[$name] = $logger;
-
-        return $logger;
     }
 
     /**

PHPCI/Migrations/20140513153133_change_build_keys_migration.php

@@ -23,4 +23,4 @@ class ChangeBuildKeysMigration extends AbstractMigration
         $project->renameColumn('ssh_private_key', 'git_key');
         $project->renameColumn('ssh_public_key', 'public_key');
     }
-}
+}

PHPCI/Migrations/20140611170618_choose_branch.php

@@ -37,4 +37,4 @@ class ChooseBranch extends AbstractMigration
         $project = $this->table('project');
         $project->removeColumn('branch')->save();
     }
-}
+}

PHPCI/Migrations/20140730143702_fix_database_columns.php

@@ -20,7 +20,7 @@ class FixDatabaseColumns extends AbstractMigration
         $build->changeColumn('project_id', 'integer', array('null' => false));
         $build->changeColumn('commit_id', 'string', array('limit' => 50, 'null' => false));
         $build->changeColumn('status', 'integer', array('null' => false));
-        $build->changeColumn('log', 'text', array('null' => true));
+        $build->changeColumn('log', 'text', array('null' => true, 'default' => ''));
         $build->changeColumn('branch', 'string', array('limit' => 50, 'null' => false, 'default' => 'master'));
         $build->changeColumn('created', 'datetime', array('null' => true));
         $build->changeColumn('started', 'datetime', array('null' => true));

PHPCI/Migrations/20150131075425_archive_project.php

@@ -1,26 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-class ArchiveProject extends AbstractMigration
-{
-    /**
-     * Migrate Up.
-     */
-    public function up()
-    {
-        $project = $this->table('project');
-        $project->addColumn('archived', 'boolean');
-        $project->save();
-    }
-
-    /**
-     * Migrate Down.
-     */
-    public function down()
-    {
-        $project = $this->table('project');
-        $project->removeColumn('archived');
-        $project->save();
-    }
-}

PHPCI/Migrations/20150203105015_fix_column_types.php

@@ -14,6 +14,7 @@ class FixColumnTypes extends AbstractMigration
         $build = $this->table('build');
         $build->changeColumn('log', 'text', array(
             'null' => true,
+            'default' => '',
             'limit' => MysqlAdapter::TEXT_MEDIUM,
         ));
 
@@ -24,4 +25,4 @@ class FixColumnTypes extends AbstractMigration
             'limit' => MysqlAdapter::TEXT_MEDIUM,
         ));
     }
-}
+}

PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php

@@ -1,30 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-class UniqueEmailAndNameUserFields extends AbstractMigration
-{
-    /**
-     * Migrate Up.
-     */
-    public function up()
-    {
-        $user_table = $this->table('user');
-        $user_table
-            ->addIndex('email', array('unique' => true))
-            ->addIndex('name', array('unique' => true))
-            ->save();
-    }
-
-    /**
-     * Migrate Down.
-     */
-    public function down()
-    {
-        $user_table = $this->table('user');
-        $user_table
-            ->removeIndex('email', array('unique' => true))
-            ->removeIndex('name', array('unique' => true))
-            ->save();
-    }
-}

PHPCI/Migrations/20151008140800_add_project_groups.php

@@ -1,29 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-class AddProjectGroups extends AbstractMigration
-{
-    public function change()
-    {
-        $table = $this->table('project_group');
-        $table->addColumn('title', 'string', array('limit' => 100, 'null' => false));
-        $table->save();
-
-        $group = new \PHPCI\Model\ProjectGroup();
-        $group->setTitle('Projects');
-
-        /** @var \PHPCI\Model\ProjectGroup $group */
-        $group = \b8\Store\Factory::getStore('ProjectGroup')->save($group);
-
-        $table = $this->table('project');
-        $table->addColumn('group_id', 'integer', array(
-            'signed' => true,
-            'null' => false,
-            'default' => $group->getId(),
-        ));
-
-        $table->addForeignKey('group_id', 'project_group', 'id', array('delete'=> 'RESTRICT', 'update' => 'CASCADE'));
-        $table->save();
-    }
-}

PHPCI/Migrations/20151009100610_remove_unique_name_index.php

@@ -1,40 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-class RemoveUniqueNameIndex extends AbstractMigration
-{
-    /**
-     * Change Method.
-     *
-     * Write your reversible migrations using this method.
-     *
-     * More information on writing migrations is available here:
-     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
-     *
-     * The following commands can be used in this method and Phinx will
-     * automatically reverse them when rolling back:
-     *
-     *    createTable
-     *    renameTable
-     *    addColumn
-     *    renameColumn
-     *    addIndex
-     *    addForeignKey
-     *
-     * Remember to call "create()" or "update()" and NOT "save()" when working
-     * with the Table class.
-     */
-    public function change()
-    {
-        $user = $this->table('user');
-
-        if ($user->hasIndex('name', array('unique' => true))) {
-            $user->removeIndex('name', array('unique' => true));
-            $user->save();
-        }
-
-        $user->addIndex('name', array('unique' => false));
-        $user->save();
-    }
-}

PHPCI/Migrations/20151014091859_errors_table.php

@@ -1,24 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class ErrorsTable extends AbstractMigration
-{
-    public function change()
-    {
-        $table = $this->table('build_error');
-        $table->addColumn('build_id', 'integer', array('signed' => true));
-        $table->addColumn('plugin', 'string', array('limit' => 100));
-        $table->addColumn('file', 'string', array('limit' => 250, 'null' => true));
-        $table->addColumn('line_start', 'integer', array('signed' => false, 'null' => true));
-        $table->addColumn('line_end', 'integer', array('signed' => false, 'null' => true));
-        $table->addColumn('severity', 'integer', array('signed' => false, 'limit' => MysqlAdapter::INT_TINY));
-        $table->addColumn('message', 'string', array('limit' => 250));
-        $table->addColumn('created_date', 'datetime');
-        $table->addIndex(array('build_id', 'created_date'), array('unique' => false));
-        $table->addForeignKey('build_id', 'build', 'id', array('delete'=> 'CASCADE', 'update' => 'CASCADE'));
-        $table->save();
-
-    }
-}

PHPCI/Migrations/20151015124825_convert_errors.php

@@ -1,183 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-use PHPCI\Model\BuildMeta;
-use PHPCI\Model\BuildError;
-
-class ConvertErrors extends AbstractMigration
-{
-    /**
-     * @var \PHPCI\Store\BuildMetaStore
-     */
-    protected $metaStore;
-
-    /**
-     * @var \PHPCI\Store\BuildErrorStore
-     */
-    protected $errorStore;
-
-    public function change()
-    {
-        $count = 100;
-
-        $this->metaStore = \b8\Store\Factory::getStore('BuildMeta');
-        $this->errorStore = \b8\Store\Factory::getStore('BuildError');
-
-        while ($count == 100) {
-            $data = $this->metaStore->getErrorsForUpgrade(100);
-            $count = count($data);
-
-            /** @var \PHPCI\Model\BuildMeta $meta */
-            foreach ($data as $meta) {
-                try {
-                    switch ($meta->getMetaKey()) {
-                        case 'phpmd-data':
-                            $this->processPhpMdMeta($meta);
-                            break;
-
-                        case 'phpcs-data':
-                            $this->processPhpCsMeta($meta);
-                            break;
-
-                        case 'phpdoccheck-data':
-                            $this->processPhpDocCheckMeta($meta);
-                            break;
-
-                        case 'phpcpd-data':
-                            $this->processPhpCpdMeta($meta);
-                            break;
-
-                        case 'technicaldebt-data':
-                            $this->processTechnicalDebtMeta($meta);
-                            break;
-                    }
-                } catch (\Exception $ex) {}
-
-                $this->metaStore->delete($meta);
-            }
-        }
-    }
-
-    protected function processPhpMdMeta(BuildMeta $meta)
-    {
-        $data = json_decode($meta->getMetaValue(), true);
-
-        if (is_array($data) && count($data)) {
-            foreach ($data as $error) {
-                $buildError = new BuildError();
-                $buildError->setBuildId($meta->getBuildId());
-                $buildError->setPlugin('php_mess_detector');
-                $buildError->setCreatedDate(new \DateTime());
-                $buildError->setFile($error['file']);
-                $buildError->setLineStart($error['line_start']);
-                $buildError->setLineEnd($error['line_end']);
-                $buildError->setSeverity(BuildError::SEVERITY_HIGH);
-                $buildError->setMessage($error['message']);
-
-                $this->errorStore->save($buildError);
-            }
-        }
-    }
-
-    protected function processPhpCsMeta(BuildMeta $meta)
-    {
-        $data = json_decode($meta->getMetaValue(), true);
-
-        if (is_array($data) && count($data)) {
-            foreach ($data as $error) {
-                $buildError = new BuildError();
-                $buildError->setBuildId($meta->getBuildId());
-                $buildError->setPlugin('php_code_sniffer');
-                $buildError->setCreatedDate(new \DateTime());
-                $buildError->setFile($error['file']);
-                $buildError->setLineStart($error['line']);
-                $buildError->setLineEnd($error['line']);
-                $buildError->setMessage($error['message']);
-
-                switch ($error['type']) {
-                    case 'ERROR':
-                        $buildError->setSeverity(BuildError::SEVERITY_HIGH);
-                        break;
-
-                    case 'WARNING':
-                        $buildError->setSeverity(BuildError::SEVERITY_LOW);
-                        break;
-                }
-
-                $this->errorStore->save($buildError);
-            }
-        }
-    }
-
-    protected function processPhpDocCheckMeta(BuildMeta $meta)
-    {
-        $data = json_decode($meta->getMetaValue(), true);
-
-        if (is_array($data) && count($data)) {
-            foreach ($data as $error) {
-                $buildError = new BuildError();
-                $buildError->setBuildId($meta->getBuildId());
-                $buildError->setPlugin('php_docblock_checker');
-                $buildError->setCreatedDate(new \DateTime());
-                $buildError->setFile($error['file']);
-                $buildError->setLineStart($error['line']);
-                $buildError->setLineEnd($error['line']);
-
-                switch ($error['type']) {
-                    case 'method':
-                        $buildError->setMessage($error['class'] . '::' . $error['method'] . ' is missing a docblock.');
-                        $buildError->setSeverity(BuildError::SEVERITY_NORMAL);
-                        break;
-
-                    case 'class':
-                        $buildError->setMessage('Class ' . $error['class'] . ' is missing a docblock.');
-                        $buildError->setSeverity(BuildError::SEVERITY_LOW);
-                        break;
-                }
-
-                $this->errorStore->save($buildError);
-            }
-        }
-    }
-
-    protected function processPhpCpdMeta(BuildMeta $meta)
-    {
-        $data = json_decode($meta->getMetaValue(), true);
-
-        if (is_array($data) && count($data)) {
-            foreach ($data as $error) {
-                $buildError = new BuildError();
-                $buildError->setBuildId($meta->getBuildId());
-                $buildError->setPlugin('php_cpd');
-                $buildError->setCreatedDate(new \DateTime());
-                $buildError->setFile($error['file']);
-                $buildError->setLineStart($error['line_start']);
-                $buildError->setLineEnd($error['line_end']);
-                $buildError->setSeverity(BuildError::SEVERITY_NORMAL);
-                $buildError->setMessage('Copy and paste detected.');
-
-                $this->errorStore->save($buildError);
-            }
-        }
-    }
-
-    protected function processTechnicalDebtMeta(BuildMeta $meta)
-    {
-        $data = json_decode($meta->getMetaValue(), true);
-
-        if (is_array($data) && count($data)) {
-            foreach ($data as $error) {
-                $buildError = new BuildError();
-                $buildError->setBuildId($meta->getBuildId());
-                $buildError->setPlugin('technical_debt');
-                $buildError->setCreatedDate(new \DateTime());
-                $buildError->setFile($error['file']);
-                $buildError->setLineStart($error['line']);
-                $buildError->setSeverity(BuildError::SEVERITY_NORMAL);
-                $buildError->setMessage($error['message']);
-
-                $this->errorStore->save($buildError);
-            }
-        }
-    }
-}

PHPCI/Migrations/20160623100223_project_table_defaults.php

@@ -1,18 +0,0 @@
-<?php
-
-use Phinx\Migration\AbstractMigration;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class ProjectTableDefaults extends AbstractMigration
-{
-    public function change()
-    {
-        $this->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();
-    }
-}

PHPCI/Model/Base/BuildBase.php

@@ -118,7 +118,7 @@ class BuildBase extends Model
             'default' => null,
         ),
         'log' => array(
-            'type' => 'mediumtext',
+            'type' => 'text',
             'nullable' => true,
             'default' => null,
         ),
@@ -621,18 +621,6 @@ class BuildBase extends Model
         return $this->setProjectId($value->getId());
     }
 
-    /**
-     * Get BuildError models by BuildId for this Build.
-     *
-     * @uses \PHPCI\Store\BuildErrorStore::getByBuildId()
-     * @uses \PHPCI\Model\BuildError
-     * @return \PHPCI\Model\BuildError[]
-     */
-    public function getBuildBuildErrors()
-    {
-        return Factory::getStore('BuildError', 'PHPCI')->getByBuildId($this->getId());
-    }
-
     /**
      * Get BuildMeta models by BuildId for this Build.
      *

PHPCI/Model/Base/BuildErrorBase.php

@@ -1,503 +0,0 @@
-<?php
-
-/**
- * BuildError base model for table: build_error
- */
-
-namespace PHPCI\Model\Base;
-
-use PHPCI\Model;
-use b8\Store\Factory;
-
-/**
- * BuildError Base Model
- */
-class BuildErrorBase extends Model
-{
-    /**
-    * @var array
-    */
-    public static $sleepable = array();
-
-    /**
-    * @var string
-    */
-    protected $tableName = 'build_error';
-
-    /**
-    * @var string
-    */
-    protected $modelName = 'BuildError';
-
-    /**
-    * @var array
-    */
-    protected $data = array(
-        'id' => null,
-        'build_id' => null,
-        'plugin' => null,
-        'file' => null,
-        'line_start' => null,
-        'line_end' => null,
-        'severity' => null,
-        'message' => null,
-        'created_date' => null,
-    );
-
-    /**
-    * @var array
-    */
-    protected $getters = array(
-        // Direct property getters:
-        'id' => 'getId',
-        'build_id' => 'getBuildId',
-        'plugin' => 'getPlugin',
-        'file' => 'getFile',
-        'line_start' => 'getLineStart',
-        'line_end' => 'getLineEnd',
-        'severity' => 'getSeverity',
-        'message' => 'getMessage',
-        'created_date' => 'getCreatedDate',
-
-        // Foreign key getters:
-        'Build' => 'getBuild',
-    );
-
-    /**
-    * @var array
-    */
-    protected $setters = array(
-        // Direct property setters:
-        'id' => 'setId',
-        'build_id' => 'setBuildId',
-        'plugin' => 'setPlugin',
-        'file' => 'setFile',
-        'line_start' => 'setLineStart',
-        'line_end' => 'setLineEnd',
-        'severity' => 'setSeverity',
-        'message' => 'setMessage',
-        'created_date' => 'setCreatedDate',
-
-        // Foreign key setters:
-        'Build' => 'setBuild',
-    );
-
-    /**
-    * @var array
-    */
-    public $columns = array(
-        'id' => array(
-            'type' => 'int',
-            'length' => 11,
-            'primary_key' => true,
-            'auto_increment' => true,
-            'default' => null,
-        ),
-        'build_id' => array(
-            'type' => 'int',
-            'length' => 11,
-            'default' => null,
-        ),
-        'plugin' => array(
-            'type' => 'varchar',
-            'length' => 100,
-            'default' => null,
-        ),
-        'file' => array(
-            'type' => 'varchar',
-            'length' => 250,
-            'nullable' => true,
-            'default' => null,
-        ),
-        'line_start' => array(
-            'type' => 'int',
-            'length' => 11,
-            'nullable' => true,
-            'default' => null,
-        ),
-        'line_end' => array(
-            'type' => 'int',
-            'length' => 11,
-            'nullable' => true,
-            'default' => null,
-        ),
-        'severity' => array(
-            'type' => 'tinyint',
-            'length' => 3,
-            'default' => null,
-        ),
-        'message' => array(
-            'type' => 'varchar',
-            'length' => 250,
-            'default' => null,
-        ),
-        'created_date' => array(
-            'type' => 'datetime',
-            'default' => null,
-        ),
-    );
-
-    /**
-    * @var array
-    */
-    public $indexes = array(
-            'PRIMARY' => array('unique' => true, 'columns' => 'id'),
-            'build_id' => array('columns' => 'build_id, created_date'),
-    );
-
-    /**
-    * @var array
-    */
-    public $foreignKeys = array(
-            'build_error_ibfk_1' => array(
-                'local_col' => 'build_id',
-                'update' => 'CASCADE',
-                'delete' => 'CASCADE',
-                'table' => 'build',
-                'col' => 'id'
-                ),
-    );
-
-    /**
-    * Get the value of Id / id.
-    *
-    * @return int
-    */
-    public function getId()
-    {
-        $rtn    = $this->data['id'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of BuildId / build_id.
-    *
-    * @return int
-    */
-    public function getBuildId()
-    {
-        $rtn    = $this->data['build_id'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of Plugin / plugin.
-    *
-    * @return string
-    */
-    public function getPlugin()
-    {
-        $rtn    = $this->data['plugin'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of File / file.
-    *
-    * @return string
-    */
-    public function getFile()
-    {
-        $rtn    = $this->data['file'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of LineStart / line_start.
-    *
-    * @return int
-    */
-    public function getLineStart()
-    {
-        $rtn    = $this->data['line_start'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of LineEnd / line_end.
-    *
-    * @return int
-    */
-    public function getLineEnd()
-    {
-        $rtn    = $this->data['line_end'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of Severity / severity.
-    *
-    * @return int
-    */
-    public function getSeverity()
-    {
-        $rtn    = $this->data['severity'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of Message / message.
-    *
-    * @return string
-    */
-    public function getMessage()
-    {
-        $rtn    = $this->data['message'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of CreatedDate / created_date.
-    *
-    * @return \DateTime
-    */
-    public function getCreatedDate()
-    {
-        $rtn    = $this->data['created_date'];
-
-        if (!empty($rtn)) {
-            $rtn    = new \DateTime($rtn);
-        }
-        
-        return $rtn;
-    }
-
-    /**
-    * Set the value of Id / id.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setId($value)
-    {
-        $this->_validateNotNull('Id', $value);
-        $this->_validateInt('Id', $value);
-
-        if ($this->data['id'] === $value) {
-            return;
-        }
-
-        $this->data['id'] = $value;
-
-        $this->_setModified('id');
-    }
-
-    /**
-    * Set the value of BuildId / build_id.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setBuildId($value)
-    {
-        $this->_validateNotNull('BuildId', $value);
-        $this->_validateInt('BuildId', $value);
-
-        if ($this->data['build_id'] === $value) {
-            return;
-        }
-
-        $this->data['build_id'] = $value;
-
-        $this->_setModified('build_id');
-    }
-
-    /**
-    * Set the value of Plugin / plugin.
-    *
-    * Must not be null.
-    * @param $value string
-    */
-    public function setPlugin($value)
-    {
-        $this->_validateNotNull('Plugin', $value);
-        $this->_validateString('Plugin', $value);
-
-        if ($this->data['plugin'] === $value) {
-            return;
-        }
-
-        $this->data['plugin'] = $value;
-
-        $this->_setModified('plugin');
-    }
-
-    /**
-    * Set the value of File / file.
-    *
-    * @param $value string
-    */
-    public function setFile($value)
-    {
-        $this->_validateString('File', $value);
-
-        if ($this->data['file'] === $value) {
-            return;
-        }
-
-        $this->data['file'] = $value;
-
-        $this->_setModified('file');
-    }
-
-    /**
-    * Set the value of LineStart / line_start.
-    *
-    * @param $value int
-    */
-    public function setLineStart($value)
-    {
-        $this->_validateInt('LineStart', $value);
-
-        if ($this->data['line_start'] === $value) {
-            return;
-        }
-
-        $this->data['line_start'] = $value;
-
-        $this->_setModified('line_start');
-    }
-
-    /**
-    * Set the value of LineEnd / line_end.
-    *
-    * @param $value int
-    */
-    public function setLineEnd($value)
-    {
-        $this->_validateInt('LineEnd', $value);
-
-        if ($this->data['line_end'] === $value) {
-            return;
-        }
-
-        $this->data['line_end'] = $value;
-
-        $this->_setModified('line_end');
-    }
-
-    /**
-    * Set the value of Severity / severity.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setSeverity($value)
-    {
-        $this->_validateNotNull('Severity', $value);
-        $this->_validateInt('Severity', $value);
-
-        if ($this->data['severity'] === $value) {
-            return;
-        }
-
-        $this->data['severity'] = $value;
-
-        $this->_setModified('severity');
-    }
-
-    /**
-    * Set the value of Message / message.
-    *
-    * Must not be null.
-    * @param $value string
-    */
-    public function setMessage($value)
-    {
-        $this->_validateNotNull('Message', $value);
-        $this->_validateString('Message', $value);
-
-        if ($this->data['message'] === $value) {
-            return;
-        }
-
-        $this->data['message'] = $value;
-
-        $this->_setModified('message');
-    }
-
-    /**
-    * Set the value of CreatedDate / created_date.
-    *
-    * Must not be null.
-    * @param $value \DateTime
-    */
-    public function setCreatedDate($value)
-    {
-        $this->_validateNotNull('CreatedDate', $value);
-        $this->_validateDate('CreatedDate', $value);
-
-        if ($this->data['created_date'] === $value) {
-            return;
-        }
-
-        $this->data['created_date'] = $value;
-
-        $this->_setModified('created_date');
-    }
-
-    /**
-     * Get the Build model for this BuildError by Id.
-     *
-     * @uses \PHPCI\Store\BuildStore::getById()
-     * @uses \PHPCI\Model\Build
-     * @return \PHPCI\Model\Build
-     */
-    public function getBuild()
-    {
-        $key = $this->getBuildId();
-
-        if (empty($key)) {
-            return null;
-        }
-
-        $cacheKey   = 'Cache.Build.' . $key;
-        $rtn        = $this->cache->get($cacheKey, null);
-
-        if (empty($rtn)) {
-            $rtn    = Factory::getStore('Build', 'PHPCI')->getById($key);
-            $this->cache->set($cacheKey, $rtn);
-        }
-
-        return $rtn;
-    }
-
-    /**
-    * Set Build - Accepts an ID, an array representing a Build or a Build model.
-    *
-    * @param $value mixed
-    */
-    public function setBuild($value)
-    {
-        // Is this an instance of Build?
-        if ($value instanceof \PHPCI\Model\Build) {
-            return $this->setBuildObject($value);
-        }
-
-        // Is this an array representing a Build item?
-        if (is_array($value) && !empty($value['id'])) {
-            return $this->setBuildId($value['id']);
-        }
-
-        // Is this a scalar value representing the ID of this foreign key?
-        return $this->setBuildId($value);
-    }
-
-    /**
-    * Set Build - Accepts a Build model.
-    * 
-    * @param $value \PHPCI\Model\Build
-    */
-    public function setBuildObject(\PHPCI\Model\Build $value)
-    {
-        return $this->setBuildId($value->getId());
-    }
-}

PHPCI/Model/Base/BuildMetaBase.php

@@ -99,7 +99,7 @@ class BuildMetaBase extends Model
             'default' => null,
         ),
         'meta_value' => array(
-            'type' => 'mediumtext',
+            'type' => 'text',
             'default' => null,
         ),
     );

PHPCI/Model/Base/ProjectBase.php

@@ -38,14 +38,12 @@ class ProjectBase extends Model
         'reference' => null,
         'branch' => null,
         'ssh_private_key' => null,
+        'ssh_public_key' => null,
         'type' => null,
         'access_information' => null,
         'last_commit' => null,
         'build_config' => null,
-        'ssh_public_key' => null,
         'allow_public_status' => null,
-        'archived' => null,
-        'group_id' => null,
     );
 
     /**
@@ -58,17 +56,14 @@ class ProjectBase extends Model
         'reference' => 'getReference',
         'branch' => 'getBranch',
         'ssh_private_key' => 'getSshPrivateKey',
+        'ssh_public_key' => 'getSshPublicKey',
         'type' => 'getType',
         'access_information' => 'getAccessInformation',
         'last_commit' => 'getLastCommit',
         'build_config' => 'getBuildConfig',
-        'ssh_public_key' => 'getSshPublicKey',
         'allow_public_status' => 'getAllowPublicStatus',
-        'archived' => 'getArchived',
-        'group_id' => 'getGroupId',
 
         // Foreign key getters:
-        'Group' => 'getGroup',
     );
 
     /**
@@ -81,17 +76,14 @@ class ProjectBase extends Model
         'reference' => 'setReference',
         'branch' => 'setBranch',
         'ssh_private_key' => 'setSshPrivateKey',
+        'ssh_public_key' => 'setSshPublicKey',
         'type' => 'setType',
         'access_information' => 'setAccessInformation',
         'last_commit' => 'setLastCommit',
         'build_config' => 'setBuildConfig',
-        'ssh_public_key' => 'setSshPublicKey',
         'allow_public_status' => 'setAllowPublicStatus',
-        'archived' => 'setArchived',
-        'group_id' => 'setGroupId',
 
         // Foreign key setters:
-        'Group' => 'setGroup',
     );
 
     /**
@@ -125,6 +117,11 @@ class ProjectBase extends Model
             'nullable' => true,
             'default' => null,
         ),
+        'ssh_public_key' => array(
+            'type' => 'text',
+            'nullable' => true,
+            'default' => null,
+        ),
         'type' => array(
             'type' => 'varchar',
             'length' => 50,
@@ -147,25 +144,10 @@ class ProjectBase extends Model
             'nullable' => true,
             'default' => null,
         ),
-        'ssh_public_key' => array(
-            'type' => 'text',
-            'nullable' => true,
-            'default' => null,
-        ),
         'allow_public_status' => array(
             'type' => 'int',
             'length' => 11,
         ),
-        'archived' => array(
-            'type' => 'tinyint',
-            'length' => 1,
-            'default' => null,
-        ),
-        'group_id' => array(
-            'type' => 'int',
-            'length' => 11,
-            'default' => 1,
-        ),
     );
 
     /**
@@ -174,20 +156,12 @@ class ProjectBase extends Model
     public $indexes = array(
             'PRIMARY' => array('unique' => true, 'columns' => 'id'),
             'idx_project_title' => array('columns' => 'title'),
-            'group_id' => array('columns' => 'group_id'),
     );
 
     /**
     * @var array
     */
     public $foreignKeys = array(
-            'project_ibfk_1' => array(
-                'local_col' => 'group_id',
-                'update' => 'CASCADE',
-                'delete' => '',
-                'table' => 'project_group',
-                'col' => 'id'
-                ),
     );
 
     /**
@@ -250,6 +224,18 @@ class ProjectBase extends Model
         return $rtn;
     }
 
+    /**
+    * Get the value of SshPublicKey / ssh_public_key.
+    *
+    * @return string
+    */
+    public function getSshPublicKey()
+    {
+        $rtn    = $this->data['ssh_public_key'];
+
+        return $rtn;
+    }
+
     /**
     * Get the value of Type / type.
     *
@@ -298,18 +284,6 @@ class ProjectBase extends Model
         return $rtn;
     }
 
-    /**
-    * Get the value of SshPublicKey / ssh_public_key.
-    *
-    * @return string
-    */
-    public function getSshPublicKey()
-    {
-        $rtn    = $this->data['ssh_public_key'];
-
-        return $rtn;
-    }
-
     /**
     * Get the value of AllowPublicStatus / allow_public_status.
     *
@@ -322,30 +296,6 @@ class ProjectBase extends Model
         return $rtn;
     }
 
-    /**
-    * Get the value of Archived / archived.
-    *
-    * @return int
-    */
-    public function getArchived()
-    {
-        $rtn    = $this->data['archived'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of GroupId / group_id.
-    *
-    * @return int
-    */
-    public function getGroupId()
-    {
-        $rtn    = $this->data['group_id'];
-
-        return $rtn;
-    }
-
     /**
     * Set the value of Id / id.
     *
@@ -444,6 +394,24 @@ class ProjectBase extends Model
         $this->_setModified('ssh_private_key');
     }
 
+    /**
+    * Set the value of SshPublicKey / ssh_public_key.
+    *
+    * @param $value string
+    */
+    public function setSshPublicKey($value)
+    {
+        $this->_validateString('SshPublicKey', $value);
+
+        if ($this->data['ssh_public_key'] === $value) {
+            return;
+        }
+
+        $this->data['ssh_public_key'] = $value;
+
+        $this->_setModified('ssh_public_key');
+    }
+
     /**
     * Set the value of Type / type.
     *
@@ -518,24 +486,6 @@ class ProjectBase extends Model
         $this->_setModified('build_config');
     }
 
-    /**
-    * Set the value of SshPublicKey / ssh_public_key.
-    *
-    * @param $value string
-    */
-    public function setSshPublicKey($value)
-    {
-        $this->_validateString('SshPublicKey', $value);
-
-        if ($this->data['ssh_public_key'] === $value) {
-            return;
-        }
-
-        $this->data['ssh_public_key'] = $value;
-
-        $this->_setModified('ssh_public_key');
-    }
-
     /**
     * Set the value of AllowPublicStatus / allow_public_status.
     *
@@ -556,103 +506,6 @@ class ProjectBase extends Model
         $this->_setModified('allow_public_status');
     }
 
-    /**
-    * Set the value of Archived / archived.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setArchived($value)
-    {
-        $this->_validateNotNull('Archived', $value);
-        $this->_validateInt('Archived', $value);
-
-        if ($this->data['archived'] === $value) {
-            return;
-        }
-
-        $this->data['archived'] = $value;
-
-        $this->_setModified('archived');
-    }
-
-    /**
-    * Set the value of GroupId / group_id.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setGroupId($value)
-    {
-        $this->_validateNotNull('GroupId', $value);
-        $this->_validateInt('GroupId', $value);
-
-        if ($this->data['group_id'] === $value) {
-            return;
-        }
-
-        $this->data['group_id'] = $value;
-
-        $this->_setModified('group_id');
-    }
-
-    /**
-     * Get the ProjectGroup model for this Project by Id.
-     *
-     * @uses \PHPCI\Store\ProjectGroupStore::getById()
-     * @uses \PHPCI\Model\ProjectGroup
-     * @return \PHPCI\Model\ProjectGroup
-     */
-    public function getGroup()
-    {
-        $key = $this->getGroupId();
-
-        if (empty($key)) {
-            return null;
-        }
-
-        $cacheKey   = 'Cache.ProjectGroup.' . $key;
-        $rtn        = $this->cache->get($cacheKey, null);
-
-        if (empty($rtn)) {
-            $rtn    = Factory::getStore('ProjectGroup', 'PHPCI')->getById($key);
-            $this->cache->set($cacheKey, $rtn);
-        }
-
-        return $rtn;
-    }
-
-    /**
-    * Set Group - Accepts an ID, an array representing a ProjectGroup or a ProjectGroup model.
-    *
-    * @param $value mixed
-    */
-    public function setGroup($value)
-    {
-        // Is this an instance of ProjectGroup?
-        if ($value instanceof \PHPCI\Model\ProjectGroup) {
-            return $this->setGroupObject($value);
-        }
-
-        // Is this an array representing a ProjectGroup item?
-        if (is_array($value) && !empty($value['id'])) {
-            return $this->setGroupId($value['id']);
-        }
-
-        // Is this a scalar value representing the ID of this foreign key?
-        return $this->setGroupId($value);
-    }
-
-    /**
-    * Set Group - Accepts a ProjectGroup model.
-    * 
-    * @param $value \PHPCI\Model\ProjectGroup
-    */
-    public function setGroupObject(\PHPCI\Model\ProjectGroup $value)
-    {
-        return $this->setGroupId($value->getId());
-    }
-
     /**
      * Get Build models by ProjectId for this Project.
      *

PHPCI/Model/Base/ProjectGroupBase.php

@@ -1,168 +0,0 @@
-<?php
-
-/**
- * ProjectGroup base model for table: project_group
- */
-
-namespace PHPCI\Model\Base;
-
-use PHPCI\Model;
-use b8\Store\Factory;
-
-/**
- * ProjectGroup Base Model
- */
-class ProjectGroupBase extends Model
-{
-    /**
-    * @var array
-    */
-    public static $sleepable = array();
-
-    /**
-    * @var string
-    */
-    protected $tableName = 'project_group';
-
-    /**
-    * @var string
-    */
-    protected $modelName = 'ProjectGroup';
-
-    /**
-    * @var array
-    */
-    protected $data = array(
-        'id' => null,
-        'title' => null,
-    );
-
-    /**
-    * @var array
-    */
-    protected $getters = array(
-        // Direct property getters:
-        'id' => 'getId',
-        'title' => 'getTitle',
-
-        // Foreign key getters:
-    );
-
-    /**
-    * @var array
-    */
-    protected $setters = array(
-        // Direct property setters:
-        'id' => 'setId',
-        'title' => 'setTitle',
-
-        // Foreign key setters:
-    );
-
-    /**
-    * @var array
-    */
-    public $columns = array(
-        'id' => array(
-            'type' => 'int',
-            'length' => 11,
-            'primary_key' => true,
-            'auto_increment' => true,
-            'default' => null,
-        ),
-        'title' => array(
-            'type' => 'varchar',
-            'length' => 100,
-            'default' => null,
-        ),
-    );
-
-    /**
-    * @var array
-    */
-    public $indexes = array(
-            'PRIMARY' => array('unique' => true, 'columns' => 'id'),
-    );
-
-    /**
-    * @var array
-    */
-    public $foreignKeys = array(
-    );
-
-    /**
-    * Get the value of Id / id.
-    *
-    * @return int
-    */
-    public function getId()
-    {
-        $rtn    = $this->data['id'];
-
-        return $rtn;
-    }
-
-    /**
-    * Get the value of Title / title.
-    *
-    * @return string
-    */
-    public function getTitle()
-    {
-        $rtn    = $this->data['title'];
-
-        return $rtn;
-    }
-
-    /**
-    * Set the value of Id / id.
-    *
-    * Must not be null.
-    * @param $value int
-    */
-    public function setId($value)
-    {
-        $this->_validateNotNull('Id', $value);
-        $this->_validateInt('Id', $value);
-
-        if ($this->data['id'] === $value) {
-            return;
-        }
-
-        $this->data['id'] = $value;
-
-        $this->_setModified('id');
-    }
-
-    /**
-    * Set the value of Title / title.
-    *
-    * Must not be null.
-    * @param $value string
-    */
-    public function setTitle($value)
-    {
-        $this->_validateNotNull('Title', $value);
-        $this->_validateString('Title', $value);
-
-        if ($this->data['title'] === $value) {
-            return;
-        }
-
-        $this->data['title'] = $value;
-
-        $this->_setModified('title');
-    }
-
-    /**
-     * Get Project models by GroupId for this ProjectGroup.
-     *
-     * @uses \PHPCI\Store\ProjectStore::getByGroupId()
-     * @uses \PHPCI\Model\Project
-     * @return \PHPCI\Model\Project[]
-     */
-    public function getGroupProjects()
-    {
-        return Factory::getStore('Project', 'PHPCI')->getByGroupId($this->getId());
-    }
-}

PHPCI/Model/Base/UserBase.php

@@ -106,8 +106,6 @@ class UserBase extends Model
     public $indexes = array(
             'PRIMARY' => array('unique' => true, 'columns' => 'id'),
             'idx_email' => array('unique' => true, 'columns' => 'email'),
-            'email' => array('unique' => true, 'columns' => 'email'),
-            'name' => array('columns' => 'name'),
     );
 
     /**

PHPCI/Model/Build.php

@@ -28,7 +28,7 @@ class Build extends BuildBase
     const STATUS_SUCCESS = 2;
     const STATUS_FAILED = 3;
 
-    public $currentBuildPath;
+    public $currentBuildPath = null;
 
     /**
     * Get link to commit from another source (i.e. Github)
@@ -99,21 +99,16 @@ class Build extends BuildBase
     {
         $build_config = null;
 
+        // Try phpci.yml first:
+        if (is_file($buildPath . '/phpci.yml')) {
+            $build_config = file_get_contents($buildPath . '/phpci.yml');
+        }
+
         // Try getting the project build config from the database:
         if (empty($build_config)) {
             $build_config = $this->getProject()->getBuildConfig();
         }
 
-        // Try .phpci.yml
-        if (is_file($buildPath . '/.phpci.yml')) {
-            $build_config = file_get_contents($buildPath . '/.phpci.yml');
-        }
-
-        // Try phpci.yml first:
-        if (empty($build_config) && is_file($buildPath . '/phpci.yml')) {
-            $build_config = file_get_contents($buildPath . '/phpci.yml');
-        }
-
         // Fall back to zero config plugins:
         if (empty($build_config)) {
             $build_config = $this->getZeroConfigPlugins($builder);
@@ -209,93 +204,4 @@ class Build extends BuildBase
 
         return $rtn;
     }
-
-    /**
-     * Allows specific build types (e.g. Github) to report violations back to their respective services.
-     * @param Builder $builder
-     * @param $plugin
-     * @param $message
-     * @param int $severity
-     * @param null $file
-     * @param null $lineStart
-     * @param null $lineEnd
-     * @return BuildError
-     */
-    public function reportError(
-        Builder $builder,
-        $plugin,
-        $message,
-        $severity = BuildError::SEVERITY_NORMAL,
-        $file = null,
-        $lineStart = null,
-        $lineEnd = null
-    ) {
-        unset($builder);
-
-        $error = new BuildError();
-        $error->setBuild($this);
-        $error->setCreatedDate(new \DateTime());
-        $error->setPlugin($plugin);
-        $error->setMessage($message);
-        $error->setSeverity($severity);
-        $error->setFile($file);
-        $error->setLineStart($lineStart);
-        $error->setLineEnd($lineEnd);
-
-        return Factory::getStore('BuildError')->save($error);
-    }
-
-    /**
-     * Return the path to run this build into.
-     *
-     * @return string|null
-     */
-    public function getBuildPath()
-    {
-        if (!$this->getId()) {
-            return null;
-        }
-
-        if (empty($this->currentBuildPath)) {
-            $buildDirectory = $this->getId() . '_' . substr(md5(microtime(true)), 0, 5);
-            $this->currentBuildPath = PHPCI_BUILD_ROOT_DIR . $buildDirectory . DIRECTORY_SEPARATOR;
-        }
-
-        return $this->currentBuildPath;
-    }
-
-    /**
-     * Removes the build directory.
-     */
-    public function removeBuildDirectory()
-    {
-        $buildPath = $this->getBuildPath();
-
-        if (!$buildPath || !is_dir($buildPath)) {
-            return;
-        }
-
-        exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
-    }
-
-    /**
-     * Get the number of seconds a build has been running for.
-     * @return int
-     */
-    public function getDuration()
-    {
-        $start = $this->getStarted();
-
-        if (empty($start)) {
-            return 0;
-        }
-
-        $end = $this->getFinished();
-
-        if (empty($end)) {
-            $end = new \DateTime();
-        }
-
-        return $end->getTimestamp() - $start->getTimestamp();
-    }
 }

PHPCI/Model/Build/GithubBuild.php

@@ -10,8 +10,6 @@
 namespace PHPCI\Model\Build;
 
 use PHPCI\Builder;
-use PHPCI\Helper\Diff;
-use PHPCI\Helper\Github;
 use PHPCI\Model\Build\RemoteGitBuild;
 
 /**
@@ -45,52 +43,39 @@ class GithubBuild extends RemoteGitBuild
     {
         $token = \b8\Config::getInstance()->get('phpci.github.token');
 
-        if (empty($token) || empty($this->data['id'])) {
+        if (empty($token)) {
             return;
         }
 
         $project    = $this->getProject();
 
-        if (empty($project)) {
-            return;
-        }
-
         $url    = 'https://api.github.com/repos/'.$project->getReference().'/statuses/'.$this->getCommitId();
         $http   = new \b8\HttpClient();
 
-        switch ($this->getStatus()) {
+        switch($this->getStatus())
+        {
             case 0:
             case 1:
                 $status = 'pending';
-                $description = 'PHPCI build running.';
                 break;
             case 2:
                 $status = 'success';
-                $description = 'PHPCI build passed.';
                 break;
             case 3:
                 $status = 'failure';
-                $description = 'PHPCI build failed.';
                 break;
             default:
                 $status = 'error';
-                $description = 'PHPCI build failed to complete.';
                 break;
         }
 
         $phpciUrl = \b8\Config::getInstance()->get('phpci.url');
-
+        $params = array(    'state' => $status,
-        $params = array(
+                            'target_url' => $phpciUrl . '/build/view/' . $this->getId());
-            'state' => $status,
-            'target_url' => $phpciUrl . '/build/view/' . $this->getId(),
-            'description' => $description,
-            'context' => 'PHPCI',
-        );
-
         $headers = array(
             'Authorization: token ' . $token,
             'Content-Type: application/x-www-form-urlencoded'
-        );
+            );
 
         $http->setHeaders($headers);
         $http->request('POST', $url, json_encode($params));
@@ -118,14 +103,10 @@ class GithubBuild extends RemoteGitBuild
     {
         $rtn = parent::getCommitMessage($this->data['commit_message']);
 
-        $project = $this->getProject();
+        $reference = $this->getProject()->getReference();
-
+        $commitLink = '<a target="_blank" href="https://github.com/' . $reference . '/issues/$1">#$1</a>';
-        if (!is_null($project)) {
+        $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn);
-            $reference = $project->getReference();
+        $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '<a target="_blank" href="https://github.com/$1">@$1</a>', $rtn);
-            $commitLink = '<a target="_blank" href="https://github.com/' . $reference . '/issues/$1">#$1</a>';
-            $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn);
-            $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '<a target="_blank" href="https://github.com/$1">@$1</a>', $rtn);
-        }
 
         return $rtn;
     }
@@ -142,7 +123,7 @@ class GithubBuild extends RemoteGitBuild
 
         if ($this->getExtra('build_type') == 'pull_request') {
             $matches = array();
-            preg_match('/[\/:]([a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+)/', $this->getExtra('remote_url'), $matches);
+            preg_match('/\/([a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+)/', $this->getExtra('remote_url'), $matches);
 
             $reference = $matches[1];
             $branch = $this->getExtra('remote_branch');
@@ -151,7 +132,7 @@ class GithubBuild extends RemoteGitBuild
         $link = 'https://github.com/' . $reference . '/';
         $link .= 'blob/' . $branch . '/';
         $link .= '{FILE}';
-        $link .= '#L{LINE}-L{LINE_END}';
+        $link .= '#L{LINE}';
 
         return $link;
     }
@@ -186,69 +167,4 @@ class GithubBuild extends RemoteGitBuild
 
         return $success;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function reportError(
-        Builder $builder,
-        $plugin,
-        $message,
-        $severity = BuildError::SEVERITY_NORMAL,
-        $file = null,
-        $lineStart = null,
-        $lineEnd = null
-    ) {
-        $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart);
-
-        if (!is_null($diffLineNumber)) {
-            $helper = new Github();
-
-            $repo = $this->getProject()->getReference();
-            $prNumber = $this->getExtra('pull_request_number');
-            $commit = $this->getCommitId();
-
-            if (!empty($prNumber)) {
-                $helper->createPullRequestComment($repo, $prNumber, $commit, $file, $diffLineNumber, $message);
-            } else {
-                $helper->createCommitComment($repo, $commit, $file, $diffLineNumber, $message);
-            }
-        }
-
-        return parent::reportError($builder, $plugin, $message, $severity, $file, $lineStart, $lineEnd);
-    }
-
-    /**
-     * Uses git diff to figure out what the diff line position is, based on the error line number.
-     * @param Builder $builder
-     * @param $file
-     * @param $line
-     * @return int|null
-     */
-    protected function getDiffLineNumber(Builder $builder, $file, $line)
-    {
-        $line = (integer)$line;
-
-        $builder->logExecOutput(false);
-
-        $prNumber = $this->getExtra('pull_request_number');
-        $path = $builder->buildPath;
-
-        if (!empty($prNumber)) {
-            $builder->executeCommand('cd %s && git diff origin/%s "%s"', $path, $this->getBranch(), $file);
-        } else {
-            $commitId = $this->getCommitId();
-            $compare = $commitId == 'Manual' ? 'HEAD' : $commitId;
-            $builder->executeCommand('cd %s && git diff %s^^ "%s"', $path, $compare, $file);
-        }
-
-        $builder->logExecOutput(true);
-
-        $diff = $builder->getLastOutput();
-
-        $helper = new Diff();
-        $lines = $helper->getLinePositions($diff);
-
-        return isset($lines[$line]) ? $lines[$line] : null;
-    }
 }

PHPCI/Model/Build/GitlabBuild.php

@@ -47,7 +47,7 @@ class GitlabBuild extends RemoteGitBuild
             'http://%s/%s/blob/%s/{FILE}#L{LINE}',
             $this->getProject()->getAccessInformation("domain"),
             $this->getProject()->getReference(),
-            $this->getCommitId()
+            $this->getBranch()
         );
     }
 

PHPCI/Model/Build/LocalBuild.php

@@ -35,14 +35,12 @@ class LocalBuild extends Build
             return $this->handleConfig($builder, $buildPath) !== false;
         }
 
-        $configHandled = $this->handleConfig($builder, $reference);
+        $buildSettings = $this->handleConfig($builder, $reference);
 
-        if ($configHandled === false) {
+        if ($buildSettings === false) {
             return false;
         }
 
-        $buildSettings = $builder->getConfig('build_settings');
-
         if (isset($buildSettings['prefer_symlink']) && $buildSettings['prefer_symlink'] === true) {
             return $this->handleSymlink($builder, $reference, $buildPath);
         } else {

PHPCI/Model/Build/MercurialBuild.php

@@ -13,87 +13,36 @@ use PHPCI\Model\Build;
 use PHPCI\Builder;
 
 /**
- * Mercurial Build Model
+* Mercurial Build Model
- * @author       Pavel Gopanenko <pavelgopanenko@gmail.com>
+* @author       Pavel Gopanenko <pavelgopanenko@gmail.com>
- * @package      PHPCI
+* @package      PHPCI
- * @subpackage   Core
+* @subpackage   Core
- */
+*/
 class MercurialBuild extends Build
 {
     /**
-     * Get the URL to be used to clone this remote repository.
+    * Get the URL to be used to clone this remote repository.
-     */
+    */
     protected function getCloneUrl()
     {
         return $this->getProject()->getReference();
     }
 
     /**
-     * Create a working copy by cloning, copying, or similar.
+    * Create a working copy by cloning, copying, or similar.
-     */
+    */
     public function createWorkingCopy(Builder $builder, $buildPath)
     {
-        $key = trim($this->getProject()->getSshPublicKey());
+        $this->cloneByHttp($builder, $buildPath);
-
-        if (!empty($key) && strpos($this->getProject()->getReference(), 'ssh') > -1) {
-            $success = $this->cloneBySsh($builder, $buildPath);
-        } else {
-            $success = $this->cloneByHttp($builder, $buildPath);
-        }
-
-        if (!$success) {
-            $builder->logFailure('Failed to clone remote git repository.');
-            return false;
-        }
 
         return $this->handleConfig($builder, $buildPath);
     }
 
     /**
-     * Use a HTTP-based Mercurial clone.
+    * Use an mercurial clone.
-     */
+    */
     protected function cloneByHttp(Builder $builder, $cloneTo)
     {
         return $builder->executeCommand('hg clone %s "%s" -r %s', $this->getCloneUrl(), $cloneTo, $this->getBranch());
     }
-
-    /**
-     * Use an SSH-based Mercurial clone.
-     */
-    protected function cloneBySsh(Builder $builder, $cloneTo)
-    {
-        $keyFile = $this->writeSshKey();
-
-        // Do the git clone:
-        $cmd = 'hg clone --ssh "ssh -i '.$keyFile.'" %s "%s"';
-        $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo);
-
-        if ($success) {
-            $success = $this->postCloneSetup($builder, $cloneTo);
-        }
-
-        // Remove the key file:
-        unlink($keyFile);
-        return $success;
-    }
-
-    /**
-     * Handle post-clone tasks (switching branch, etc.)
-     * @param Builder $builder
-     * @param $cloneTo
-     * @return bool
-     */
-    protected function postCloneSetup(Builder $builder, $cloneTo)
-    {
-        $success = true;
-        $commit = $this->getCommitId();
-
-        // Allow switching to a specific branch:
-        if (!empty($commit) && $commit != 'Manual') {
-            $cmd = 'cd "%s" && hg checkout %s';
-            $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch());
-        }
-
-        return $success;
-    }
 }

PHPCI/Model/Build/RemoteGitBuild.php

@@ -54,7 +54,7 @@ class RemoteGitBuild extends Build
     */
     protected function cloneByHttp(Builder $builder, $cloneTo)
     {
-        $cmd = 'git clone --recursive ';
+        $cmd = 'git clone ';
 
         $depth = $builder->getConfig('clone_depth');
 
@@ -84,7 +84,7 @@ class RemoteGitBuild extends Build
         }
 
         // Do the git clone:
-        $cmd = 'git clone --recursive ';
+        $cmd = 'git clone ';
 
         $depth = $builder->getConfig('clone_depth');
 
@@ -124,16 +124,16 @@ class RemoteGitBuild extends Build
         $success = true;
         $commit = $this->getCommitId();
 
-        $chdir = IS_WIN ? 'cd /d "%s"' : 'cd "%s"';
-
         if (!empty($commit) && $commit != 'Manual') {
-            $cmd = $chdir . ' && git checkout %s --quiet';
+            $cmd = 'cd "%s"';
-            $success = $builder->executeCommand($cmd, $cloneTo, $commit);
-        }
 
-        // Always update the commit hash with the actual HEAD hash
+            if (IS_WIN) {
-        if ($builder->executeCommand($chdir . ' && git rev-parse HEAD', $cloneTo)) {
+                $cmd = 'cd /d "%s"';
-            $this->setCommitId(trim($builder->getLastOutput()));
+            }
+
+            $cmd .= ' && git checkout %s --quiet';
+
+            $success = $builder->executeCommand($cmd, $cloneTo, $this->getCommitId());
         }
 
         return $success;

PHPCI/Model/Build/SubversionBuild.php

@@ -1,182 +0,0 @@
-<?php
-/**
- * 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\Model\Build;
-
-use PHPCI\Model\Build;
-use PHPCI\Builder;
-
-/**
- * Remote Subversion Build Model
- * @author       Nadir Dzhilkibaev <imam.sharif@gmail.com>
- * @package      PHPCI
- * @subpackage   Core
- */
-class SubversionBuild extends Build
-{
-    protected $svnCommand = 'svn export -q --non-interactive ';
-
-    /**
-     * Get the URL to be used to clone this remote repository.
-     */
-    protected function getCloneUrl()
-    {
-        $url = $this->getProject()->getReference();
-
-        if (substr($url, -1) != '/') {
-            $url .= '/';
-        }
-
-        $branch = $this->getBranch();
-
-        if (empty($branch) || $branch == 'trunk') {
-            $url .= 'trunk';
-        } else {
-            $url .= 'branches/' . $branch;
-        }
-
-        return $url;
-    }
-
-    /**
-     * @param Builder $builder
-     *
-     * @return void
-     */
-    protected function extendSvnCommandFromConfig(Builder $builder)
-    {
-        $cmd = $this->svnCommand;
-
-        $svn = $builder->getConfig('svn');
-        if ($svn) {
-            foreach ($svn as $key => $value) {
-                $cmd .= " --$key $value ";
-            }
-        }
-
-        $depth = $builder->getConfig('clone_depth');
-
-        if (!is_null($depth)) {
-            $cmd .= ' --depth ' . intval($depth) . ' ';
-        }
-
-        $this->svnCommand = $cmd;
-    }
-
-    /**
-     * Create a working copy by cloning, copying, or similar.
-     */
-    public function createWorkingCopy(Builder $builder, $buildPath)
-    {
-        $this->handleConfig($builder, $buildPath);
-
-        $this->extendSvnCommandFromConfig($builder);
-
-        $key = trim($this->getProject()->getSshPrivateKey());
-
-        if (!empty($key)) {
-            $success = $this->cloneBySsh($builder, $buildPath);
-        } else {
-            $success = $this->cloneByHttp($builder, $buildPath);
-        }
-
-        if (!$success) {
-            $builder->logFailure('Failed to export remote subversion repository.');
-            return false;
-        }
-
-        return $this->handleConfig($builder, $buildPath);
-    }
-
-    /**
-     * Use an HTTP-based svn export.
-     */
-    protected function cloneByHttp(Builder $builder, $cloneTo)
-    {
-        $cmd = $this->svnCommand;
-
-        if ($this->getCommitId() != 'Manual') {
-            $cmd .= ' -r %s %s "%s"';
-            $success = $builder->executeCommand($cmd, $this->getCommitId(), $this->getCloneUrl(), $cloneTo);
-        } else {
-            $cmd .= ' %s "%s"';
-            $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo);
-        }
-
-        return $success;
-    }
-
-    /**
-     * Use an SSH-based svn export.
-     */
-    protected function cloneBySsh(Builder $builder, $cloneTo)
-    {
-        $cmd = $this->svnCommand . ' %s "%s"';
-
-        if (!IS_WIN) {
-            $keyFile    = $this->writeSshKey($cloneTo);
-            $sshWrapper = $this->writeSshWrapper($cloneTo, $keyFile);
-            $cmd        = 'export SVN_SSH="' . $sshWrapper . '" && ' . $cmd;
-        }
-
-        $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo);
-
-        if (!IS_WIN) {
-            // Remove the key file and svn wrapper:
-            unlink($keyFile);
-            unlink($sshWrapper);
-        }
-
-        return $success;
-    }
-
-    /**
-     * Create an SSH key file on disk for this build.
-     * @param $cloneTo
-     * @return string
-     */
-    protected function writeSshKey($cloneTo)
-    {
-        $keyPath = dirname($cloneTo . '/temp');
-        $keyFile = $keyPath . '.key';
-
-        // Write the contents of this project's svn key to the file:
-        file_put_contents($keyFile, $this->getProject()->getSshPrivateKey());
-        chmod($keyFile, 0600);
-
-        // Return the filename:
-        return $keyFile;
-    }
-
-    /**
-     * Create an SSH wrapper script for Svn to use, to disable host key checking, etc.
-     * @param $cloneTo
-     * @param $keyFile
-     * @return string
-     */
-    protected function writeSshWrapper($cloneTo, $keyFile)
-    {
-        $path        = dirname($cloneTo . '/temp');
-        $wrapperFile = $path . '.sh';
-
-        $sshFlags = '-o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no';
-
-        // Write out the wrapper script for this build:
-        $script = <<<OUT
-#!/bin/sh
-ssh {$sshFlags} -o IdentityFile={$keyFile} $*
-
-OUT;
-
-        file_put_contents($wrapperFile, $script);
-        shell_exec('chmod +x "' . $wrapperFile . '"');
-
-        return $wrapperFile;
-    }
-}

PHPCI/Model/BuildError.php

@@ -1,63 +0,0 @@
-<?php
-
-/**
- * BuildError model for table: build_error
- */
-
-namespace PHPCI\Model;
-
-use PHPCI\Model\Base\BuildErrorBase;
-
-/**
- * BuildError Model
- * @uses PHPCI\Model\Base\BuildErrorBase
- */
-class BuildError extends BuildErrorBase
-{
-    const SEVERITY_CRITICAL = 0;
-    const SEVERITY_HIGH = 1;
-    const SEVERITY_NORMAL = 2;
-    const SEVERITY_LOW = 3;
-
-    /**
-     * Get the language string key for this error's severity level.
-     * @return string
-     */
-    public function getSeverityString()
-    {
-        switch ($this->getSeverity()) {
-            case self::SEVERITY_CRITICAL:
-                return 'critical';
-
-            case self::SEVERITY_HIGH:
-                return 'high';
-
-            case self::SEVERITY_NORMAL:
-                return 'normal';
-
-            case self::SEVERITY_LOW:
-                return 'low';
-        }
-    }
-
-    /**
-     * Get the class to apply to HTML elements representing this error.
-     * @return string
-     */
-    public function getSeverityClass()
-    {
-        switch ($this->getSeverity()) {
-            case self::SEVERITY_CRITICAL:
-                return 'danger';
-
-            case self::SEVERITY_HIGH:
-                return 'warning';
-
-            case self::SEVERITY_NORMAL:
-                return 'info';
-
-            case self::SEVERITY_LOW:
-                return 'default';
-        }
-    }
-}

PHPCI/Model/Project.php

@@ -50,29 +50,6 @@ class Project extends ProjectBase
         return null;
     }
 
-    /**
-     * Return the previous build from a specific branch, for this project.
-     * @param string $branch
-     * @return mixed|null
-     */
-    public function getPreviousBuild($branch = 'master')
-    {
-        $criteria       = array('branch' => $branch, 'project_id' => $this->getId());
-
-        $order          = array('id' => 'DESC');
-        $builds         = Store\Factory::getStore('Build')->getWhere($criteria, 1, 1, array(), $order);
-
-        if (is_array($builds['items']) && count($builds['items'])) {
-            $previous = array_shift($builds['items']);
-
-            if (isset($previous) && $previous instanceof Build) {
-                return $previous;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * Store this project's access_information data
      * @param string|array $value
@@ -96,7 +73,7 @@ class Project extends ProjectBase
         $info = $this->data['access_information'];
 
         // Handle old-format (serialized) access information first:
-        if (!empty($info) && !in_array(substr($info, 0, 1), array('{', '['))) {
+        if (!empty($info) && substr($info, 0, 1) != '{') {
             $data = unserialize($info);
         } else {
             $data = json_decode($info, true);

PHPCI/Model/ProjectGroup.php

@@ -1,18 +0,0 @@
-<?php
-
-/**
- * ProjectGroup model for table: project_group
- */
-
-namespace PHPCI\Model;
-
-use PHPCI\Model\Base\ProjectGroupBase;
-
-/**
- * ProjectGroup Model
- * @uses PHPCI\Model\Base\ProjectGroupBase
- */
-class ProjectGroup extends ProjectGroupBase
-{
-    // This class has been left blank so that you can modify it - changes in this file will not be overwritten.
-}

PHPCI/Plugin.php

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

PHPCI/Plugin/Atoum.php

@@ -10,7 +10,6 @@
 namespace PHPCI\Plugin;
 
 use PHPCI\Builder;
-use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 
 /**

PHPCI/Plugin/Behat.php

@@ -12,7 +12,6 @@ namespace PHPCI\Plugin;
 use PHPCI\Builder;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
-use PHPCI\Model\BuildError;
 
 /**
  * Behat BDD Plugin
@@ -67,72 +66,12 @@ class Behat implements \PHPCI\Plugin
 
         if (!$behat) {
             $this->phpci->logFailure(Lang::get('could_not_find', 'behat'));
-
             return false;
         }
 
         $success = $this->phpci->executeCommand($behat . ' %s', $this->features);
         chdir($curdir);
 
-        list($errorCount, $data) = $this->parseBehatOutput();
-
-        $this->build->storeMeta('behat-warnings', $errorCount);
-        $this->build->storeMeta('behat-data', $data);
-
         return $success;
     }
-
-    /**
-     * Parse the behat output and return details on failures
-     *
-     * @return array
-     */
-    public function parseBehatOutput()
-    {
-        $output = $this->phpci->getLastOutput();
-
-        $parts = explode('---', $output);
-
-        if (count($parts) <= 1) {
-            return array(0, array());
-        }
-
-        $lines = explode(PHP_EOL, $parts[1]);
-
-        $storeFailures = false;
-        $data = array();
-
-        foreach ($lines as $line) {
-            $line = trim($line);
-            if ($line == 'Failed scenarios:') {
-                $storeFailures = true;
-                continue;
-            }
-
-            if (strpos($line, ':') === false) {
-                $storeFailures = false;
-            }
-
-            if ($storeFailures) {
-                $lineParts = explode(':', $line);
-                $data[] = array(
-                    'file' => $lineParts[0],
-                    'line' => $lineParts[1]
-                );
-
-                $this->build->reportError(
-                    $this->phpci,
-                    'behat',
-                    'Behat scenario failed.',
-                    BuildError::SEVERITY_HIGH,
-                    $lineParts[0],
-                    $lineParts[1]
-                );
-            }
-        }
-
-        $errorCount = count($data);
-
-        return array($errorCount, $data);
-    }
 }

PHPCI/Plugin/Campfire.php

@@ -38,19 +38,19 @@ class Campfire implements \PHPCI\Plugin
      */
     public function __construct(Builder $phpci, Build $build, array $options = array())
     {
-        $this->phpci     = $phpci;
+        $this->phpci = $phpci;
-        $this->build     = $build;
+        $this->build = $build;
-        $this->message   = $options['message'];
+
+        $this->message = $options['message'];
         $this->userAgent = "PHPCI/1.0 (+http://www.phptesting.org/)";
-        $this->cookie    = "phpcicookie";
+        $this->cookie = "phpcicookie";
 
         $buildSettings = $phpci->getConfig('build_settings');
-
         if (isset($buildSettings['campfire'])) {
-            $campfire        = $buildSettings['campfire'];
+            $campfire = $buildSettings['campfire'];
-            $this->url       = $campfire['url'];
+            $this->url = $campfire['url'];
             $this->authToken = $campfire['authToken'];
-            $this->roomId    = $campfire['roomId'];
+            $this->roomId = $campfire['roomId'];
         } else {
             throw new \Exception(Lang::get('no_campfire_settings'));
         }
@@ -63,7 +63,7 @@ class Campfire implements \PHPCI\Plugin
      */
     public function execute()
     {
-        $url = PHPCI_URL . "build/view/" . $this->build->getId();
+        $url = PHPCI_URL."build/view/".$this->build->getId();
         $message = str_replace("%buildurl%", $url, $this->message);
         $this->joinRoom($this->roomId);
         $status = $this->speak($message, $this->roomId);
@@ -101,7 +101,6 @@ class Campfire implements \PHPCI\Plugin
     public function speak($message, $roomId, $isPaste = false)
     {
         $page = '/room/'.$roomId.'/speak.json';
-
         if ($isPaste) {
             $type = 'PasteMessage';
         } else {
@@ -144,13 +143,12 @@ class Campfire implements \PHPCI\Plugin
 
         // We tend to get one space with an otherwise blank response
         $output = trim($output);
-
         if (strlen($output)) {
             /* Responses are JSON. Decode it to a data structure */
             return json_decode($output);
         }
-
         // Simple 200 OK response (such as for joining a room)
+        // TODO: check for other result codes here
         return true;
     }
 }

PHPCI/Plugin/CleanBuild.php

@@ -39,9 +39,9 @@ class CleanBuild implements \PHPCI\Plugin
      */
     public function __construct(Builder $phpci, Build $build, array $options = array())
     {
-        $this->phpci  = $phpci;
+        $this->phpci        = $phpci;
-        $this->build  = $build;
+        $this->build = $build;
-        $this->remove = isset($options['remove']) && is_array($options['remove']) ? $options['remove'] : array();
+        $this->remove       = isset($options['remove']) && is_array($options['remove']) ? $options['remove'] : array();
     }
 
     /**
@@ -57,7 +57,7 @@ class CleanBuild implements \PHPCI\Plugin
         $this->phpci->executeCommand($cmd, $this->phpci->buildPath . 'composer.lock');
 
         $success = true;
-
+        
         foreach ($this->remove as $file) {
             $ok = $this->phpci->executeCommand($cmd, $this->phpci->buildPath . $file);
 

PHPCI/Plugin/Codeception.php

@@ -12,66 +12,31 @@ namespace PHPCI\Plugin;
 use PHPCI\Builder;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
-use PHPCI\Plugin\Util\TestResultParsers\Codeception as Parser;
-use Psr\Log\LogLevel;
 
 /**
  * Codeception Plugin - Enables full acceptance, unit, and functional testing.
  * @author       Don Gilbert <don@dongilbert.net>
- * @author       Igor Timoshenko <contact@igortimoshenko.com>
- * @author       Adam Cooper <adam@networkpie.co.uk>
  * @package      PHPCI
  * @subpackage   Plugins
  */
-class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
+class Codeception implements \PHPCI\Plugin
 {
-    /** @var string */
+    /**
+     * @var string
+     */
     protected $args = '';
 
-    /** @var Builder */
+    /**
+     * @var Builder
+     */
     protected $phpci;
 
-    /** @var Build */
     protected $build;
 
     /**
-     * @var string $ymlConfigFile The path of a yml config for Codeception
+     * @var string|string[] $xmlConfigFile The path (or array of paths) of an xml config for PHPUnit
      */
-    protected $ymlConfigFile;
+    protected $xmlConfigFile;
-
-    /**
-     * @var string $path The path to the codeception tests folder.
-     */
-    protected $path;
-
-    /**
-     * @param $stage
-     * @param Builder $builder
-     * @param Build $build
-     * @return bool
-     */
-    public static function canExecute($stage, Builder $builder, Build $build)
-    {
-        return $stage == 'test' && !is_null(self::findConfigFile($builder->buildPath));
-    }
-
-    /**
-     * Try and find the codeception YML config file.
-     * @param $buildPath
-     * @return null|string
-     */
-    public static function findConfigFile($buildPath)
-    {
-        if (file_exists($buildPath . 'codeception.yml')) {
-            return 'codeception.yml';
-        }
-
-        if (file_exists($buildPath . 'codeception.dist.yml')) {
-            return 'codeception.dist.yml';
-        }
-
-        return null;
-    }
 
     /**
      * Set up the plugin, configure options, etc.
@@ -83,81 +48,71 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
     {
         $this->phpci = $phpci;
         $this->build = $build;
-        $this->path = 'tests' . DIRECTORY_SEPARATOR . '_output' . DIRECTORY_SEPARATOR;
 
-        if (empty($options['config'])) {
+        if (isset($options['config'])) {
-            $this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath);
+            $this->xmlConfigFile = $options['config'];
-        } else {
-            $this->ymlConfigFile = $options['config'];
         }
         if (isset($options['args'])) {
             $this->args = (string) $options['args'];
         }
-        if (isset($options['path'])) {
-            $this->path = $options['path'];
-        }
     }
 
     /**
-     * Runs Codeception tests
+     * Runs Codeception tests, optionally using specified config file(s).
      */
     public function execute()
     {
-        if (empty($this->ymlConfigFile)) {
+        $success = true;
-            throw new \Exception("No configuration file found");
-        }
 
         // Run any config files first. This can be either a single value or an array.
-        return $this->runConfigFile($this->ymlConfigFile);
+        if ($this->xmlConfigFile !== null) {
+            $success &= $this->runConfigFile($this->xmlConfigFile);
+        }
+
+        return $success;
     }
 
     /**
      * Run tests from a Codeception config file.
      * @param $configPath
      * @return bool|mixed
-     * @throws \Exception
      */
     protected function runConfigFile($configPath)
     {
-        $this->phpci->logExecOutput(false);
+        if (is_array($configPath)) {
+            return $this->recurseArg($configPath, array($this, "runConfigFile"));
+        } else {
 
-        $codecept = $this->phpci->findBinary('codecept');
+            $codecept = $this->phpci->findBinary('codecept');
 
-        if (!$codecept) {
+            if (!$codecept) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
+                $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
+                return false;
+            }
 
-            return false;
+            $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" '. $this->args;
+            if (IS_WIN) {
+                $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" '. $this->args;
+            }
+
+            $configPath = $this->phpci->buildPath . $configPath;
+            $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
+
+            return $success;
         }
+    }
 
-        $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
+    /**
-
+     * @param $array
-        if (IS_WIN) {
+     * @param $callable
-            $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
+     * @return bool|mixed
+     */
+    protected function recurseArg($array, $callable)
+    {
+        $success = true;
+        foreach ($array as $subItem) {
+            $success &= call_user_func($callable, $subItem);
         }
-
-        $configPath = $this->phpci->buildPath . $configPath;
-        $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
-
-        $this->phpci->log(
-            'Codeception XML path: '. $this->phpci->buildPath . $this->path . 'report.xml',
-            Loglevel::DEBUG
-        );
-
-        $xml = file_get_contents($this->phpci->buildPath . $this->path . 'report.xml', false);
-        $parser = new Parser($this->phpci, $xml);
-        $output = $parser->parse();
-
-        $meta = array(
-            'tests'     => $parser->getTotalTests(),
-            'timetaken' => $parser->getTotalTimeTaken(),
-            'failures'  => $parser->getTotalFailures()
-        );
-
-        $this->build->storeMeta('codeception-meta', $meta);
-        $this->build->storeMeta('codeception-data', $output);
-        $this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
-        $this->phpci->logExecOutput(true);
-
         return $success;
     }
 }

PHPCI/Plugin/Composer.php

@@ -27,7 +27,6 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     protected $preferDist;
     protected $phpci;
     protected $build;
-    protected $nodev;
 
     /**
      * Check if this plugin can be executed.
@@ -38,7 +37,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
      */
     public static function canExecute($stage, Builder $builder, Build $build)
     {
-        $path = $builder->buildPath . DIRECTORY_SEPARATOR . 'composer.json';
+        $path = $builder->buildPath . '/composer.json';
 
         if (file_exists($path) && $stage == 'setup') {
             return true;
@@ -55,17 +54,15 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
      */
     public function __construct(Builder $phpci, Build $build, array $options = array())
     {
-        $path             = $phpci->buildPath;
+        $path = $phpci->buildPath;
-        $this->phpci      = $phpci;
+        $this->phpci = $phpci;
-        $this->build      = $build;
+        $this->build = $build;
-        $this->directory  = $path;
+        $this->directory = $path;
-        $this->action     = 'install';
+        $this->action = 'install';
         $this->preferDist = false;
-        $this->preferSource = false;
-        $this->nodev      = false;
 
         if (array_key_exists('directory', $options)) {
-            $this->directory = $path . DIRECTORY_SEPARATOR . $options['directory'];
+            $this->directory = $path . '/' . $options['directory'];
         }
 
         if (array_key_exists('action', $options)) {
@@ -75,15 +72,6 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         if (array_key_exists('prefer_dist', $options)) {
             $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'];
-        }
     }
 
     /**
@@ -93,6 +81,11 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     {
         $composerLocation = $this->phpci->findBinary(array('composer', 'composer.phar'));
 
+        if (!$composerLocation) {
+            $this->phpci->logFailure(Lang::get('could_not_find', 'composer'));
+            return false;
+        }
+
         $cmd = '';
 
         if (IS_WIN) {
@@ -103,17 +96,10 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         if ($this->preferDist) {
             $this->phpci->log('Using --prefer-dist flag');
-            $cmd .= ' --prefer-dist';
+            $cmd .= '--prefer-dist';
-        }
+        } else {
-
-        if ($this->preferSource) {
             $this->phpci->log('Using --prefer-source flag');
-            $cmd .= ' --prefer-source';
+            $cmd .= '--prefer-source';
-        }
-
-        if ($this->nodev) {
-            $this->phpci->log('Using --no-dev flag');
-            $cmd .= ' --no-dev';
         }
 
         $cmd .= ' --working-dir="%s" %s';

PHPCI/Plugin/CopyBuild.php

@@ -35,12 +35,12 @@ class CopyBuild implements \PHPCI\Plugin
      */
     public function __construct(Builder $phpci, Build $build, array $options = array())
     {
-        $path            = $phpci->buildPath;
+        $path               = $phpci->buildPath;
-        $this->phpci     = $phpci;
+        $this->phpci        = $phpci;
-        $this->build     = $build;
+        $this->build = $build;
-        $this->directory = isset($options['directory']) ? $options['directory'] : $path;
+        $this->directory    = isset($options['directory']) ? $options['directory'] : $path;
-        $this->wipe      = isset($options['wipe']) ?  (bool)$options['wipe'] : false;
+        $this->wipe         = isset($options['wipe']) ?  (bool)$options['wipe'] : false;
-        $this->ignore    = isset($options['respect_ignore']) ?  (bool)$options['respect_ignore'] : false;
+        $this->ignore       = isset($options['respect_ignore']) ?  (bool)$options['respect_ignore'] : false;
     }
 
     /**
@@ -74,7 +74,7 @@ class CopyBuild implements \PHPCI\Plugin
      */
     protected function wipeExistingDirectory()
     {
-        if ($this->wipe === true && $this->directory != '/' && is_dir($this->directory)) {
+        if ($this->wipe == true && $this->directory != '/' && is_dir($this->directory)) {
             $cmd = 'rm -Rf "%s*"';
             $success = $this->phpci->executeCommand($cmd, $this->directory);
 

PHPCI/Plugin/Deployer.php

@@ -1,73 +0,0 @@
-<?php
-/**
- * PHPCI - Continuous Integration for PHP
- *
- * @copyright    Copyright 2015, Block 8 Limited.
- * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
- * @link         https://www.phptesting.org/
- */
-
-namespace PHPCI\Plugin;
-
-use b8\HttpClient;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-
-/**
-* Integrates PHPCI with Deployer: https://github.com/rebelinblue/deployer
-* @author       Dan Cryer <dan@block8.co.uk>
-* @package      PHPCI
-* @subpackage   Plugins
-*/
-class Deployer implements \PHPCI\Plugin
-{
-    protected $webhookUrl;
-    protected $reason;
-    protected $updateOnly;
-
-    /**
-     * Set up the plugin, configure options, etc.
-     * @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->reason = 'PHPCI Build #%BUILD% - %COMMIT_MESSAGE%';
-
-        if (isset($options['webhook_url'])) {
-            $this->webhookUrl = $options['webhook_url'];
-        }
-
-        if (isset($options['reason'])) {
-            $this->reason = $options['reason'];
-        }
-        
-        $this->updateOnly = isset($options['update_only']) ? (bool) $options['update_only'] : true;
-    }
-
-    /**
-    * Copies files from the root of the build directory into the target folder
-    */
-    public function execute()
-    {
-        if (empty($this->webhookUrl)) {
-            $this->phpci->logFailure('You must specify a webhook URL.');
-            return false;
-        }
-
-        $http = new HttpClient();
-
-        $response = $http->post($this->webhookUrl, array(
-            'reason' => $this->phpci->interpolate($this->reason),
-            'source' => 'PHPCI',
-            'url' => $this->phpci->interpolate('%BUILD_URI%'),
-            'branch' => $this->phpci->interpolate('%BRANCH%'),
-            'update_only' => $this->updateOnly
-        ));
-
-        return $response['success'];
-    }
-}

PHPCI/Plugin/Email.php

@@ -9,13 +9,10 @@
 
 namespace PHPCI\Plugin;
 
-use Exception;
 use b8\View;
 use PHPCI\Builder;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
-use PHPCI\Helper\Email as EmailHelper;
-use Psr\Log\LogLevel;
 
 /**
 * Email Plugin - Provides simple email capability to PHPCI.
@@ -30,16 +27,21 @@ class Email implements \PHPCI\Plugin
      */
     protected $phpci;
 
-    /**
-     * @var \PHPCI\Model\Build
-     */
-    protected $build;
-
     /**
      * @var array
      */
     protected $options;
 
+    /**
+     * @var \Swift_Mailer
+     */
+    protected $mailer;
+
+    /**
+     * @var string
+     */
+    protected $fromAddress;
+
     /**
      * Set up the plugin, configure options, etc.
      * @param Builder $phpci
@@ -50,16 +52,25 @@ class Email implements \PHPCI\Plugin
     public function __construct(
         Builder $phpci,
         Build $build,
+        \Swift_Mailer $mailer,
         array $options = array()
     ) {
-        $this->phpci   = $phpci;
+        $this->phpci        = $phpci;
-        $this->build   = $build;
+        $this->build        = $build;
-        $this->options = $options;
+        $this->options      = $options;
+
+        $phpCiSettings      = $phpci->getSystemConfig('phpci');
+
+        $this->fromAddress = isset($phpCiSettings['email_settings']['from_address'])
+                           ? $phpCiSettings['email_settings']['from_address']
+                           : "notifications-ci@phptesting.org";
+
+        $this->mailer = $mailer;
     }
 
     /**
-     * Send a notification mail.
+    * Connects to MySQL and runs a specified set of queries.
-     */
+    */
     public function execute()
     {
         $addresses = $this->getEmailAddresses();
@@ -70,86 +81,79 @@ class Email implements \PHPCI\Plugin
             return false;
         }
 
-        $buildStatus  = $this->build->isSuccessful() ? "Passing Build" : "Failing Build";
+        $subjectTemplate = "PHPCI - %s - %s";
-        $projectName  = $this->build->getProject()->getTitle();
+        $projectName = $this->phpci->getBuildProjectTitle();
+        $logText = $this->build->getLog();
 
-        try {
+        if ($this->build->isSuccessful()) {
-            $view = $this->getMailTemplate();
+            $sendFailures = $this->sendSeparateEmails(
-        } catch (Exception $e) {
+                $addresses,
-            $this->phpci->log(
+                sprintf($subjectTemplate, $projectName, Lang::get('passing_build')),
-                sprintf('Unknown mail template "%s", falling back to default.', $this->options['template']),
+                sprintf(Lang::get('log_output')."<br><pre>%s</pre>", $logText)
-                LogLevel::WARNING
+            );
+        } else {
+            $view = new View('Email/failed');
+            $view->build = $this->build;
+            $view->project = $this->build->getProject();
+
+            $emailHtml = $view->render();
+
+            $sendFailures = $this->sendSeparateEmails(
+                $addresses,
+                sprintf($subjectTemplate, $projectName, Lang::get('failing_build')),
+                $emailHtml
             );
-            $view = $this->getDefaultMailTemplate();
         }
 
-        $view->build = $this->build;
-        $view->project = $this->build->getProject();
-
-        $layout = new View('Email/layout');
-        $layout->build = $this->build;
-        $layout->project = $this->build->getProject();
-        $layout->content = $view->render();
-        $body = $layout->render();
-
-        $sendFailures = $this->sendSeparateEmails(
-            $addresses,
-            sprintf("PHPCI - %s - %s", $projectName, $buildStatus),
-            $body
-        );
-
         // This is a success if we've not failed to send anything.
-        $this->phpci->log(sprintf("%d emails sent", (count($addresses) - $sendFailures)));
-        $this->phpci->log(sprintf("%d emails failed to send", $sendFailures));
 
-        return ($sendFailures === 0);
+        $this->phpci->log(Lang::get('n_emails_sent', (count($addresses) - count($sendFailures))));
+        $this->phpci->log(Lang::get('n_emails_failed', count($sendFailures)));
+
+        return (count($sendFailures) == 0);
     }
 
     /**
-     * @param string $toAddress Single address to send to
+     * @param string[]|string $toAddresses Array or single address to send to
      * @param string[] $ccList
      * @param string $subject Email subject
      * @param string $body Email body
      * @return array                      Array of failed addresses
      */
-    protected function sendEmail($toAddress, $ccList, $subject, $body)
+    public function sendEmail($toAddresses, $ccList, $subject, $body)
     {
-        $email = new EmailHelper();
+        $message = \Swift_Message::newInstance($subject)
-
+            ->setFrom($this->fromAddress)
-        $email->setEmailTo($toAddress, $toAddress);
+            ->setTo($toAddresses)
-        $email->setSubject($subject);
+            ->setBody($body)
-        $email->setBody($body);
+            ->setContentType("text/html");
-        $email->setHtml(true);
 
         if (is_array($ccList) && count($ccList)) {
-            foreach ($ccList as $address) {
+            $message->setCc($ccList);
-                $email->addCc($address, $address);
-            }
         }
 
-        return $email->send();
+        $failedAddresses = array();
+        $this->mailer->send($message, $failedAddresses);
+
+        return $failedAddresses;
     }
 
     /**
-     * Send an email to a list of specified subjects.
+     * Send out build status emails.
-     *
      * @param array $toAddresses
-     *   List of destination addresses for message.
+     * @param $subject
-     * @param string $subject
+     * @param $body
-     *   Mail subject
+     * @return array
-     * @param string $body
-     *   Mail body
-     *
-     * @return int number of failed messages
      */
     public function sendSeparateEmails(array $toAddresses, $subject, $body)
     {
-        $failures = 0;
+        $failures = array();
         $ccList = $this->getCcAddresses();
 
         foreach ($toAddresses as $address) {
-            if (!$this->sendEmail($address, $ccList, $subject, $body)) {
+            $newFailures = $this->sendEmail($address, $ccList, $subject, $body);
-                $failures++;
+            foreach ($newFailures as $failure) {
+                $failures[] = $failure;
             }
         }
         return $failures;
@@ -174,16 +178,15 @@ class Email implements \PHPCI\Plugin
             }
         }
 
-        if (empty($addresses) && isset($this->options['default_mailto_address'])) {
+        if (isset($this->options['default_mailto_address'])) {
             $addresses[] = $this->options['default_mailto_address'];
+            return $addresses;
         }
-
         return array_unique($addresses);
     }
 
     /**
      * Get the list of email addresses to CC.
-     *
      * @return array
      */
     protected function getCcAddresses()
@@ -198,30 +201,4 @@ class Email implements \PHPCI\Plugin
 
         return $ccAddresses;
     }
-
-    /**
-     * Get the mail template used to sent the mail.
-     *
-     * @return View
-     */
-    protected function getMailTemplate()
-    {
-        if (isset($this->options['template'])) {
-            return new View('Email/' . $this->options['template']);
-        }
-
-        return $this->getDefaultMailTemplate();
-    }
-
-    /**
-     * Get the default mail template.
-     *
-     * @return View
-     */
-    protected function getDefaultMailTemplate()
-    {
-        $template = $this->build->isSuccessful() ? 'short' : 'long';
-
-        return new View('Email/' . $template);
-    }
 }

PHPCI/Plugin/Env.php

@@ -52,7 +52,7 @@ class Env implements \PHPCI\Plugin
                 // This allows the standard syntax: "FOO: bar"
                 $env_var = "$key=$value";
             }
-
+            
             if (!putenv($this->phpci->interpolate($env_var))) {
                 $success = false;
                 $this->phpci->logFailure(Lang::get('unable_to_set_env'));

PHPCI/Plugin/FlowdockNotify.php

@@ -1,73 +0,0 @@
-<?php
-/**
- * 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\Plugin;
-
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use Mremi\Flowdock\Api\Push\Push;
-use Mremi\Flowdock\Api\Push\TeamInboxMessage;
-
-/**
- * Flowdock Plugin
- * @author       Petr Cervenka <petr@nanosolutions.io>
- * @package      PHPCI
- * @subpackage   Plugins
- */
-class FlowdockNotify implements \PHPCI\Plugin
-{
-    private $api_key;
-    private $email;
-    const MESSAGE_DEFAULT = 'Build %BUILD% has finished for commit <a href="%COMMIT_URI%">%SHORT_COMMIT%</a>
-                            (%COMMIT_EMAIL%)> on branch <a href="%BRANCH_URI%">%BRANCH%</a>';
-
-    /**
-     * Set up the plugin, configure options, etc.
-     * @param Builder $phpci
-     * @param Build   $build
-     * @param array   $options
-     * @throws \Exception
-     */
-    public function __construct(Builder $phpci, Build $build, array $options = array())
-    {
-        $this->phpci = $phpci;
-        $this->build = $build;
-        if (!is_array($options) || !isset($options['api_key'])) {
-            throw new \Exception('Please define the api_key for Flowdock Notify plugin!');
-        }
-        $this->api_key = trim($options['api_key']);
-        $this->message = isset($options['message']) ? $options['message'] : self::MESSAGE_DEFAULT;
-        $this->email = isset($options['email']) ? $options['email'] : 'PHPCI';
-    }
-
-    /**
-     * Run the Flowdock plugin.
-     * @return bool
-     * @throws \Exception
-     */
-    public function execute()
-    {
-
-        $message = $this->phpci->interpolate($this->message);
-        $successfulBuild = $this->build->isSuccessful() ? 'Success' : 'Failed';
-        $push = new Push($this->api_key);
-        $flowMessage = TeamInboxMessage::create()
-            ->setSource("PHPCI")
-            ->setFromAddress($this->email)
-            ->setFromName($this->build->getProject()->getTitle())
-            ->setSubject($successfulBuild)
-            ->setTags(['#ci'])
-            ->setLink($this->build->getBranchLink())
-            ->setContent($message);
-
-        if (!$push->sendTeamInboxMessage($flowMessage, array('connect_timeout' => 5000, 'timeout' => 5000))) {
-            throw new \Exception(sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors()));
-        }
-        return true;
-    }
-}

PHPCI/Plugin/Grunt.php

@@ -52,7 +52,7 @@ class Grunt implements \PHPCI\Plugin
 
         // Handle options:
         if (isset($options['directory'])) {
-            $this->directory = $path . DIRECTORY_SEPARATOR . $options['directory'];
+            $this->directory = $path . '/' . $options['directory'];
         }
 
         if (isset($options['task'])) {