diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index c2f33e73..00000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -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: ". 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. diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 16692061..00000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -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). \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 65d060ab..00000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -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: - - - diff --git a/PHPCI/Application.php b/PHPCI/Application.php index a6eb646c..8dcdf76d 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -135,18 +135,15 @@ class Application extends b8\Application */ protected function setLayoutVariables(View &$layout) { - $groups = array(); - $groupStore = b8\Store\Factory::getStore('ProjectGroup'); - $groupList = $groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC')); - - 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; + /** @var \PHPCI\Store\ProjectStore $projectStore */ + $projectStore = b8\Store\Factory::getStore('Project'); + $layout->projects = $projectStore->getWhere( + array('archived' => (int)isset($_GET['archived'])), + 50, + 0, + array(), + array('title' => 'ASC') + ); } /** diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php index 91e618a8..ecc37c43 100644 --- a/PHPCI/BuildFactory.php +++ b/PHPCI/BuildFactory.php @@ -36,44 +36,38 @@ 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(); - - if (!empty($project)) { - switch ($project->getType()) { - case 'remote': - $type = 'RemoteGitBuild'; - break; - case 'local': - $type = 'LocalBuild'; - break; - case 'github': - $type = 'GithubBuild'; - break; - case 'bitbucket': - $type = 'BitbucketBuild'; - break; - case 'gitlab': - $type = 'GitlabBuild'; - break; - case 'hg': - $type = 'MercurialBuild'; - break; - case 'svn': - $type = 'SubversionBuild'; - break; - default: - return $build; - } - - $class = '\\PHPCI\\Model\\Build\\' . $type; - $build = new $class($build->getDataArray()); + switch($base->getProject()->getType()) + { + case 'remote': + $type = 'RemoteGitBuild'; + break; + case 'local': + $type = 'LocalBuild'; + break; + case 'github': + $type = 'GithubBuild'; + break; + case 'bitbucket': + $type = 'BitbucketBuild'; + break; + case 'gitlab': + $type = 'GitlabBuild'; + break; + case 'hg': + $type = 'MercurialBuild'; + break; + case 'svn': + $type = 'SubversionBuild'; + break; } - return $build; + $type = '\\PHPCI\\Model\\Build\\' . $type; + + return new $type($base->getDataArray()); } } diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 1aed3d3f..39e8ca41 100644 --- a/PHPCI/Builder.php +++ b/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,30 +205,19 @@ 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')); } } 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'); } @@ -304,7 +285,8 @@ class Builder implements LoggerAwareInterface */ protected function setupBuild() { - $this->buildPath = $this->build->getBuildPath(); + $this->buildPath = $this->build->getBuildPath() . '/'; + $this->build->currentBuildPath = $this->buildPath; $this->interpolator->setupInterpolationVars( $this->build, diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 5f5cbd67..d10f34b7 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -16,12 +16,10 @@ use b8\Config; 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\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use PHPCI\Service\UserService; -use Symfony\Component\Console\Question\ConfirmationQuestion; /** * Install console command - Installs PHPCI. @@ -48,9 +46,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')); } @@ -234,45 +229,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('Skipping beanstalkd configuration.'); - 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. * diff --git a/PHPCI/Command/RebuildQueueCommand.php b/PHPCI/Command/RebuildQueueCommand.php deleted file mode 100644 index 4b0af6d8..00000000 --- a/PHPCI/Command/RebuildQueueCommand.php +++ /dev/null @@ -1,85 +0,0 @@ - -* @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); - } - } -} diff --git a/PHPCI/Command/WorkerCommand.php b/PHPCI/Command/WorkerCommand.php deleted file mode 100644 index 5ceb6a84..00000000 --- a/PHPCI/Command/WorkerCommand.php +++ /dev/null @@ -1,87 +0,0 @@ - -* @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('Debug mode enabled.'); - 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(); - } -} diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index 55ccbb37..e4660ba7 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -63,42 +63,24 @@ class BuildController extends \PHPCI\Controller $this->view->plugins = $this->getUiPlugins(); $this->view->build = $build; - $this->view->data = $this->getBuildData($build); + $this->view->data = json_encode($this->getBuildData($build)); $this->layout->title = Lang::get('build_n', $buildId); $this->layout->subtitle = $build->getProjectTitle(); - switch ($build->getStatus()) { - case 0: - $this->layout->skin = 'blue'; - break; - - 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 = "{$rebuild} "; + $nav = array( + 'title' => Lang::get('build_n', $buildId), + 'icon' => 'cog', + 'links' => array( + 'build/rebuild/' . $build->getId() => Lang::get('rebuild_now'), + ), + ); if ($this->currentUserIsAdmin()) { - $actions .= " {$delete}"; + $nav['links']['build/delete/' . $build->getId()] = Lang::get('delete_build'); } - $this->layout->actions = $actions; + $this->layout->nav = $nav; } /** @@ -162,7 +144,7 @@ class BuildController extends \PHPCI\Controller /** * 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,19 +152,6 @@ 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 */ - $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,10 +169,6 @@ class BuildController extends \PHPCI\Controller $build = $this->buildService->createDuplicateBuild($copy); - if ($this->buildService->queueError) { - $_SESSION['global_error'] = Lang::get('add_to_queue_failed'); - } - $response = new b8\Http\Response\RedirectResponse(); $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId()); return $response; diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index 62cb9ba7..0090e85f 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -104,6 +104,7 @@ class BuildStatusController extends \PHPCI\Controller } } } + } catch (\Exception $e) { $xml = new \SimpleXMLElement(''); } diff --git a/PHPCI/Controller/GroupController.php b/PHPCI/Controller/GroupController.php deleted file mode 100644 index 898f9e41..00000000 --- a/PHPCI/Controller/GroupController.php +++ /dev/null @@ -1,120 +0,0 @@ - - * @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; - } -} diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 4241d324..d0e5a14b 100644 --- a/PHPCI/Controller/HomeController.php +++ b/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,15 @@ class HomeController extends \PHPCI\Controller public function index() { $this->layout->title = Lang::get('dashboard'); + + $projects = $this->projectStore->getWhere( + array('archived' => (int)isset($_GET['archived'])), + 50, + 0, + array(), + array('title' => 'ASC') + ); + $builds = $this->buildStore->getLatestBuilds(null, 10); foreach ($builds as &$build) { @@ -60,7 +63,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(); } @@ -98,7 +102,7 @@ class HomeController extends \PHPCI\Controller $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( @@ -118,7 +122,7 @@ class HomeController extends \PHPCI\Controller } $summaryView = new b8\View('SummaryTable'); - $summaryView->projects = $projects; + $summaryView->projects = $projects['items']; $summaryView->builds = $summaryBuilds; $summaryView->successful = $successes; $summaryView->failed = $failures; @@ -143,24 +147,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; - } } diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index 64cb1463..cefcdbb5 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -23,6 +23,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 +49,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 +71,49 @@ 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(); + + $response = new b8\Http\Response\RedirectResponse(); + + if (!in_array($package, $this->required)) { + unset($json['require'][$package]); + $this->setComposerJson($json); + + $response->setHeader('Location', PHPCI_URL . 'plugin?r=' . $package); + return $response; + } + + $response->setHeader('Location', PHPCI_URL); + return $response; + } + + /** + * 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); + + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'plugin?w=' . $package); + return $response; + } + /** * Get the json-decoded contents of the composer.json file. * @return mixed @@ -58,4 +123,83 @@ 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)); + + $response = new b8\Http\Response\JsonResponse(); + $response->setContent($res['body']); + return $response; + } + + /** + * 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'); + + $response = new b8\Http\Response\JsonResponse(); + $response->setContent($res['body']); + return $response; + } } diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 72be46e5..3a55f49b 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -116,10 +116,6 @@ class ProjectController extends PHPCI\Controller $email = $_SESSION['phpci_user']->getEmail(); $build = $this->buildService->createBuild($project, null, urldecode($branch), $email); - if ($this->buildService->queueError) { - $_SESSION['global_error'] = Lang::get('add_to_queue_failed'); - } - $response = new b8\Http\Response\RedirectResponse(); $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId()); return $response; @@ -224,7 +220,6 @@ 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); @@ -289,7 +284,6 @@ class ProjectController extends PHPCI\Controller '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); @@ -358,20 +352,6 @@ 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); diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index b68d61f7..2995c514 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -49,7 +49,7 @@ class SessionController extends \PHPCI\Controller } else { unset($_SESSION['login_token']); - $user = $this->userStore->getByEmail($this->getParam('email')); + $user = $this->userStore->getByLoginOrEmail($this->getParam('email')); if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { session_regenerate_id(true); @@ -68,7 +68,7 @@ class SessionController extends \PHPCI\Controller $form->setAction(PHPCI_URL.'session/login'); $email = new b8\Form\Element\Email('email'); - $email->setLabel(Lang::get('email_address')); + $email->setLabel(Lang::get('login')); $email->setRequired(true); $email->setContainerClass('form-group'); $email->setClass('form-control'); diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 645e19a4..ea15bc3b 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -444,7 +444,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); diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 4b444d03..45a775ad 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -27,8 +27,6 @@ use PHPCI\Store\ProjectStore; * @author Guillaume Perréal * @package PHPCI * @subpackage Web - * - * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class WebhookController extends \b8\Controller { @@ -82,64 +80,11 @@ class WebhookController extends \b8\Controller } /** - * Called by Bitbucket. + * Called by Bitbucket POST service. */ public function bitbucket($projectId) { $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(); @@ -225,7 +170,7 @@ class WebhookController extends \b8\Controller protected function githubCommitRequest(Project $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'); } @@ -419,6 +364,10 @@ class WebhookController extends \b8\Controller // If not, create a new build job for it: $build = $this->buildService->createBuild($project, $commitId, $branch, $committer, $commitMessage, $extra); + $build = BuildFactory::getBuild($build); + + // Send a status postback if the build type provides one: + $build->sendStatusPostback(); return array('status' => 'ok', 'buildID' => $build->getID()); } diff --git a/PHPCI/Helper/AnsiConverter.php b/PHPCI/Helper/AnsiConverter.php index 7df6663c..a5e42269 100644 --- a/PHPCI/Helper/AnsiConverter.php +++ b/PHPCI/Helper/AnsiConverter.php @@ -21,7 +21,7 @@ final class AnsiConverter static private $converter = null; /** - * Initialize the singleton. + * Initialize the singletion. * * @return AnsiToHtmlConverter */ @@ -35,7 +35,7 @@ final class AnsiConverter } /** - * Convert a text containing ANSI color sequences into HTML code. + * Convert a text containing ANSI colr sequences into HTML code. * * @param string $text The text to convert * @@ -47,7 +47,7 @@ final class AnsiConverter } /** - * Do not instantiate this class. + * Do not instanciate this class. */ private function __construct() { diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php index b3b47f7b..bd948834 100644 --- a/PHPCI/Helper/BaseCommandExecutor.php +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -76,7 +76,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,6 +89,7 @@ abstract class BaseCommandExecutor implements CommandExecutor ); $pipes = array(); + $process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null); if (is_resource($process)) { diff --git a/PHPCI/Helper/BuildInterpolator.php b/PHPCI/Helper/BuildInterpolator.php index 1e7222bb..fbadbc30 100644 --- a/PHPCI/Helper/BuildInterpolator.php +++ b/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%']); diff --git a/PHPCI/Helper/LoginIsDisabled.php b/PHPCI/Helper/LoginIsDisabled.php index ec23858c..437b95cd 100644 --- a/PHPCI/Helper/LoginIsDisabled.php +++ b/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 * @package PHPCI * @subpackage Web diff --git a/PHPCI/Helper/MailerFactory.php b/PHPCI/Helper/MailerFactory.php index c84c068d..641c06b9 100644 --- a/PHPCI/Helper/MailerFactory.php +++ b/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': diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index d7a0df59..20e403e1 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -114,7 +114,6 @@ i din foretrukne hosting-platform.', '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://', @@ -204,7 +203,7 @@ Services sektionen under dit Bitbucket-repository.', 'build_finished' => 'Build Afsluttet', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index 8e5bb3b2..f866a4de 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -39,7 +39,7 @@ 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', + 'login' => 'Login / Email Address', 'password' => 'Passwort', 'log_in' => 'Einloggen', @@ -103,7 +103,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'local' => 'Lokaler Pfad', 'hg' => 'Mercurial', 'svn' => 'Subversion', - + 'where_hosted' => 'Wo wird Ihr Projekt gehostet?', 'choose_github' => 'Wählen Sie ein GitHub Repository:', @@ -115,8 +115,7 @@ 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', + 'archived' => 'Archived', 'save_project' => 'Projekt speichern', 'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen', @@ -130,7 +129,7 @@ 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', + 'date' => 'Date', 'project' => 'Projekt', 'commit' => 'Commit', 'branch' => 'Branch', @@ -151,9 +150,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 Services-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', @@ -195,8 +191,8 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'codeception_suite' => 'Suite', 'codeception_time' => 'Zeit', 'codeception_synopsis' => '%1$d Tests in %2$f Sekunden ausgeführt. - %3$d Fehler.', - + %3$d Fehler.', + 'file' => 'Datei', 'line' => 'Zeile', 'class' => 'Klasse', @@ -212,14 +208,14 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab '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_message' => 'Message', + 'test_no_message' => 'No message', + 'test_success' => 'Succesfull: %d', + 'test_fail' => 'Failures: %d', + 'test_skipped' => 'Skipped: %d', + 'test_error' => 'Errors: %d', 'test_todo' => 'Todos: %d', - 'test_total' => '%d Test(s)', + 'test_total' => '%d test(s)', // Users 'name' => 'Name', @@ -295,19 +291,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 »', - // 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', @@ -416,18 +399,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.', - - // 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', + 'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.' ); diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index 45ee4bee..cb7d169f 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -115,7 +115,6 @@ PHPCI', 'default_branch' => 'Προκαθορισμένο όνομα διακλάδωσης', 'allow_public_status' => 'Ενεργοποίηση της σελίδας δημόσιας κατάστασης και την εικόνα για το έργο αυτό;', 'archived' => 'Archived', - 'archived_menu' => 'Archived', 'save_project' => 'Αποθήκευση έργου', 'error_mercurial' => 'Ο σύνδεσμος URL του ευμετάβλητου αποθετηρίου πρέπει να ξεκινάει με http:// ή https://', @@ -205,7 +204,7 @@ Services του Bitbucket αποθετηρίου σας.', 'build_finished' => 'Η κατασκευή ολοκληρώθηκε', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 63df75d2..9729d746 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -116,7 +116,6 @@ PHPCI', '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://', @@ -154,9 +153,6 @@ PHPCI', Services 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', @@ -217,7 +213,7 @@ PHPCI', 'build_finished' => 'Build Finished', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', @@ -309,8 +305,6 @@ PHPCI', 'stage_complete' => 'Complete', 'stage_success' => 'Success', 'stage_failure' => 'Failure', - 'stage_broken' => 'Broken', - 'stage_fixed' => 'Fixed', // Installer 'installation_url' => 'PHPCI Installation URL', @@ -372,9 +366,6 @@ PHPCI', 'project_id_argument' => 'A project ID', 'commit_id_option' => 'Commit ID to build', 'branch_name_option' => 'Branch to build', - 'add_to_queue_failed' => 'Build created successfully, but failed to add to build queue. This usually happens - when PHPCI is set to use a beanstalkd server that does not exist, - or your beanstalkd server has stopped.', // Run Command 'run_all_pending' => 'Run all pending PHPCI builds.', @@ -423,22 +414,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.', - - - // 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', - + 'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.' ); diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php index 1b7b33f7..95a6eb73 100644 --- a/PHPCI/Languages/lang.es.php +++ b/PHPCI/Languages/lang.es.php @@ -115,7 +115,6 @@ PHPCI', '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://', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index a0f2cab8..dcde8424 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -115,7 +115,6 @@ PHPCI', '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://', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index d254fbcd..ff326d14 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -113,9 +113,8 @@ 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', - 'archived_menu' => 'Archived', 'save_project' => 'Salva il Progetto', + 'archived' => 'Archived', '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://', @@ -207,7 +206,7 @@ PHPCI', 'build_finished' => 'Build Terminata', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index 96d9f5d5..e0638aaf 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -115,7 +115,6 @@ van je gekozen source code hosting platform', '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://', @@ -205,7 +204,7 @@ Services sectie van je Bitbucket repository toegevoegd worden.', 'build_finished' => 'Build beëindigd', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index e1d3c3bf..d6f95ad6 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -116,7 +116,6 @@ od wybranego kodu źródłowego platformy hostingowej.', '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 +129,7 @@ od wybranego kodu źródłowego platformy hostingowej.', 'all_branches' => 'Wszystkie Gałęzie', 'builds' => 'Budowania', 'id' => 'ID', - 'date' => 'Data', + 'date' => 'Date', 'project' => 'Projekt', 'commit' => 'Commit', 'branch' => 'Gałąź', @@ -206,14 +205,14 @@ Services repozytoria Bitbucket.', '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)', + 'test_message' => 'Message', + 'test_no_message' => 'No message', + 'test_success' => 'Succesfull: %d', + 'test_fail' => 'Failures: %d', + 'test_skipped' => 'Skipped: %d', + 'test_error' => 'Errors: %d', + 'test_todo' => 'Todos: %d', + 'test_total' => '%d test(s)', // Users 'name' => 'Nazwa', @@ -344,10 +343,10 @@ Przejrzyj powyższą listę błędów przed kontynuowaniem.', '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', + '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' => 'Uruchom wszystkie oczekujące budowy w PHPCI', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 0a7acff2..aa0f40fb 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -42,6 +42,7 @@ PHPCI', 'password' => 'Пароль', 'log_in' => 'Войти', + // Top Nav 'toggle_navigation' => 'Скрыть/показать панель навигации', 'n_builds_pending' => '%d сборок ожидает', @@ -107,13 +108,12 @@ PHPCI', 'repo_name' => 'Репозиторий / Внешний URL / Локальный путь', 'project_title' => 'Название проекта', 'project_private_key' => 'Приватный ключ для доступа к репозиторию - (оставьте поле пустым для локального использования и/или анонимного доступа)', + (оставьте поле пустым для локального использования и/или анонимного доступа)', 'build_config' => 'Конфигурация сборки проекта для PHPCI - (если вы не добавили файл phpci.yml в репозиторий вашего проекта)', + (если вы не добавили файл phpci.yml в репозиторий вашего проекта)', 'default_branch' => 'Ветка по умолчанию', 'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта', - 'archived' => 'Архивный', - 'archived_menu' => 'Архив', + 'archived' => 'Запакован', 'save_project' => 'Сохранить проект', 'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://', @@ -139,13 +139,13 @@ PHPCI', 'webhooks' => 'Webhooks', 'webhooks_help_github' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже в качестве нового хука в разделе настроек Webhooks - and Services вашего GitHub репозитория.', + and Services вашего GitHub репозитория.', 'webhooks_help_gitlab' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже в качестве "WebHook URL" в разделе "Web Hooks" вашего GitLab репозитория.', 'webhooks_help_bitbucket' => 'Чтобы Автоматически собирать этот проект при публикации новых коммитов, добавьте URL ниже как "POST" сервис в разделе - Services вашего Bitbucket репозитория.', + Services вашего Bitbucket репозитория.', // View Build 'build_x_not_found' => 'Сборки с ID %d не существует.', @@ -185,11 +185,6 @@ PHPCI', 'technical_debt' => 'Технические долги', 'behat' => 'Behat', - 'codeception_feature' => 'Свойство', - 'codeception_suite' => 'Набор', - 'codeception_time' => 'Время', - 'codeception_synopsis' => 'Тестов выполнено: %1$d (за %2$f сек.). Провалов: %3$d.', - 'file' => 'Файл', 'line' => 'Строка', 'class' => 'Класс', @@ -207,12 +202,12 @@ PHPCI', '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', + 'test_success' => 'Succesfull: %d', + 'test_fail' => 'Failures: %d', + 'test_skipped' => 'Skipped: %d', + 'test_error' => 'Errors: %d', + 'test_todo' => 'Todos: %d', + 'test_total' => '%d test(s)', // Users 'name' => 'Имя', @@ -287,19 +282,6 @@ PHPCI', 'search_packagist_for_more' => 'Искать на Packagist', 'search' => 'Искать »', - // 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' => 'Хост базы данных', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index 54ced220..a3ca1b37 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -113,8 +113,7 @@ PHPCI', (якщо ви не додали файл phpci.yml до репозиторію вашого проекту)', 'default_branch' => 'Назва гілки за замовчуванням', 'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?', - 'archived' => 'Архівний', - 'archived_menu' => 'Архів', + 'archived' => 'Archived', 'save_project' => 'Зберегти проект', 'error_mercurial' => 'URL репозиторію Mercurial повинен починатись із http:// або https://', @@ -205,7 +204,7 @@ PHPCI', 'build_finished' => 'Збірка завершена', 'test_message' => 'Message', 'test_no_message' => 'No message', - 'test_success' => 'Successful: %d', + 'test_success' => 'Succesfull: %d', 'test_fail' => 'Failures: %d', 'test_skipped' => 'Skipped: %d', 'test_error' => 'Errors: %d', diff --git a/PHPCI/Logging/BuildLogger.php b/PHPCI/Logging/BuildLogger.php index a68e9e6d..73f3b464 100644 --- a/PHPCI/Logging/BuildLogger.php +++ b/PHPCI/Logging/BuildLogger.php @@ -67,7 +67,7 @@ class BuildLogger implements LoggerAwareInterface } } - /** + /** * Add a success-coloured message to the log. * @param string */ @@ -98,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 * diff --git a/PHPCI/Migrations/20140730143702_fix_database_columns.php b/PHPCI/Migrations/20140730143702_fix_database_columns.php index a1ac2493..809fc878 100644 --- a/PHPCI/Migrations/20140730143702_fix_database_columns.php +++ b/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)); diff --git a/PHPCI/Migrations/20150203105015_fix_column_types.php b/PHPCI/Migrations/20150203105015_fix_column_types.php index 53db2ad6..f9bcf68a 100644 --- a/PHPCI/Migrations/20150203105015_fix_column_types.php +++ b/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, )); diff --git a/PHPCI/Migrations/20151008140800_add_project_groups.php b/PHPCI/Migrations/20151008140800_add_project_groups.php deleted file mode 100644 index f6035014..00000000 --- a/PHPCI/Migrations/20151008140800_add_project_groups.php +++ /dev/null @@ -1,29 +0,0 @@ -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(); - } -} diff --git a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/PHPCI/Migrations/20151009100610_remove_unique_name_index.php deleted file mode 100644 index 283dfbc0..00000000 --- a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php +++ /dev/null @@ -1,40 +0,0 @@ -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(); - } -} diff --git a/PHPCI/Migrations/20151014091859_errors_table.php b/PHPCI/Migrations/20151014091859_errors_table.php deleted file mode 100644 index a064f6e5..00000000 --- a/PHPCI/Migrations/20151014091859_errors_table.php +++ /dev/null @@ -1,24 +0,0 @@ -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(); - - } -} diff --git a/PHPCI/Migrations/20151015124825_convert_errors.php b/PHPCI/Migrations/20151015124825_convert_errors.php deleted file mode 100644 index 3622bf14..00000000 --- a/PHPCI/Migrations/20151015124825_convert_errors.php +++ /dev/null @@ -1,183 +0,0 @@ -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); - } - } - } -} diff --git a/PHPCI/Migrations/20160623100223_project_table_defaults.php b/PHPCI/Migrations/20160623100223_project_table_defaults.php deleted file mode 100644 index 079db327..00000000 --- a/PHPCI/Migrations/20160623100223_project_table_defaults.php +++ /dev/null @@ -1,18 +0,0 @@ -table('project') - ->changeColumn('build_config', MysqlAdapter::PHINX_TYPE_TEXT, array('null' => true)) - ->changeColumn('archived', MysqlAdapter::PHINX_TYPE_INTEGER, array( - 'length' => MysqlAdapter::INT_TINY, - 'default' => 0, - )) - ->save(); - } -} diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 7c0fcdd3..119290e2 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/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. * diff --git a/PHPCI/Model/Base/BuildErrorBase.php b/PHPCI/Model/Base/BuildErrorBase.php deleted file mode 100644 index 6364bb29..00000000 --- a/PHPCI/Model/Base/BuildErrorBase.php +++ /dev/null @@ -1,503 +0,0 @@ - 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()); - } -} diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index dc018819..0ac8fa93 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -99,7 +99,7 @@ class BuildMetaBase extends Model 'default' => null, ), 'meta_value' => array( - 'type' => 'mediumtext', + 'type' => 'text', 'default' => null, ), ); diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index 0dc0c0eb..0ea77b78 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -45,7 +45,6 @@ class ProjectBase extends Model 'ssh_public_key' => null, 'allow_public_status' => null, 'archived' => null, - 'group_id' => null, ); /** @@ -65,10 +64,8 @@ class ProjectBase extends Model 'ssh_public_key' => 'getSshPublicKey', 'allow_public_status' => 'getAllowPublicStatus', 'archived' => 'getArchived', - 'group_id' => 'getGroupId', // Foreign key getters: - 'Group' => 'getGroup', ); /** @@ -88,10 +85,8 @@ class ProjectBase extends Model 'ssh_public_key' => 'setSshPublicKey', 'allow_public_status' => 'setAllowPublicStatus', 'archived' => 'setArchived', - 'group_id' => 'setGroupId', // Foreign key setters: - 'Group' => 'setGroup', ); /** @@ -158,14 +153,10 @@ class ProjectBase extends Model ), 'archived' => array( 'type' => 'tinyint', - 'length' => 1, + 'length' => 4, + 'nullable' => true, 'default' => null, ), - 'group_id' => array( - 'type' => 'int', - 'length' => 11, - 'default' => 1, - ), ); /** @@ -174,20 +165,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' - ), ); /** @@ -334,18 +317,6 @@ class ProjectBase extends Model 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. * @@ -559,12 +530,10 @@ class ProjectBase extends Model /** * 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) { @@ -576,83 +545,6 @@ class ProjectBase extends Model $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. * diff --git a/PHPCI/Model/Base/ProjectGroupBase.php b/PHPCI/Model/Base/ProjectGroupBase.php deleted file mode 100644 index 3b5eed69..00000000 --- a/PHPCI/Model/Base/ProjectGroupBase.php +++ /dev/null @@ -1,168 +0,0 @@ - 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()); - } -} diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php index 4de48537..e9be15a0 100644 --- a/PHPCI/Model/Base/UserBase.php +++ b/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'), ); /** diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index a8bfd683..a0019438 100644 --- a/PHPCI/Model/Build.php +++ b/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); @@ -213,36 +208,14 @@ class Build extends BuildBase /** * Allows specific build types (e.g. Github) to report violations back to their respective services. * @param Builder $builder - * @param $plugin + * @param $file + * @param $line * @param $message - * @param int $severity - * @param null $file - * @param null $lineStart - * @param null $lineEnd - * @return BuildError + * @return mixed */ - 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); + public function reportError(Builder $builder, $file, $line, $message) + { + return array($builder, $file, $line, $message); } /** @@ -255,13 +228,7 @@ class Build extends BuildBase 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; + return PHPCI_BUILD_ROOT_DIR . $this->getId(); } /** @@ -277,25 +244,4 @@ class Build extends BuildBase 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(); - } } diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index a9a18913..d6b2b7b9 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -45,52 +45,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, - 'target_url' => $phpciUrl . '/build/view/' . $this->getId(), - 'description' => $description, - 'context' => 'PHPCI', - ); - + $params = array( 'state' => $status, + 'target_url' => $phpciUrl . '/build/view/' . $this->getId()); $headers = array( 'Authorization: token ' . $token, 'Content-Type: application/x-www-form-urlencoded' - ); + ); $http->setHeaders($headers); $http->request('POST', $url, json_encode($params)); @@ -118,14 +105,10 @@ class GithubBuild extends RemoteGitBuild { $rtn = parent::getCommitMessage($this->data['commit_message']); - $project = $this->getProject(); - - if (!is_null($project)) { - $reference = $project->getReference(); - $commitLink = '#$1'; - $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn); - $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '@$1', $rtn); - } + $reference = $this->getProject()->getReference(); + $commitLink = '#$1'; + $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn); + $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '@$1', $rtn); return $rtn; } @@ -151,7 +134,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; } @@ -190,16 +173,9 @@ class GithubBuild extends RemoteGitBuild /** * @inheritDoc */ - public function reportError( - Builder $builder, - $plugin, - $message, - $severity = BuildError::SEVERITY_NORMAL, - $file = null, - $lineStart = null, - $lineEnd = null - ) { - $diffLineNumber = $this->getDiffLineNumber($builder, $file, $lineStart); + public function reportError(Builder $builder, $file, $line, $message) + { + $diffLineNumber = $this->getDiffLineNumber($builder, $file, $line); if (!is_null($diffLineNumber)) { $helper = new Github(); @@ -214,8 +190,6 @@ class GithubBuild extends RemoteGitBuild $helper->createCommitComment($repo, $commit, $file, $diffLineNumber, $message); } } - - return parent::reportError($builder, $plugin, $message, $severity, $file, $lineStart, $lineEnd); } /** @@ -227,8 +201,6 @@ class GithubBuild extends RemoteGitBuild */ protected function getDiffLineNumber(Builder $builder, $file, $line) { - $line = (integer)$line; - $builder->logExecOutput(false); $prNumber = $this->getExtra('pull_request_number'); @@ -249,6 +221,6 @@ class GithubBuild extends RemoteGitBuild $helper = new Diff(); $lines = $helper->getLinePositions($diff); - return isset($lines[$line]) ? $lines[$line] : null; + return $lines[$line]; } } diff --git a/PHPCI/Model/BuildError.php b/PHPCI/Model/BuildError.php deleted file mode 100644 index 8d005e26..00000000 --- a/PHPCI/Model/BuildError.php +++ /dev/null @@ -1,63 +0,0 @@ -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'; - } - } -} diff --git a/PHPCI/Model/Project.php b/PHPCI/Model/Project.php index 4b5268b2..4a8b3c69 100644 --- a/PHPCI/Model/Project.php +++ b/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); diff --git a/PHPCI/Model/ProjectGroup.php b/PHPCI/Model/ProjectGroup.php deleted file mode 100644 index f85e6339..00000000 --- a/PHPCI/Model/ProjectGroup.php +++ /dev/null @@ -1,18 +0,0 @@ - $lineParts[1] ); - $this->build->reportError( - $this->phpci, - 'behat', - 'Behat scenario failed.', - BuildError::SEVERITY_HIGH, - $lineParts[0], - $lineParts[1] - ); + $this->build->reportError($this->phpci, $lineParts[0], $lineParts[1], 'Behat scenario failed.'); } } diff --git a/PHPCI/Plugin/Campfire.php b/PHPCI/Plugin/Campfire.php index 59ab9128..325e6e40 100644 --- a/PHPCI/Plugin/Campfire.php +++ b/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->build = $build; - $this->message = $options['message']; + $this->phpci = $phpci; + $this->build = $build; + + $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']; - $this->url = $campfire['url']; + $campfire = $buildSettings['campfire']; + $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,12 +143,10 @@ 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) return true; } diff --git a/PHPCI/Plugin/CleanBuild.php b/PHPCI/Plugin/CleanBuild.php index 684e8e7a..2d33aee4 100644 --- a/PHPCI/Plugin/CleanBuild.php +++ b/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->build = $build; - $this->remove = isset($options['remove']) && is_array($options['remove']) ? $options['remove'] : array(); + $this->phpci = $phpci; + $this->build = $build; + $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); diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index c28e3a48..b906fb70 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -83,7 +83,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin { $this->phpci = $phpci; $this->build = $build; - $this->path = 'tests' . DIRECTORY_SEPARATOR . '_output' . DIRECTORY_SEPARATOR; + $this->path = 'tests/_output/'; if (empty($options['config'])) { $this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath); @@ -99,7 +99,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin } /** - * Runs Codeception tests + * Runs Codeception tests, optionally using specified config file(s). */ public function execute() { @@ -130,7 +130,6 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin } $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args; - if (IS_WIN) { $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args; } @@ -138,24 +137,27 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin $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); + $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(), + 'tests' => $parser->getTotalTests(), 'timetaken' => $parser->getTotalTimeTaken(), - 'failures' => $parser->getTotalFailures() + '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; diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index 7bd86ac3..38cf4d0e 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -38,7 +38,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 +55,16 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $path = $phpci->buildPath; - $this->phpci = $phpci; - $this->build = $build; - $this->directory = $path; - $this->action = 'install'; + $path = $phpci->buildPath; + $this->phpci = $phpci; + $this->build = $build; + $this->directory = $path; + $this->action = 'install'; $this->preferDist = false; - $this->preferSource = false; - $this->nodev = 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)) { @@ -76,11 +75,6 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->preferDist = (bool)$options['prefer_dist']; } - if (array_key_exists('prefer_source', $options)) { - $this->preferDist = false; - $this->preferSource = (bool)$options['prefer_source']; - } - if (array_key_exists('no_dev', $options)) { $this->nodev = (bool)$options['no_dev']; } @@ -103,12 +97,10 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin if ($this->preferDist) { $this->phpci->log('Using --prefer-dist flag'); - $cmd .= ' --prefer-dist'; - } - - if ($this->preferSource) { + $cmd .= '--prefer-dist'; + } else { $this->phpci->log('Using --prefer-source flag'); - $cmd .= ' --prefer-source'; + $cmd .= '--prefer-source'; } if ($this->nodev) { diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index f9646cac..7f447291 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/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; - $this->phpci = $phpci; - $this->build = $build; - $this->directory = isset($options['directory']) ? $options['directory'] : $path; - $this->wipe = isset($options['wipe']) ? (bool)$options['wipe'] : false; - $this->ignore = isset($options['respect_ignore']) ? (bool)$options['respect_ignore'] : false; + $path = $phpci->buildPath; + $this->phpci = $phpci; + $this->build = $build; + $this->directory = isset($options['directory']) ? $options['directory'] : $path; + $this->wipe = isset($options['wipe']) ? (bool)$options['wipe'] : false; + $this->ignore = isset($options['respect_ignore']) ? (bool)$options['respect_ignore'] : false; } /** diff --git a/PHPCI/Plugin/Deployer.php b/PHPCI/Plugin/Deployer.php deleted file mode 100644 index 9c56a340..00000000 --- a/PHPCI/Plugin/Deployer.php +++ /dev/null @@ -1,73 +0,0 @@ - -* @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']; - } -} diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 17e235e2..c2638860 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -52,9 +52,9 @@ class Email implements \PHPCI\Plugin Build $build, array $options = array() ) { - $this->phpci = $phpci; - $this->build = $build; - $this->options = $options; + $this->phpci = $phpci; + $this->build = $build; + $this->options = $options; } /** @@ -134,7 +134,7 @@ class Email implements \PHPCI\Plugin * Send an email to a list of specified subjects. * * @param array $toAddresses - * List of destination addresses for message. + * List of destinatary of message. * @param string $subject * Mail subject * @param string $body diff --git a/PHPCI/Plugin/Env.php b/PHPCI/Plugin/Env.php index b89bf67d..4e4b6563 100644 --- a/PHPCI/Plugin/Env.php +++ b/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')); diff --git a/PHPCI/Plugin/Grunt.php b/PHPCI/Plugin/Grunt.php index 4d62ffd8..1ad0ceec 100644 --- a/PHPCI/Plugin/Grunt.php +++ b/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'])) { diff --git a/PHPCI/Plugin/Gulp.php b/PHPCI/Plugin/Gulp.php index b6c6cab4..97ad9246 100644 --- a/PHPCI/Plugin/Gulp.php +++ b/PHPCI/Plugin/Gulp.php @@ -52,7 +52,7 @@ class Gulp 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'])) { diff --git a/PHPCI/Plugin/Lint.php b/PHPCI/Plugin/Lint.php index a7ddc55c..90436d70 100644 --- a/PHPCI/Plugin/Lint.php +++ b/PHPCI/Plugin/Lint.php @@ -41,9 +41,9 @@ class Lint implements PHPCI\Plugin */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; $this->build = $build; - $this->directories = array(''); + $this->directories = array(''); $this->ignore = $phpci->ignore; if (!empty($options['directory'])) { @@ -93,7 +93,7 @@ class Lint implements PHPCI\Plugin if ($item->isFile() && $item->getExtension() == 'php' && !$this->lintFile($php, $itemPath)) { $success = false; - } elseif ($item->isDir() && $this->recursive && !$this->lintDirectory($php, $itemPath . DIRECTORY_SEPARATOR)) { + } elseif ($item->isDir() && $this->recursive && !$this->lintDirectory($php, $itemPath . '/')) { $success = false; } diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php index fdb521ef..5c36a09f 100644 --- a/PHPCI/Plugin/Mysql.php +++ b/PHPCI/Plugin/Mysql.php @@ -166,11 +166,10 @@ class Mysql implements \PHPCI\Plugin $args = array( ':import_file' => escapeshellarg($import_file), ':decomp_cmd' => $decomp_cmd, - ':host' => escapeshellarg($this->host), ':user' => escapeshellarg($this->user), ':pass' => escapeshellarg($this->pass), ':database' => ($database === null)? '': escapeshellarg($database), ); - return strtr('cat :import_file :decomp_cmd | mysql -h:host -u:user -p:pass :database', $args); + return strtr('cat :import_file :decomp_cmd | mysql -u:user -p:pass :database', $args); } } diff --git a/PHPCI/Plugin/PackageBuild.php b/PHPCI/Plugin/PackageBuild.php index fb116640..8e40c71f 100644 --- a/PHPCI/Plugin/PackageBuild.php +++ b/PHPCI/Plugin/PackageBuild.php @@ -33,12 +33,12 @@ class PackageBuild implements \PHPCI\Plugin */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $path = $phpci->buildPath; - $this->build = $build; - $this->phpci = $phpci; - $this->directory = isset($options['directory']) ? $options['directory'] : $path; - $this->filename = isset($options['filename']) ? $options['filename'] : 'build'; - $this->format = isset($options['format']) ? $options['format'] : 'zip'; + $path = $phpci->buildPath; + $this->build = $build; + $this->phpci = $phpci; + $this->directory = isset($options['directory']) ? $options['directory'] : $path; + $this->filename = isset($options['filename']) ? $options['filename'] : 'build'; + $this->format = isset($options['format']) ? $options['format'] : 'zip'; } /** @@ -46,7 +46,7 @@ class PackageBuild implements \PHPCI\Plugin */ public function execute() { - $path = $this->phpci->buildPath; + $path = $this->phpci->buildPath; $build = $this->build; if ($this->directory == $path) { @@ -69,7 +69,8 @@ class PackageBuild implements \PHPCI\Plugin } foreach ($this->format as $format) { - switch ($format) { + switch($format) + { case 'tar': $cmd = 'tar cfz "%s/%s.tar.gz" ./*'; break; diff --git a/PHPCI/Plugin/Pdepend.php b/PHPCI/Plugin/Pdepend.php index faef406d..73b669c1 100644 --- a/PHPCI/Plugin/Pdepend.php +++ b/PHPCI/Plugin/Pdepend.php @@ -73,11 +73,8 @@ class Pdepend implements \PHPCI\Plugin */ public function execute() { - if (!file_exists($this->location)) { - mkdir($this->location); - } if (!is_writable($this->location)) { - throw new \Exception(sprintf('The location %s is not writable or does not exist.', $this->location)); + throw new \Exception(sprintf('The location %s is not writable.', $this->location)); } $pdepend = $this->phpci->findBinary('pdepend'); diff --git a/PHPCI/Plugin/Pgsql.php b/PHPCI/Plugin/Pgsql.php index 60057464..9d0f924d 100644 --- a/PHPCI/Plugin/Pgsql.php +++ b/PHPCI/Plugin/Pgsql.php @@ -73,9 +73,9 @@ class Pgsql implements \PHPCI\Plugin } /** - * Connects to PgSQL and runs a specified set of queries. - * @return boolean - */ + * Connects to PgSQL and runs a specified set of queries. + * @return boolean + */ public function execute() { try { diff --git a/PHPCI/Plugin/Phar.php b/PHPCI/Plugin/Phar.php index c734bb6c..0500fddc 100644 --- a/PHPCI/Plugin/Phar.php +++ b/PHPCI/Plugin/Phar.php @@ -213,7 +213,7 @@ class Phar implements \PHPCI\Plugin $content = ''; $filename = $this->getStub(); if ($filename) { - $content = file_get_contents($this->getPHPCI()->buildPath . DIRECTORY_SEPARATOR . $this->getStub()); + $content = file_get_contents($this->getPHPCI()->buildPath . '/' . $this->getStub()); } return $content; } @@ -227,8 +227,7 @@ class Phar implements \PHPCI\Plugin $success = false; try { - $file = $this->getDirectory() . DIRECTORY_SEPARATOR . $this->getFilename(); - $phar = new PHPPhar($file, 0, $this->getFilename()); + $phar = new PHPPhar($this->getDirectory() . '/' . $this->getFilename(), 0, $this->getFilename()); $phar->buildFromDirectory($this->getPHPCI()->buildPath, $this->getRegExp()); $stub = $this->getStubContent(); @@ -237,6 +236,7 @@ class Phar implements \PHPCI\Plugin } $success = true; + } catch (Exception $e) { $this->getPHPCI()->log(Lang::get('phar_internal_error')); $this->getPHPCI()->log($e->getMessage()); diff --git a/PHPCI/Plugin/Phing.php b/PHPCI/Plugin/Phing.php index e322b72e..3a5bd834 100644 --- a/PHPCI/Plugin/Phing.php +++ b/PHPCI/Plugin/Phing.php @@ -47,7 +47,7 @@ class Phing implements \PHPCI\Plugin * Set working directory */ if (isset($options['directory'])) { - $directory = $phpci->buildPath . DIRECTORY_SEPARATOR . $options['directory']; + $directory = $phpci->buildPath . '/' . $options['directory']; } else { $directory = $phpci->buildPath; } @@ -255,7 +255,7 @@ class Phing implements \PHPCI\Plugin */ public function setPropertyFile($propertyFile) { - if (!file_exists($this->getDirectory() . DIRECTORY_SEPARATOR . $propertyFile)) { + if (!file_exists($this->getDirectory() . '/' . $propertyFile)) { throw new \Exception(Lang::get('property_file_missing')); } diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index 6f4ed4e0..877d24c6 100644 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -12,7 +12,6 @@ namespace PHPCI\Plugin; use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; -use PHPCI\Model\BuildError; /** * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing. @@ -164,13 +163,14 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin ); $output = $this->phpci->getLastOutput(); - list($errors, $warnings) = $this->processReport($output); + list($errors, $warnings, $data) = $this->processReport($output); $this->phpci->logExecOutput(true); $success = true; $this->build->storeMeta('phpcs-warnings', $warnings); $this->build->storeMeta('phpcs-errors', $errors); + $this->build->storeMeta('phpcs-data', $data); if ($this->allowed_warnings != -1 && $warnings > $this->allowed_warnings) { $success = false; @@ -226,21 +226,23 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $errors = $data['totals']['errors']; $warnings = $data['totals']['warnings']; + $rtn = array(); + foreach ($data['files'] as $fileName => $file) { $fileName = str_replace($this->phpci->buildPath, '', $fileName); foreach ($file['messages'] as $message) { - $this->build->reportError( - $this->phpci, - 'php_code_sniffer', - 'PHPCS: ' . $message['message'], - $message['type'] == 'ERROR' ? BuildError::SEVERITY_HIGH : BuildError::SEVERITY_LOW, - $fileName, - $message['line'] + $this->build->reportError($this->phpci, $fileName, $message['line'], 'PHPCS: ' . $message['message']); + + $rtn[] = array( + 'file' => $fileName, + 'line' => $message['line'], + 'type' => $message['type'], + 'message' => $message['message'], ); } } - return array($errors, $warnings); + return array($errors, $warnings, $rtn); } } diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php old mode 100755 new mode 100644 index aa076d2d..6433308f --- a/PHPCI/Plugin/PhpCpd.php +++ b/PHPCI/Plugin/PhpCpd.php @@ -12,7 +12,6 @@ namespace PHPCI\Plugin; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; -use PHPCI\Model\BuildError; /** * PHP Copy / Paste Detector - Allows PHP Copy / Paste Detector testing. @@ -29,7 +28,7 @@ class PhpCpd implements \PHPCI\Plugin /** * @var string, based on the assumption the root may not hold the code to be - * tested, extends the base path + * tested, exteds the base path */ protected $path; @@ -50,12 +49,17 @@ class PhpCpd implements \PHPCI\Plugin $this->build = $build; $this->path = $phpci->buildPath; + $this->standard = 'PSR1'; $this->ignore = $phpci->ignore; if (!empty($options['path'])) { $this->path = $phpci->buildPath . $options['path']; } + if (!empty($options['standard'])) { + $this->standard = $options['standard']; + } + if (!empty($options['ignore'])) { $this->ignore = $options['ignore']; } @@ -70,9 +74,9 @@ class PhpCpd implements \PHPCI\Plugin if (count($this->ignore)) { $map = function ($item) { // remove the trailing slash - $item = rtrim($item, DIRECTORY_SEPARATOR); + $item = (substr($item, -1) == '/' ? substr($item, 0, -1) : $item); - if (is_file(rtrim($this->path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $item)) { + if (is_file($this->path . '/' . $item)) { return ' --names-exclude ' . $item; } else { return ' --exclude ' . $item; @@ -93,8 +97,9 @@ class PhpCpd implements \PHPCI\Plugin print $this->phpci->getLastOutput(); - $errorCount = $this->processReport(file_get_contents($tmpfilename)); + list($errorCount, $data) = $this->processReport(file_get_contents($tmpfilename)); $this->build->storeMeta('phpcpd-warnings', $errorCount); + $this->build->storeMeta('phpcpd-data', $data); unlink($tmpfilename); @@ -117,11 +122,20 @@ class PhpCpd implements \PHPCI\Plugin } $warnings = 0; + $data = array(); + foreach ($xml->duplication as $duplication) { foreach ($duplication->file as $file) { $fileName = (string)$file['path']; $fileName = str_replace($this->phpci->buildPath, '', $fileName); + $data[] = array( + 'file' => $fileName, + 'line_start' => (int) $file['line'], + 'line_end' => (int) $file['line'] + (int) $duplication['lines'], + 'code' => (string) $duplication->codefragment + ); + $message = <<build->reportError( - $this->phpci, - 'php_cpd', - $message, - BuildError::SEVERITY_NORMAL, - $fileName, - $file['line'], - (int) $file['line'] + (int) $duplication['lines'] - ); + $this->build->reportError($this->phpci, $fileName, $file['line'], $message); + } $warnings++; } - return $warnings; + return array($warnings, $data); } } diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php index 9aa0d33f..e07db718 100644 --- a/PHPCI/Plugin/PhpCsFixer.php +++ b/PHPCI/Plugin/PhpCsFixer.php @@ -14,7 +14,7 @@ use PHPCI\Helper\Lang; use PHPCI\Model\Build; /** -* PHP CS Fixer - Works with the PHP Coding Standards Fixer for testing coding standards. +* PHP CS Fixer - Works with the PHP CS Fixer for testing coding standards. * @author Gabriel Baker * @package PHPCI * @subpackage Plugins @@ -32,10 +32,10 @@ class PhpCsFixer implements \PHPCI\Plugin protected $build; protected $workingDir = ''; - protected $level = ' --level=psr2'; - protected $verbose = ''; - protected $diff = ''; - protected $levels = array('psr0', 'psr1', 'psr2', 'symfony'); + protected $level = ' --level=all'; + protected $verbose = ''; + protected $diff = ''; + protected $levels = array('psr0', 'psr1', 'psr2', 'all'); /** * Standard Constructor diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php index 2396497c..7fb0fe11 100644 --- a/PHPCI/Plugin/PhpDocblockChecker.php +++ b/PHPCI/Plugin/PhpDocblockChecker.php @@ -143,6 +143,7 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $success = true; $this->build->storeMeta('phpdoccheck-warnings', $errors); + $this->build->storeMeta('phpdoccheck-data', $output); $this->reportErrors($output); if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { @@ -159,22 +160,13 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin protected function reportErrors($output) { foreach ($output as $error) { - $message = 'Class ' . $error['class'] . ' is missing a docblock.'; - $severity = PHPCI\Model\BuildError::SEVERITY_LOW; + $message = 'Class ' . $error['class'] . ' does not have a Docblock comment.'; if ($error['type'] == 'method') { - $message = $error['class'] . '::' . $error['method'] . ' is missing a docblock.'; - $severity = PHPCI\Model\BuildError::SEVERITY_NORMAL; + $message = 'Method ' . $error['class'] . '::' . $error['method'] . ' does not have a Docblock comment.'; } - $this->build->reportError( - $this->phpci, - 'php_docblock_checker', - $message, - $severity, - $error['file'], - $error['line'] - ); + $this->build->reportError($this->phpci, $error['file'], $error['line'], $message); } } } diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php index c8dedb91..76887493 100644 --- a/PHPCI/Plugin/PhpLoc.php +++ b/PHPCI/Plugin/PhpLoc.php @@ -69,20 +69,19 @@ class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin public function execute() { $ignore = ''; - if (count($this->phpci->ignore)) { - $map = function ($item) { - return ' --exclude ' . rtrim($item, DIRECTORY_SEPARATOR); + $map = function ($item) { + return ' --exclude ' . (substr($item, -1) == '/' ? substr($item, 0, -1) : $item); }; - $ignore = array_map($map, $this->phpci->ignore); + $ignore = implode('', $ignore); } $phploc = $this->phpci->findBinary('phploc'); $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->directory); - $output = $this->phpci->getLastOutput(); + $output = $this->phpci->getLastOutput(); if (preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) { $data = array(); diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index ec92bc61..b02f5f09 100644 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -38,7 +38,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin /** * @var string, based on the assumption the root may not hold the code to be - * tested, extends the base path only if the provided path is relative. Absolute + * tested, exteds the base path only if the provided path is relative. Absolute * paths are used verbatim */ protected $path; @@ -50,7 +50,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin /** * Array of PHPMD rules. Can be one of the builtins (codesize, unusedcode, naming, design, controversial) - * or a filename (detected by checking for a / in it), either absolute or relative to the project root. + * or a filenname (detected by checking for a / in it), either absolute or relative to the project root. * @var array */ protected $rules; @@ -123,8 +123,9 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->executePhpMd($phpmdBinaryPath); - $errorCount = $this->processReport(trim($this->phpci->getLastOutput())); + list($errorCount, $data) = $this->processReport(trim($this->phpci->getLastOutput())); $this->build->storeMeta('phpmd-warnings', $errorCount); + $this->build->storeMeta('phpmd-data', $data); return $this->wasLastExecSuccessful($errorCount); } @@ -157,6 +158,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } $warnings = 0; + $data = array(); foreach ($xml->file as $file) { $fileName = (string)$file['name']; @@ -164,20 +166,22 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin foreach ($file->violation as $violation) { $warnings++; - - $this->build->reportError( - $this->phpci, - 'php_mess_detector', - (string)$violation, - PHPCI\Model\BuildError::SEVERITY_HIGH, - $fileName, - (int)$violation['beginline'], - (int)$violation['endline'] + $warning = array( + 'file' => $fileName, + 'line_start' => (int)$violation['beginline'], + 'line_end' => (int)$violation['endline'], + 'rule' => (string)$violation['rule'], + 'ruleset' => (string)$violation['ruleset'], + 'priority' => (int)$violation['priority'], + 'message' => (string)$violation, ); + + $this->build->reportError($this->phpci, $fileName, (int)$violation['beginline'], (string)$violation); + $data[] = $warning; } } - return $warnings; + return array($warnings, $data); } /** diff --git a/PHPCI/Plugin/PhpParallelLint.php b/PHPCI/Plugin/PhpParallelLint.php index febed528..8b7528de 100644 --- a/PHPCI/Plugin/PhpParallelLint.php +++ b/PHPCI/Plugin/PhpParallelLint.php @@ -55,10 +55,10 @@ class PhpParallelLint implements \PHPCI\Plugin */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; - $this->build = $build; - $this->directory = $phpci->buildPath; - $this->ignore = $this->phpci->ignore; + $this->phpci = $phpci; + $this->build = $build; + $this->directory = $phpci->buildPath; + $this->ignore = $this->phpci->ignore; if (isset($options['directory'])) { $this->directory = $phpci->buildPath.$options['directory']; diff --git a/PHPCI/Plugin/PhpTalLint.php b/PHPCI/Plugin/PhpTalLint.php index 8513ec36..e12b6c34 100644 --- a/PHPCI/Plugin/PhpTalLint.php +++ b/PHPCI/Plugin/PhpTalLint.php @@ -155,7 +155,7 @@ class PhpTalLint implements PHPCI\Plugin if (!$this->lintFile($itemPath)) { $success = false; } - } elseif ($item->isDir() && $this->recursive && !$this->lintDirectory($itemPath . DIRECTORY_SEPARATOR)) { + } elseif ($item->isDir() && $this->recursive && !$this->lintDirectory($itemPath . '/')) { $success = false; } @@ -202,9 +202,7 @@ class PhpTalLint implements PHPCI\Plugin list($suffixes, $tales) = $this->getFlags(); - $lint = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; - $lint .= 'vendor' . DIRECTORY_SEPARATOR . 'phptal' . DIRECTORY_SEPARATOR . 'phptal' . DIRECTORY_SEPARATOR; - $lint .= 'tools' . DIRECTORY_SEPARATOR . 'phptal_lint.php'; + $lint = dirname(__FILE__) . '/../../vendor/phptal/phptal/tools/phptal_lint.php'; $cmd = '/usr/bin/env php ' . $lint . ' %s %s "%s"'; $this->phpci->executeCommand($cmd, $suffixes, $tales, $this->phpci->buildPath . $path); @@ -224,7 +222,7 @@ class PhpTalLint implements PHPCI\Plugin $row = str_replace('(use -i to include your custom modifier functions)', '', $row); $message = str_replace($name . ': ', '', $row); - + $parts = explode(' (line ', $message); $message = trim($parts[0]); diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index f716f079..7fb626df 100644 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -76,8 +76,8 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return 'phpunit.xml'; } - if (file_exists($buildPath . 'tests' . DIRECTORY_SEPARATOR . 'phpunit.xml')) { - return 'tests' . DIRECTORY_SEPARATOR . 'phpunit.xml'; + if (file_exists($buildPath . 'tests/phpunit.xml')) { + return 'tests/phpunit.xml'; } if (file_exists($buildPath . 'phpunit.xml.dist')) { @@ -85,7 +85,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (file_exists($buildPath . 'tests/phpunit.xml.dist')) { - return 'tests' . DIRECTORY_SEPARATOR . 'phpunit.xml.dist'; + return 'tests/phpunit.xml.dist'; } return null; @@ -133,7 +133,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (isset($options['coverage'])) { - $this->coverage = ' --coverage-html ' . $this->phpci->interpolate($options['coverage']) . ' '; + $this->coverage = " --coverage-html {$options['coverage']} "; } } @@ -194,7 +194,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } else { if ($this->runFrom) { $curdir = getcwd(); - chdir($this->phpci->buildPath . DIRECTORY_SEPARATOR . $this->runFrom); + chdir($this->phpci->buildPath.'/'.$this->runFrom); } $phpunit = $this->phpci->findBinary('phpunit'); diff --git a/PHPCI/Plugin/SlackNotify.php b/PHPCI/Plugin/SlackNotify.php index 0e8d1cad..65a190fd 100644 --- a/PHPCI/Plugin/SlackNotify.php +++ b/PHPCI/Plugin/SlackNotify.php @@ -24,7 +24,6 @@ class SlackNotify implements \PHPCI\Plugin private $username; private $message; private $icon; - private $show_status; /** * Set up the plugin, configure options, etc. @@ -61,12 +60,6 @@ class SlackNotify implements \PHPCI\Plugin $this->username = 'PHPCI'; } - if (isset($options['show_status'])) { - $this->show_status = (bool) $options['show_status']; - } else { - $this->show_status = true; - } - if (isset($options['icon'])) { $this->icon = $options['icon']; } @@ -81,7 +74,31 @@ class SlackNotify implements \PHPCI\Plugin */ public function execute() { - $body = $this->phpci->interpolate($this->message); + $message = $this->phpci->interpolate($this->message); + + $successfulBuild = $this->build->isSuccessful(); + + if ($successfulBuild) { + $status = 'Success'; + $color = 'good'; + } else { + $status = 'Failed'; + $color = 'danger'; + } + + // Build up the attachment data + $attachment = new \Maknz\Slack\Attachment(array( + 'fallback' => $message, + 'pretext' => $message, + 'color' => $color, + 'fields' => array( + new \Maknz\Slack\AttachmentField(array( + 'title' => 'Status', + 'value' => $status, + 'short' => false + )) + ) + )); $client = new \Maknz\Slack\Client($this->webHook); @@ -99,39 +116,12 @@ class SlackNotify implements \PHPCI\Plugin $message->setIcon($this->icon); } - // Include an attachment which shows the status and hide the message - if ($this->show_status) { - $successfulBuild = $this->build->isSuccessful(); + $message->attach($attachment); - if ($successfulBuild) { - $status = 'Success'; - $color = 'good'; - } else { - $status = 'Failed'; - $color = 'danger'; - } + $success = true; - // Build up the attachment data - $attachment = new \Maknz\Slack\Attachment(array( - 'fallback' => $body, - 'pretext' => $body, - 'color' => $color, - 'fields' => array( - new \Maknz\Slack\AttachmentField(array( - 'title' => 'Status', - 'value' => $status, - 'short' => false - )) - ) - )); + $message->send(''); - $message->attach($attachment); - - $body = ''; - } - - $message->send($body); - - return true; + return $success; } } diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index 6d4711b5..163c94c6 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -124,11 +124,12 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $success = true; $this->phpci->logExecOutput(false); - $errorCount = $this->getErrorList(); + list($errorCount, $data) = $this->getErrorList(); $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); $this->build->storeMeta('technical_debt-warnings', $errorCount); + $this->build->storeMeta('technical_debt-data', $data); if ($this->allowed_errors != -1 && $errorCount > $this->allowed_errors) { $success = false; @@ -150,7 +151,6 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $ignores = $this->ignore; $ignores[] = 'phpci.yml'; - $ignores[] = '.phpci.yml'; foreach ($iterator as $file) { $filePath = $file->getRealPath(); @@ -163,7 +163,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } // Ignore hidden files, else .git, .sass_cache, etc. all get looped over - if (stripos($filePath, DIRECTORY_SEPARATOR . '.') !== false) { + if (stripos($filePath, '/.') !== false) { $skipFile = true; } @@ -174,6 +174,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $files = array_filter(array_unique($files)); $errorCount = 0; + $data = array(); foreach ($files as $file) { foreach ($this->searches as $search) { @@ -187,21 +188,21 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $content = trim($allLines[$lineNumber - 1]); $errorCount++; + $this->phpci->log("Found $search on line $lineNumber of $file:\n$content"); $fileName = str_replace($this->directory, '', $file); - - $this->build->reportError( - $this->phpci, - 'technical_debt', - $content, - PHPCI\Model\BuildError::SEVERITY_LOW, - $fileName, - $lineNumber + $data[] = array( + 'file' => $fileName, + 'line' => $lineNumber, + 'message' => $content ); + + $this->build->reportError($this->phpci, $fileName, $lineNumber, $content); + } } } - return $errorCount; + return array( $errorCount, $data ); } } diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index bdd06b7e..3ca244af 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -50,89 +50,12 @@ class Executor public function executePlugins(&$config, $stage) { $success = true; - $pluginsToExecute = array(); - - // If we have global plugins to execute for this stage, add them to the list to be executed: - if (array_key_exists($stage, $config) && is_array($config[$stage])) { - $pluginsToExecute[] = $config[$stage]; + // Ignore any stages for which we don't have plugins set: + if (!array_key_exists($stage, $config) || !is_array($config[$stage])) { + return $success; } - $pluginsToExecute = $this->getBranchSpecificPlugins($config, $stage, $pluginsToExecute); - - foreach ($pluginsToExecute as $pluginSet) { - if (!$this->doExecutePlugins($pluginSet, $stage)) { - $success = false; - } - } - - return $success; - } - - /** - * Check the config for any plugins specific to the branch we're currently building. - * @param $config - * @param $stage - * @param $pluginsToExecute - * @return array - */ - protected function getBranchSpecificPlugins(&$config, $stage, $pluginsToExecute) - { - /** @var \PHPCI\Model\Build $build */ - $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build'); - $branch = $build->getBranch(); - - // If we don't have any branch-specific plugins: - if (!isset($config['branch-' . $branch][$stage]) || !is_array($config['branch-' . $branch][$stage])) { - return $pluginsToExecute; - } - - // If we have branch-specific plugins to execute, add them to the list to be executed: - $branchConfig = $config['branch-' . $branch]; - $plugins = $branchConfig[$stage]; - - $runOption = 'after'; - - if (!empty($branchConfig['run-option'])) { - $runOption = $branchConfig['run-option']; - } - - switch ($runOption) { - // Replace standard plugin set for this stage with just the branch-specific ones: - case 'replace': - $pluginsToExecute = array(); - $pluginsToExecute[] = $plugins; - break; - - // Run branch-specific plugins before standard plugins: - case 'before': - array_unshift($pluginsToExecute, $plugins); - break; - - // Run branch-specific plugins after standard plugins: - case 'after': - array_push($pluginsToExecute, $plugins); - break; - - default: - array_push($pluginsToExecute, $plugins); - break; - } - - return $pluginsToExecute; - } - - /** - * Execute the list of plugins found for a given testing stage. - * @param $plugins - * @param $stage - * @return bool - * @throws \Exception - */ - protected function doExecutePlugins(&$plugins, $stage) - { - $success = true; - - foreach ($plugins as $plugin => $options) { + foreach ($config[$stage] as $plugin => $options) { $this->logger->log(Lang::get('running_plugin', $plugin)); $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING); diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index b6d11e5e..30c68340 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -8,8 +8,8 @@ namespace PHPCI\Plugin\Util; */ class Factory { - const TYPE_ARRAY = "array"; - const TYPE_CALLABLE = "callable"; + const TYPE_ARRAY = "array"; + const TYPE_CALLABLE = "callable"; const INTERFACE_PHPCI_PLUGIN = '\PHPCI\Plugin'; private $currentPluginOptions; diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php index 35587283..d5ccebd5 100644 --- a/PHPCI/Plugin/Util/FilesPluginInformation.php +++ b/PHPCI/Plugin/Util/FilesPluginInformation.php @@ -56,7 +56,6 @@ class FilesPluginInformation implements InstalledPluginInformation if ($this->pluginInfo === null) { $this->loadPluginInfo(); } - return $this->pluginInfo; } @@ -84,7 +83,7 @@ class FilesPluginInformation implements InstalledPluginInformation $this->pluginInfo = array(); foreach ($this->files as $fileInfo) { if ($fileInfo instanceof \SplFileInfo) { - if ($fileInfo->isFile() && $fileInfo->getExtension() == 'php') { + if ($fileInfo->isFile() && $fileInfo->getExtension()=='php') { $this->addPluginFromFile($fileInfo); } } @@ -100,11 +99,11 @@ class FilesPluginInformation implements InstalledPluginInformation $class = $this->getFullClassFromFile($fileInfo); if (!is_null($class)) { - $newPlugin = new \stdClass(); - $newPlugin->class = $class; + $newPlugin = new \stdClass(); + $newPlugin->class = $class; $newPlugin->source = "core"; - $parts = explode('\\', $newPlugin->class); - $newPlugin->name = end($parts); + $parts = explode('\\', $newPlugin->class); + $newPlugin->name = end($parts); $this->pluginInfo[] = $newPlugin; } @@ -124,11 +123,11 @@ class FilesPluginInformation implements InstalledPluginInformation if (isset($matches[1])) { $className = $matches[1]; - + $matches = array(); preg_match('#namespace +([A-Za-z\\\\]+);#i', $contents, $matches); $namespace = $matches[1]; - + return $namespace . '\\' . $className; } else { return null; diff --git a/PHPCI/Plugin/Util/PluginInformationCollection.php b/PHPCI/Plugin/Util/PluginInformationCollection.php index 906935e5..16341733 100644 --- a/PHPCI/Plugin/Util/PluginInformationCollection.php +++ b/PHPCI/Plugin/Util/PluginInformationCollection.php @@ -32,11 +32,9 @@ class PluginInformationCollection implements InstalledPluginInformation public function getInstalledPlugins() { $arr = array(); - foreach ($this->pluginInformations as $single) { $arr = array_merge($arr, $single->getInstalledPlugins()); } - return $arr; } @@ -49,11 +47,9 @@ class PluginInformationCollection implements InstalledPluginInformation public function getPluginClasses() { $arr = array(); - foreach ($this->pluginInformations as $single) { $arr = array_merge($arr, $single->getPluginClasses()); } - return $arr; } } diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 86981566..18772a6a 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -13,10 +13,9 @@ use Symfony\Component\Yaml\Yaml; class TapParser { const TEST_COUNTS_PATTERN = '/^\d+\.\.(\d+)/'; - const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i'; - const TEST_YAML_START = '/^(\s*)---/'; - const TEST_DIAGNOSTIC = '/^#/'; - const TEST_COVERAGE = '/^Generating/'; + const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i'; + const TEST_YAML_START = '/^(\s*)---/'; + const TEST_DIAGNOSTIC = '/^#/'; /** * @var string @@ -74,7 +73,7 @@ class TapParser $line = $this->nextLine(); if ($line === $header) { - throw new Exception("Duplicated TAP log, please check the configuration."); + throw new Exception("Duplicated TAP log, please check the configration."); } while ($line !== false && ($this->testCount === false || count($this->results) < $this->testCount)) { @@ -82,7 +81,7 @@ class TapParser $line = $this->nextLine(); } - if (false !== $this->testCount && count($this->results) !== $this->testCount) { + if (count($this->results) !== $this->testCount) { throw new Exception(Lang::get('tap_error')); } @@ -97,7 +96,7 @@ class TapParser */ protected function findTapLog() { - // Look for the beginning of the TAP output + // Look for the beggning of the TAP output do { $header = $this->nextLine(); } while ($header !== false && substr($header, 0, 12) !== 'TAP version '); @@ -124,14 +123,19 @@ class TapParser return false; } - /** - * @param string $line + /** Parse a single line. * - * @return boolean + * @param string $line */ - protected function testLine($line) + protected function parseLine($line) { - if (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { + if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { + $this->testCount = intval($matches[1]); + + } elseif (preg_match(self::TEST_DIAGNOSTIC, $line)) { + return; + + } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { $this->results[] = $this->processTestLine( $matches[1], isset($matches[2]) ? $matches[2] : '', @@ -139,61 +143,18 @@ class TapParser isset($matches[4]) ? $matches[4] : null ); - return true; - } - - return false; - } - - /** - * @param string $line - * - * @return boolean - */ - protected function yamlLine($line) - { - if (preg_match(self::TEST_YAML_START, $line, $matches)) { + } elseif (preg_match(self::TEST_YAML_START, $line, $matches)) { $diagnostic = $this->processYamlBlock($matches[1]); - $test = array_pop($this->results); + $test = array_pop($this->results); if (isset($test['message'], $diagnostic['message'])) { $test['message'] .= PHP_EOL . $diagnostic['message']; unset($diagnostic['message']); } $this->results[] = array_replace($test, $diagnostic); - return true; + } else { + throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line)); } - - return false; - } - - /** Parse a single line. - * - * @param string $line - * - * @throws Exception - */ - protected function parseLine($line) - { - if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) { - return; - } - - if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) { - $this->testCount = intval($matches[1]); - - return; - } - - if ($this->testLine($line)) { - return; - } - - if ($this->yamlLine($line)) { - return; - } - - throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line)); } /** @@ -235,20 +196,18 @@ class TapParser */ protected function processYamlBlock($indent) { - $startLine = $this->lineNumber + 1; - $endLine = $indent . '...'; + $startLine = $this->lineNumber+1; + $endLine = $indent.'...'; $yamlLines = array(); - do { $line = $this->nextLine(); - if ($line === false) { throw new Exception(Lang::get('tap_error_endless_yaml', $startLine)); } elseif ($line === $endLine) { break; } - $yamlLines[] = substr($line, strlen($indent)); + } while (true); return Yaml::parse(join("\n", $yamlLines)); diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php index 24af62e4..249579be 100644 --- a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php +++ b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php @@ -20,7 +20,6 @@ class Codeception implements ParserInterface protected $totalTests; protected $totalTimeTaken; protected $totalFailures; - protected $totalErrors; /** * @param Builder $phpci @@ -30,6 +29,7 @@ class Codeception implements ParserInterface { $this->phpci = $phpci; $this->resultsXml = $resultsXml; + $this->totalTests = 0; } @@ -47,7 +47,6 @@ class Codeception implements ParserInterface $this->totalTests += (int) $testsuite['tests']; $this->totalTimeTaken += (float) $testsuite['time']; $this->totalFailures += (int) $testsuite['failures']; - $this->totalErrors += (int) $testsuite['errors']; foreach ($testsuite->testcase as $testcase) { $testresult = array( @@ -68,9 +67,9 @@ class Codeception implements ParserInterface $testresult['feature'] = sprintf('%s::%s', $testresult['class'], $testresult['name']); } - if (isset($testcase->failure) || isset($testcase->error)) { + if (isset($testcase->failure)) { $testresult['pass'] = false; - $testresult['message'] = (string)$testcase->failure . (string)$testcase->error; + $testresult['message'] = (string) $testcase->failure; } else { $testresult['pass'] = true; } @@ -109,6 +108,6 @@ class Codeception implements ParserInterface */ public function getTotalFailures() { - return $this->totalFailures + $this->totalErrors; + return $this->totalFailures; } } diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php index e6b619a0..86e543b5 100644 --- a/PHPCI/Plugin/Wipe.php +++ b/PHPCI/Plugin/Wipe.php @@ -43,7 +43,7 @@ class Wipe implements \PHPCI\Plugin $path = $phpci->buildPath; $this->phpci = $phpci; $this->build = $build; - $this->directory = isset($options['directory']) ? $this->phpci->interpolate($options['directory']) : $path; + $this->directory = isset($options['directory']) ? $options['directory'] : $path; } /** diff --git a/PHPCI/Plugin/Xmpp.php b/PHPCI/Plugin/Xmpp.php index ccfc4399..0362aa85 100644 --- a/PHPCI/Plugin/Xmpp.php +++ b/PHPCI/Plugin/Xmpp.php @@ -132,9 +132,8 @@ class XMPP implements \PHPCI\Plugin */ public function findConfigFile() { - if (file_exists($this->phpci->buildPath . DIRECTORY_SEPARATOR . '.sendxmpprc')) { - if (md5(file_get_contents($this->phpci->buildPath . DIRECTORY_SEPARATOR . '.sendxmpprc')) - !== md5($this->getConfigFormat())) { + if (file_exists($this->phpci->buildPath . '/.sendxmpprc')) { + if (md5(file_get_contents($this->phpci->buildPath . '/.sendxmpprc')) !== md5($this->getConfigFormat())) { return null; } @@ -161,7 +160,7 @@ class XMPP implements \PHPCI\Plugin /* * Try to build conf file */ - $config_file = $this->phpci->buildPath . DIRECTORY_SEPARATOR . '.sendxmpprc'; + $config_file = $this->phpci->buildPath . '/.sendxmpprc'; if (is_null($this->findConfigFile())) { file_put_contents($config_file, $this->getConfigFormat()); chmod($config_file, 0600); @@ -175,7 +174,7 @@ class XMPP implements \PHPCI\Plugin $tls = ' -t'; } - $message_file = $this->phpci->buildPath . DIRECTORY_SEPARATOR . uniqid('xmppmessage'); + $message_file = $this->phpci->buildPath . '/' . uniqid('xmppmessage'); if ($this->buildMessage($message_file) === false) { return false; } diff --git a/PHPCI/ProcessControl/Factory.php b/PHPCI/ProcessControl/Factory.php index 7622fd49..a1aa2354 100644 --- a/PHPCI/ProcessControl/Factory.php +++ b/PHPCI/ProcessControl/Factory.php @@ -47,7 +47,7 @@ class Factory */ public static function createProcessControl() { - switch (true) { + switch(true) { case PosixProcessControl::isAvailable(): return new PosixProcessControl(); diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/PHPCI/ProcessControl/PosixProcessControl.php index bac55ee2..710ba9f1 100644 --- a/PHPCI/ProcessControl/PosixProcessControl.php +++ b/PHPCI/ProcessControl/PosixProcessControl.php @@ -31,7 +31,7 @@ class PosixProcessControl implements ProcessControlInterface * Sends a TERMINATE or KILL signal to the process using posix_kill. * * @param int $pid - * @param bool $forcefully Whether to send TERMINATE (false) or KILL (true). + * @param bool $forcefully Whetehr to send TERMINATE (false) or KILL (true). */ public function kill($pid, $forcefully = false) { diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php index a120a64e..ca2fae4d 100644 --- a/PHPCI/Service/BuildService.php +++ b/PHPCI/Service/BuildService.php @@ -9,10 +9,6 @@ namespace PHPCI\Service; -use b8\Config; -use Pheanstalk\Pheanstalk; -use Pheanstalk\PheanstalkInterface; -use PHPCI\BuildFactory; use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Model\Project; @@ -30,11 +26,6 @@ class BuildService */ protected $buildStore; - /** - * @var bool - */ - public $queueError = false; - /** * @param BuildStore $buildStore */ @@ -90,17 +81,7 @@ class BuildService $build->setExtra(json_encode($extra)); } - $build = $this->buildStore->save($build); - - $buildId = $build->getId(); - - if (!empty($buildId)) { - $build = BuildFactory::getBuild($build); - $build->sendStatusPostback(); - $this->addBuildToQueue($build); - } - - return $build; + return $this->buildStore->save($build); } /** @@ -123,17 +104,7 @@ class BuildService $build->setCreated(new \DateTime()); $build->setStatus(0); - $build = $this->buildStore->save($build); - - $buildId = $build->getId(); - - if (!empty($buildId)) { - $build = BuildFactory::getBuild($build); - $build->sendStatusPostback(); - $this->addBuildToQueue($build); - } - - return $build; + return $this->buildStore->save($build); } /** @@ -146,44 +117,4 @@ class BuildService $build->removeBuildDirectory(); return $this->buildStore->delete($build); } - - /** - * Takes a build and puts it into the queue to be run (if using a queue) - * @param Build $build - */ - public function addBuildToQueue(Build $build) - { - $buildId = $build->getId(); - - if (empty($buildId)) { - return; - } - - $config = Config::getInstance(); - $settings = $config->get('phpci.worker', []); - - if (!empty($settings['host']) && !empty($settings['queue'])) { - try { - $jobData = array( - 'type' => 'phpci.build', - 'build_id' => $build->getId(), - ); - - if ($config->get('using_custom_file')) { - $jobData['config'] = $config->getArray(); - } - - $pheanstalk = new Pheanstalk($settings['host']); - $pheanstalk->useTube($settings['queue']); - $pheanstalk->put( - json_encode($jobData), - PheanstalkInterface::DEFAULT_PRIORITY, - PheanstalkInterface::DEFAULT_DELAY, - $config->get('phpci.worker.job_timeout', 600) - ); - } catch (\Exception $ex) { - $this->queueError = true; - } - } - } } diff --git a/PHPCI/Service/ProjectService.php b/PHPCI/Service/ProjectService.php index 8b07b0a9..c7ba787c 100644 --- a/PHPCI/Service/ProjectService.php +++ b/PHPCI/Service/ProjectService.php @@ -89,10 +89,6 @@ class ProjectService $project->setBranch($options['branch']); } - if (array_key_exists('group', $options)) { - $project->setGroup($options['group']); - } - // Allow certain project types to set access information: $this->processAccessInformation($project); diff --git a/PHPCI/Store/Base/BuildErrorStoreBase.php b/PHPCI/Store/Base/BuildErrorStoreBase.php deleted file mode 100644 index 627b9d54..00000000 --- a/PHPCI/Store/Base/BuildErrorStoreBase.php +++ /dev/null @@ -1,85 +0,0 @@ -getById($value, $useConnection); - } - - /** - * Get a single BuildError by Id. - * @return null|BuildError - */ - public function getById($value, $useConnection = 'read') - { - if (is_null($value)) { - throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); - } - - $query = 'SELECT * FROM `build_error` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':id', $value); - - if ($stmt->execute()) { - if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) { - return new BuildError($data); - } - } - - return null; - } - - /** - * Get multiple BuildError by BuildId. - * @return array - */ - public function getByBuildId($value, $limit = 1000, $useConnection = 'read') - { - if (is_null($value)) { - throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); - } - - - $query = 'SELECT * FROM `build_error` WHERE `build_id` = :build_id LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':build_id', $value); - $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); - - if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new BuildError($item); - }; - $rtn = array_map($map, $res); - - $count = count($rtn); - - return array('items' => $rtn, 'count' => $count); - } else { - return array('items' => array(), 'count' => 0); - } - } -} diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 52665d79..7a3d4159 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -21,7 +21,10 @@ class BuildMetaStoreBase extends Store protected $primaryKey = 'id'; /** - * Get a BuildMeta by primary key (Id) + * Returns a BuildMeta model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\BuildMeta|null */ public function getByPrimaryKey($value, $useConnection = 'read') { @@ -29,8 +32,11 @@ class BuildMetaStoreBase extends Store } /** - * Get a single BuildMeta by Id. - * @return null|BuildMeta + * Returns a BuildMeta model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\BuildMeta|null */ public function getById($value, $useConnection = 'read') { @@ -52,7 +58,11 @@ class BuildMetaStoreBase extends Store } /** - * Get multiple BuildMeta by ProjectId. + * Returns an array of BuildMeta models by ProjectId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException * @return array */ public function getByProjectId($value, $limit = 1000, $useConnection = 'read') @@ -84,7 +94,11 @@ class BuildMetaStoreBase extends Store } /** - * Get multiple BuildMeta by BuildId. + * Returns an array of BuildMeta models by BuildId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException * @return array */ public function getByBuildId($value, $limit = 1000, $useConnection = 'read') diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php index b8b49cb7..0560d72b 100644 --- a/PHPCI/Store/Base/BuildStoreBase.php +++ b/PHPCI/Store/Base/BuildStoreBase.php @@ -21,7 +21,10 @@ class BuildStoreBase extends Store protected $primaryKey = 'id'; /** - * Get a Build by primary key (Id) + * Returns a Build model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\Build|null */ public function getByPrimaryKey($value, $useConnection = 'read') { @@ -29,8 +32,11 @@ class BuildStoreBase extends Store } /** - * Get a single Build by Id. - * @return null|Build + * Returns a Build model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\Build|null */ public function getById($value, $useConnection = 'read') { @@ -52,7 +58,11 @@ class BuildStoreBase extends Store } /** - * Get multiple Build by ProjectId. + * Returns an array of Build models by ProjectId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException * @return array */ public function getByProjectId($value, $limit = 1000, $useConnection = 'read') @@ -84,7 +94,11 @@ class BuildStoreBase extends Store } /** - * Get multiple Build by Status. + * Returns an array of Build models by Status. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException * @return array */ public function getByStatus($value, $limit = 1000, $useConnection = 'read') diff --git a/PHPCI/Store/Base/ProjectGroupStoreBase.php b/PHPCI/Store/Base/ProjectGroupStoreBase.php deleted file mode 100644 index c7cd8772..00000000 --- a/PHPCI/Store/Base/ProjectGroupStoreBase.php +++ /dev/null @@ -1,53 +0,0 @@ -getById($value, $useConnection); - } - - /** - * Get a single ProjectGroup by Id. - * @return null|ProjectGroup - */ - public function getById($value, $useConnection = 'read') - { - if (is_null($value)) { - throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); - } - - $query = 'SELECT * FROM `project_group` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':id', $value); - - if ($stmt->execute()) { - if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) { - return new ProjectGroup($data); - } - } - - return null; - } -} diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php index 1e2bf65b..562afba2 100644 --- a/PHPCI/Store/Base/ProjectStoreBase.php +++ b/PHPCI/Store/Base/ProjectStoreBase.php @@ -21,7 +21,10 @@ class ProjectStoreBase extends Store protected $primaryKey = 'id'; /** - * Get a Project by primary key (Id) + * Returns a Project model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\Project|null */ public function getByPrimaryKey($value, $useConnection = 'read') { @@ -29,8 +32,11 @@ class ProjectStoreBase extends Store } /** - * Get a single Project by Id. - * @return null|Project + * Returns a Project model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\Project|null */ public function getById($value, $useConnection = 'read') { @@ -52,7 +58,11 @@ class ProjectStoreBase extends Store } /** - * Get multiple Project by Title. + * Returns an array of Project models by Title. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException * @return array */ public function getByTitle($value, $limit = 1000, $useConnection = 'read') @@ -82,36 +92,4 @@ class ProjectStoreBase extends Store return array('items' => array(), 'count' => 0); } } - - /** - * Get multiple Project by GroupId. - * @return array - */ - public function getByGroupId($value, $limit = 1000, $useConnection = 'read') - { - if (is_null($value)) { - throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); - } - - - $query = 'SELECT * FROM `project` WHERE `group_id` = :group_id LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':group_id', $value); - $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); - - if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Project($item); - }; - $rtn = array_map($map, $res); - - $count = count($rtn); - - return array('items' => $rtn, 'count' => $count); - } else { - return array('items' => array(), 'count' => 0); - } - } } diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php index 105ccd3e..f2893ac5 100644 --- a/PHPCI/Store/Base/UserStoreBase.php +++ b/PHPCI/Store/Base/UserStoreBase.php @@ -21,7 +21,10 @@ class UserStoreBase extends Store protected $primaryKey = 'id'; /** - * Get a User by primary key (Id) + * Returns a User model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\User|null */ public function getByPrimaryKey($value, $useConnection = 'read') { @@ -29,8 +32,11 @@ class UserStoreBase extends Store } /** - * Get a single User by Id. - * @return null|User + * Returns a User model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\User|null */ public function getById($value, $useConnection = 'read') { @@ -52,8 +58,11 @@ class UserStoreBase extends Store } /** - * Get a single User by Email. - * @return null|User + * Returns a User model by Email. + * @param string $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\User|null */ public function getByEmail($value, $useConnection = 'read') { @@ -73,36 +82,30 @@ class UserStoreBase extends Store return null; } - + /** - * Get multiple User by Name. - * @return array + * Returns a User model by Email. + * @param string $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\User|null */ - public function getByName($value, $limit = 1000, $useConnection = 'read') + public function getByLoginOrEmail($value, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - - $query = 'SELECT * FROM `user` WHERE `name` = :name LIMIT :limit'; + $query = 'SELECT * FROM `user` WHERE `name` = :value OR `email` = :value LIMIT 1'; $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':name', $value); - $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); + $stmt->bindValue(':value', $value); if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new User($item); - }; - $rtn = array_map($map, $res); - - $count = count($rtn); - - return array('items' => $rtn, 'count' => $count); - } else { - return array('items' => array(), 'count' => 0); + if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) { + return new User($data); + } } + + return null; } } diff --git a/PHPCI/Store/BuildErrorStore.php b/PHPCI/Store/BuildErrorStore.php deleted file mode 100644 index c2d32468..00000000 --- a/PHPCI/Store/BuildErrorStore.php +++ /dev/null @@ -1,80 +0,0 @@ - :since'; - } - - $query .= ' LIMIT 15000'; - - $stmt = Database::getConnection('read')->prepare($query); - - $stmt->bindValue(':build', $buildId, \PDO::PARAM_INT); - - if (!is_null($since)) { - $stmt->bindValue(':since', $since); - } - - if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new BuildError($item); - }; - $rtn = array_map($map, $res); - - return $rtn; - } else { - return array(); - } - } - - /** - * Gets the total number of errors for a given build. - * @param $buildId - * @param string $since date string - * @return array - */ - public function getErrorTotalForBuild($buildId) - { - $query = 'SELECT COUNT(*) AS total FROM build_error - WHERE build_id = :build'; - - $stmt = Database::getConnection('read')->prepare($query); - - $stmt->bindValue(':build', $buildId, \PDO::PARAM_INT); - - if ($stmt->execute()) { - $res = $stmt->fetch(\PDO::FETCH_ASSOC); - return $res['total']; - } else { - return array(); - } - } -} diff --git a/PHPCI/Store/BuildMetaStore.php b/PHPCI/Store/BuildMetaStore.php index f932bc11..9800dcad 100644 --- a/PHPCI/Store/BuildMetaStore.php +++ b/PHPCI/Store/BuildMetaStore.php @@ -10,8 +10,6 @@ namespace PHPCI\Store; use PHPCI\Store\Base\BuildMetaStoreBase; -use b8\Database; -use PHPCI\Model\BuildMeta; /** * BuildMeta Store @@ -19,33 +17,5 @@ use PHPCI\Model\BuildMeta; */ class BuildMetaStore extends BuildMetaStoreBase { - /** - * Only used by an upgrade migration to move errors from build_meta to build_error - * @param $start - * @param $limit - * @return array - */ - public function getErrorsForUpgrade($limit) - { - $query = 'SELECT * FROM build_meta - WHERE meta_key IN (\'phpmd-data\', \'phpcs-data\', \'phpdoccheck-data\') - ORDER BY id ASC LIMIT :limit'; - - $stmt = Database::getConnection('read')->prepare($query); - - $stmt->bindValue(':limit', $limit, \PDO::PARAM_INT); - - if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new BuildMeta($item); - }; - $rtn = array_map($map, $res); - - return $rtn; - } else { - return array(); - } - } + // This class has been left blank so that you can modify it - changes in this file will not be overwritten. } diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index d6feb084..9974c7b3 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -165,7 +165,6 @@ class BuildStore extends BuildStoreBase $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT); $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT); $stmt->bindValue(':numResults', (int)$numResults, \PDO::PARAM_INT); - if (!is_null($branch)) { $stmt->bindValue(':branch', $branch, \PDO::PARAM_STR); } @@ -184,6 +183,7 @@ class BuildStore extends BuildStoreBase } else { return $rtn; } + } else { return null; } diff --git a/PHPCI/Store/ProjectGroupStore.php b/PHPCI/Store/ProjectGroupStore.php deleted file mode 100644 index fa254e3e..00000000 --- a/PHPCI/Store/ProjectGroupStore.php +++ /dev/null @@ -1,18 +0,0 @@ - $rtn, 'count' => $count); - } else { - return array('items' => array(), 'count' => 0); - } - } - - /** - * Get multiple Project by GroupId. - * @param int $value - * @param int $limit - * @param string $useConnection - * @return array - * @throws \Exception - */ - public function getByGroupId($value, $limit = 1000, $useConnection = 'read') - { - if (is_null($value)) { - throw new \Exception('Value passed to ' . __FUNCTION__ . ' cannot be null.'); - } - - $query = 'SELECT * FROM `project` WHERE `group_id` = :group_id ORDER BY title LIMIT :limit'; - $stmt = Database::getConnection($useConnection)->prepare($query); - $stmt->bindValue(':group_id', $value); - $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); - - if ($stmt->execute()) { - $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); - - $map = function ($item) { - return new Project($item); - }; - $rtn = array_map($map, $res); - - $count = count($rtn); - return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); diff --git a/PHPCI/View/Build/errors.phtml b/PHPCI/View/Build/errors.phtml deleted file mode 100644 index 04ab9c25..00000000 --- a/PHPCI/View/Build/errors.phtml +++ /dev/null @@ -1,37 +0,0 @@ -getFileLinkTemplate(); - -/** @var \PHPCI\Model\BuildError $error */ -foreach ($errors as $error): - - $link = str_replace('{FILE}', $error->getFile(), $linkTemplate); - $link = str_replace('{LINE}', $error->getLineStart(), $link); - $link = str_replace('{LINE_END}', $error->getLineEnd(), $link); -?> - - - - - getSeverityString()); ?> - - - getPlugin()); ?> - getFile(); ?> - - - getLineStart() == $error->getLineEnd() || !$error->getLineEnd()) { - print $error->getLineStart(); - } else { - print $error->getLineStart() . ' - ' . $error->getLineEnd(); - } - ?> - - - getMessage(); ?> - - - - \ No newline at end of file diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 61fafd33..1fcb57d8 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -1,161 +1,36 @@ +
-
-
-
-
-

- Build Details -

-
- -
- - - - - - - - - - - - - - - -
Project - - - getProject()->getTitle(); ?> - -
Branch - - getBranch(); ?> - -
Duration - -
-
-
+
+

+ getCommitterEmail()); ?> + +

-
-
-
-

- Commit Details -

-
+
+ -
- - - - - +
+ getCommitMessage()): ?> +
+ getCommitMessage(); ?> +
+ -
- - - + getBranch()); ?> - - - -
Commit - - getCommitId(), 0, 7); ?> - -
Committer - getCommitterEmail(); ?> -
- getCommitMessage(); ?> -
-
+ getCommitId() != 'Manual'): ?> +
getCommitId()); ?> +
- -
-
-
-

- Timing -

-
- -
- - - - - - - - - - - - - - - -
Created -
Started -
Finished - -
-
-
-
-
-