From e7dcd82125411c54dd6c4a49a8c1fbe504507beb Mon Sep 17 00:00:00 2001 From: Pavel Pavlov Date: Wed, 26 Feb 2014 15:50:01 +0400 Subject: [PATCH 001/119] This fixes #276 : Delete Build button not functioning in view build --- PHPCI/View/Build/view.phtml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 1af884be..c06ce531 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -18,7 +18,7 @@ @@ -43,5 +43,13 @@ foreach ($plugins as $plugin) { From 6d4e49d07b66762215034d9712ee575bfd7f7c13 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Sun, 2 Mar 2014 19:59:52 +0000 Subject: [PATCH 002/119] Add code to allow configuration for the plugin factory to be stored on a per install basis. --- PHPCI/Plugin/Util/Factory.php | 22 +++++++++++++++ .../PHPCI/Plugin/Util/ExamplePluginConfig.php | 22 +++++++++++++++ Tests/PHPCI/Plugin/Util/FactoryTest.php | 27 +++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 0e526023..8adfd99d 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -37,6 +37,28 @@ class Factory { ); } + /** + * Trys to get a function from the file path specified. If the + * file returns a function then $this will be passed to it. + * This enables the config file to call any public methods. + * + * @param $configPath + * @return bool - true if the function exists else false. + */ + public function addConfigFromFile($configPath) + { + // The file is expected to return a function which can + // act on the pluginFactory to register any resources needed. + if (file_exists($configPath)) { + $configFunction = require($configPath); + if (is_callable($configFunction)) { + $configFunction($this); + return true; + } + } + return false; + } + public function getLastOptions() { return $this->currentPluginOptions; } diff --git a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php new file mode 100644 index 00000000..4e4279b9 --- /dev/null +++ b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php @@ -0,0 +1,22 @@ +registerResource( + // This function will be called when the resource is needed. + function() { + return array( + 'Foo' => "Stuff", + 'Bar' => "More Stuff" + ); + }, + + // In addition to the function for building the resource the system + // also needs to be told when to load the resource. Either or both + // of the following arguments can be used (null to ignore) + + // This resource will only be given when the argument name is: + "ResourceArray", + + // The resource will only be given when the type hint is: + PHPCI\Plugin\Util\Factory::TYPE_ARRAY + ); +}; \ No newline at end of file diff --git a/Tests/PHPCI/Plugin/Util/FactoryTest.php b/Tests/PHPCI/Plugin/Util/FactoryTest.php index 3265e07c..72ed714b 100644 --- a/Tests/PHPCI/Plugin/Util/FactoryTest.php +++ b/Tests/PHPCI/Plugin/Util/FactoryTest.php @@ -148,6 +148,33 @@ class FactoryTest extends \PHPUnit_Framework_TestCase { $this->assertArrayHasKey('thing', $plugin->Options); } + public function testAddConfigFromFile_ReturnsTrueForValidFile() + { + $result = $this->testedFactory->addConfigFromFile( + realpath(__DIR__ . "/ExamplePluginConfig.php") + ); + + $this->assertTrue($result); + } + + public function testAddConfigFromFile_RegistersResources() + { + $this->testedFactory->addConfigFromFile( + realpath(__DIR__ . "/ExamplePluginConfig.php") + ); + + $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\'; + $pluginName = $namespace . 'ExamplePluginWithSingleRequiredArg'; + + $plugin = $this->testedFactory->buildPlugin($pluginName); + + // The Example config file defines an array as the resource. + $this->assertEquals( + array("bar" => "Hello"), + $plugin->RequiredArgument + ); + } + /** * Registers mocked Builder and Build classes so that realistic plugins * can be tested. From 20d5e5a6b294e8b2709d0418b74d119c4b741a01 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Sun, 2 Mar 2014 20:00:43 +0000 Subject: [PATCH 003/119] Add code to builder so pluginconfig.php is loaded if found in the root --- .gitignore | 3 ++- PHPCI/Builder.php | 14 ++++++++++++-- pluginconfig.php.example | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pluginconfig.php.example diff --git a/.gitignore b/.gitignore index 620cd6ce..d8c5ef7b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ config.php .htaccess PHPCI/config.yml cache -/loggerconfig.php \ No newline at end of file +/loggerconfig.php +/pluginconfig.php \ No newline at end of file diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 7b36d55b..4e02e1b3 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -14,6 +14,7 @@ use PHPCI\Helper\MailerFactory; use PHPCI\Model\Build; use b8\Store; use b8\Config; +use PHPCI\Plugin\Util\Factory; use Psr\Log\LoggerAwareInterface; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -114,7 +115,10 @@ class Builder implements LoggerAwareInterface, BuildLogger } $this->build = $build; $this->store = Store\Factory::getStore('Build'); - $this->pluginExecutor = new Plugin\Util\Executor($this->buildPluginFactory($build), $this); + + $pluginFactory = $this->buildPluginFactory($build); + $pluginFactory->addConfigFromFile(PHPCI_DIR . "/pluginconfig.php"); + $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this); $this->commandExecutor = new CommandExecutor($this, PHPCI_DIR, $this->quiet, $this->verbose); } @@ -394,9 +398,15 @@ class Builder implements LoggerAwareInterface, BuildLogger return $this->logger; } + /** + * Returns a configured instance of the plugin factory. + * + * @param Build $build + * @return Factory + */ private function buildPluginFactory(Build $build) { - $pluginFactory = new Plugin\Util\Factory(); + $pluginFactory = new Factory(); $self = $this; $pluginFactory->registerResource( diff --git a/pluginconfig.php.example b/pluginconfig.php.example new file mode 100644 index 00000000..4e4279b9 --- /dev/null +++ b/pluginconfig.php.example @@ -0,0 +1,22 @@ +registerResource( + // This function will be called when the resource is needed. + function() { + return array( + 'Foo' => "Stuff", + 'Bar' => "More Stuff" + ); + }, + + // In addition to the function for building the resource the system + // also needs to be told when to load the resource. Either or both + // of the following arguments can be used (null to ignore) + + // This resource will only be given when the argument name is: + "ResourceArray", + + // The resource will only be given when the type hint is: + PHPCI\Plugin\Util\Factory::TYPE_ARRAY + ); +}; \ No newline at end of file From 3c1cb07e97df1f6fa6def58b5be4dd5530f944cb Mon Sep 17 00:00:00 2001 From: meadsteve Date: Sun, 2 Mar 2014 20:10:48 +0000 Subject: [PATCH 004/119] Update test ExamplePluginConfg.php to match test. --- Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php index 4e4279b9..0b883071 100644 --- a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php +++ b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php @@ -4,19 +4,10 @@ return function (PHPCI\Plugin\Util\Factory $factory) { // This function will be called when the resource is needed. function() { return array( - 'Foo' => "Stuff", - 'Bar' => "More Stuff" + 'bar' => "Hello", ); }, - - // In addition to the function for building the resource the system - // also needs to be told when to load the resource. Either or both - // of the following arguments can be used (null to ignore) - - // This resource will only be given when the argument name is: - "ResourceArray", - - // The resource will only be given when the type hint is: - PHPCI\Plugin\Util\Factory::TYPE_ARRAY + "requiredArgument", + null ); }; \ No newline at end of file From 24b5bc549da89f4c6d7ea50ad7c5d7782ae089a8 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Mon, 10 Mar 2014 12:08:16 +0000 Subject: [PATCH 005/119] Add debug logging to findBinary() --- PHPCI/Helper/CommandExecutor.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 9b7fe442..a422d970 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -4,6 +4,7 @@ namespace PHPCI\Helper; use \PHPCI\Logging\BuildLogger; +use Psr\Log\LogLevel; class CommandExecutor { @@ -112,13 +113,16 @@ class CommandExecutor } foreach ($binary as $bin) { + $this->logger->log("Looking for binary: " . $bin, LogLevel::DEBUG); // Check project root directory: if (is_file($this->rootDir . $bin)) { + $this->logger->log("Found in root: " . $bin, LogLevel::DEBUG); return $this->rootDir . $bin; } // Check Composer bin dir: if (is_file($this->rootDir . 'vendor/bin/' . $bin)) { + $this->logger->log("Found in vendor/bin: " . $bin, LogLevel::DEBUG); return $this->rootDir . 'vendor/bin/' . $bin; } @@ -127,6 +131,7 @@ class CommandExecutor $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); if (!empty($findCmdResult)) { + $this->logger->log("Found in " . $findCmdResult, LogLevel::DEBUG); return $findCmdResult; } } From 9c24fbaecb86aeba670c1ec553250e97ae5090b3 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Mon, 10 Mar 2014 12:27:17 +0000 Subject: [PATCH 006/119] Psr\Log\LoggerInterface to the types that the plugin factory supplies by default. --- PHPCI/Builder.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index eb3e08e9..d112cc93 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -353,6 +353,15 @@ class Builder implements LoggerAwareInterface 'PHPCI\Model\Build' ); + $logger = $this->logger; + $pluginFactory->registerResource( + function () use ($logger) { + return $logger; + }, + null, + 'Psr\Log\LoggerInterface' + ); + $pluginFactory->registerResource( function () use ($self) { $factory = new MailerFactory($self->getSystemConfig('phpci')); From 851f6378990a826186a0c16a686a91ad19aea22f Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Mon, 10 Mar 2014 12:28:42 +0000 Subject: [PATCH 007/119] format tidy up of buildPluginFactory() --- PHPCI/Builder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index d112cc93..ba6d2e3a 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -338,7 +338,7 @@ class Builder implements LoggerAwareInterface $self = $this; $pluginFactory->registerResource( - function () use($self) { + function () use ($self) { return $self; }, null, @@ -346,7 +346,7 @@ class Builder implements LoggerAwareInterface ); $pluginFactory->registerResource( - function () use($build) { + function () use ($build) { return $build; }, null, From af22da6a1c644226a45af8107cb5f3774ea886ec Mon Sep 17 00:00:00 2001 From: Corpsee Date: Wed, 12 Mar 2014 22:22:57 +0700 Subject: [PATCH 008/119] Fixed CommitId link --- PHPCI/View/BuildsTable.phtml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index a9351353..9c1b3aea 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -46,7 +46,19 @@ switch($build->getStatus()) print ' - '; } ?> - getCommitId(); ?> + + + getCommitId() !== 'Manual') { + print ''; + } + print $build->getCommitId(); + if ($build->getCommitId() !== 'Manual') { + print ''; + } + ?> + + getBranch(); ?> Date: Wed, 12 Mar 2014 23:04:56 +0700 Subject: [PATCH 009/119] Fixed git checkout for commitId = 'Manual' --- PHPCI/Model/Build/RemoteGitBuild.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 35aa8c90..43d1e6f7 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -65,7 +65,11 @@ class RemoteGitBuild extends Build protected function cloneByHttp(Builder $builder, $cloneTo) { $success = $builder->executeCommand('git clone -b %s %s "%s"', $this->getBranch(), $this->getCloneUrl(), $cloneTo); - $builder->executeCommand('cd "%s" && git checkout %s', $cloneTo, $this->getCommitId()); + + if (!empty($commit) && $commit != 'Manual') { + $builder->executeCommand('cd "%s" && git checkout %s', $cloneTo, $this->getCommitId()); + } + return $success; } From 18701544a0cee53fb6a78cee607fde0baa213559 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 13 Mar 2014 00:37:57 +0700 Subject: [PATCH 010/119] Fixed 'cd' command for windows --- PHPCI/Helper/CommandExecutor.php | 2 +- PHPCI/Model/Build/RemoteGitBuild.php | 12 ++++++++++-- PHPCI/Plugin/Codeception.php | 3 +++ PHPCI/Plugin/Composer.php | 2 +- PHPCI/Plugin/Grunt.php | 9 ++++++++- vars.php | 5 +++++ 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index a422d970..70bfcff5 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -127,7 +127,7 @@ class CommandExecutor } // Use "where" for windows and "which" for other OS - $findCmd = (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') ? 'which' : 'where'; + $findCmd = IS_WIN ? 'which' : 'where'; $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); if (!empty($findCmdResult)) { diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 43d1e6f7..4faf2557 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -67,7 +67,11 @@ class RemoteGitBuild extends Build $success = $builder->executeCommand('git clone -b %s %s "%s"', $this->getBranch(), $this->getCloneUrl(), $cloneTo); if (!empty($commit) && $commit != 'Manual') { - $builder->executeCommand('cd "%s" && git checkout %s', $cloneTo, $this->getCommitId()); + $cmd = 'cd "%s" && git checkout %s'; + if (IS_WIN) { + $cmd = 'cd /d "%s" && git checkout %s'; + } + $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); } return $success; @@ -97,7 +101,11 @@ class RemoteGitBuild extends Build $commit = $this->getCommitId(); if (!empty($commit) && $commit != 'Manual') { - $builder->executeCommand('cd "%s" && git checkout %s', $cloneTo, $this->getCommitId()); + $cmd = 'cd "%s" && git checkout %s'; + if (IS_WIN) { + $cmd = 'cd /d "%s" && git checkout %s'; + } + $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); } // Remove the key file: diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index bd168145..802d3540 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -70,6 +70,9 @@ class Codeception implements \PHPCI\Plugin } $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s"'; + if (IS_WIN) { + $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s"'; + } $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $this->phpci->buildPath . $configPath); return $success; diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index 0b89afe0..d40ac100 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -46,7 +46,7 @@ class Composer implements \PHPCI\Plugin return false; } $cmd = ''; - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + if (IS_WIN) { $cmd = 'php '; } $cmd .= $composerLocation . ' --no-ansi --no-interaction '; diff --git a/PHPCI/Plugin/Grunt.php b/PHPCI/Plugin/Grunt.php index 477a4849..ddbe7aa3 100644 --- a/PHPCI/Plugin/Grunt.php +++ b/PHPCI/Plugin/Grunt.php @@ -60,12 +60,19 @@ class Grunt implements \PHPCI\Plugin public function execute() { // if npm does not work, we cannot use grunt, so we return false - if (!$this->phpci->executeCommand('cd %s && npm install', $this->directory)) { + $cmd = 'cd %s && npm install'; + if (IS_WIN) { + $cmd = 'cd /d %s && npm install'; + } + if (!$this->phpci->executeCommand($cmd, $this->directory)) { return false; } // build the grunt command $cmd = 'cd %s && ' . $this->grunt; + if (IS_WIN) { + $cmd = 'cd /d %s && ' . $this->grunt; + } $cmd .= ' --no-color'; $cmd .= ' --gruntfile %s'; $cmd .= ' %s'; // the task that will be executed diff --git a/vars.php b/vars.php index 5725805e..46b88c79 100644 --- a/vars.php +++ b/vars.php @@ -25,3 +25,8 @@ if (!defined('ENABLE_SHELL_PLUGIN')) { if (!defined('PHPCI_IS_CONSOLE')) { define('PHPCI_IS_CONSOLE', false); } + +$isWin = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false; +if (!defined('IS_WIN')) { + define('IS_WIN', $isWin); +} From 656e0a882ee91f5f4cb708d102ef4970dc721b57 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 14 Mar 2014 00:06:59 +0700 Subject: [PATCH 011/119] Change 'cp' command to 'copy' for windows --- PHPCI/Model/Build/LocalBuild.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 8e6984c6..485376ad 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -45,7 +45,11 @@ class LocalBuild extends Build if (isset($buildSettings['prefer_symlink']) && $buildSettings['prefer_symlink'] === true) { return $this->handleSymlink($builder, $reference, $buildPath); } else { - $builder->executeCommand('cp -Rf "%s" "%s/"', $reference, $buildPath); + $cmd = 'cp -Rf "%s" "%s/"'; + if (IS_WIN) { + $cmd = 'copy /Y "%s" "%s/"'; + } + $builder->executeCommand($cmd, $reference, $buildPath); } return true; From 7a910631e65af0b8b76cc0e7e350bad24ea452b9 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sat, 15 Mar 2014 12:18:12 +0700 Subject: [PATCH 012/119] Added database-based yml build config --- PHPCI/Controller/ProjectController.php | 8 ++++ PHPCI/Model/Base/ProjectBase.php | 58 +++++++++++++++++++++----- PHPCI/Model/Build/LocalBuild.php | 17 ++++---- PHPCI/Model/Build/MercurialBuild.php | 19 +++++---- PHPCI/Model/Build/RemoteGitBuild.php | 18 ++++---- 5 files changed, 88 insertions(+), 32 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 19fb3149..94390582 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -318,6 +318,14 @@ class ProjectController extends \PHPCI\Controller $field->setRows(6); $form->addField($field); + $field = new Form\Element\TextArea('build_config'); + $field->setRequired(false); + $field->setLabel('PHPCI build config for this project (instead phpci.yml in the project repository)'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $field->setRows(6); + $form->addField($field); + $field = new Form\Element\Submit(); $field->setValue('Save Project'); $field->setContainerClass('form-group'); diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index df1c0a34..adb9ac5a 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -37,6 +37,7 @@ class ProjectBase extends Model 'title' => null, 'reference' => null, 'git_key' => null, + 'build_config' => null, 'type' => null, 'token' => null, 'access_information' => null, @@ -52,6 +53,7 @@ class ProjectBase extends Model 'title' => 'getTitle', 'reference' => 'getReference', 'git_key' => 'getGitKey', + 'build_config' => 'getBuildConfig', 'type' => 'getType', 'token' => 'getToken', 'access_information' => 'getAccessInformation', @@ -69,6 +71,7 @@ class ProjectBase extends Model 'title' => 'setTitle', 'reference' => 'setReference', 'git_key' => 'setGitKey', + 'build_config' => 'setBuildConfig', 'type' => 'setType', 'token' => 'setToken', 'access_information' => 'setAccessInformation', @@ -103,6 +106,11 @@ class ProjectBase extends Model 'nullable' => true, 'default' => null, ), + 'build_config' => array( + 'type' => 'text', + 'nullable' => true, + 'default' => null, + ), 'type' => array( 'type' => 'varchar', 'length' => 50, @@ -132,8 +140,8 @@ class ProjectBase extends Model * @var array */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_project_title' => array('columns' => 'title'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_project_title' => array('columns' => 'title'), ); /** @@ -149,7 +157,7 @@ class ProjectBase extends Model */ public function getId() { - $rtn = $this->data['id']; + $rtn = $this->data['id']; return $rtn; } @@ -161,7 +169,7 @@ class ProjectBase extends Model */ public function getTitle() { - $rtn = $this->data['title']; + $rtn = $this->data['title']; return $rtn; } @@ -173,7 +181,7 @@ class ProjectBase extends Model */ public function getReference() { - $rtn = $this->data['reference']; + $rtn = $this->data['reference']; return $rtn; } @@ -185,7 +193,19 @@ class ProjectBase extends Model */ public function getGitKey() { - $rtn = $this->data['git_key']; + $rtn = $this->data['git_key']; + + return $rtn; + } + + /** + * Get the value of BuildConfig / build_config. + * + * @return string + */ + public function getBuildConfig() + { + $rtn = $this->data['build_config']; return $rtn; } @@ -197,7 +217,7 @@ class ProjectBase extends Model */ public function getType() { - $rtn = $this->data['type']; + $rtn = $this->data['type']; return $rtn; } @@ -209,7 +229,7 @@ class ProjectBase extends Model */ public function getToken() { - $rtn = $this->data['token']; + $rtn = $this->data['token']; return $rtn; } @@ -221,7 +241,7 @@ class ProjectBase extends Model */ public function getAccessInformation() { - $rtn = $this->data['access_information']; + $rtn = $this->data['access_information']; return $rtn; } @@ -233,7 +253,7 @@ class ProjectBase extends Model */ public function getLastCommit() { - $rtn = $this->data['last_commit']; + $rtn = $this->data['last_commit']; return $rtn; } @@ -316,6 +336,24 @@ class ProjectBase extends Model $this->_setModified('git_key'); } + /** + * Set the value of BuildConfig / build_config. + * + * @param $value string + */ + public function setBuildConfig($value) + { + $this->_validateString('BuildConfig', $value); + + if ($this->data['build_config'] === $value) { + return; + } + + $this->data['build_config'] = $value; + + $this->_setModified('build_config'); + } + /** * Set the value of Type / type. * diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 485376ad..3feae1b1 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -86,15 +86,18 @@ class LocalBuild extends Build protected function handleConfig(Builder $builder, $reference) { - /** @todo Add support for database-based yml definition */ - if (!is_file($reference . '/phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } + $build_config = $this->getProject()->getBuildConfig(); + if (!$build_config) + { + if (!is_file($reference . '/phpci.yml')) { + $builder->logFailure('Project does not contain a phpci.yml file.'); + return false; + } + $build_config = file_get_contents($reference . '/phpci.yml'); + } $yamlParser = new YamlParser(); - $yamlFile = file_get_contents($reference . '/phpci.yml'); - $builder->setConfigArray($yamlParser->parse($yamlFile)); + $builder->setConfigArray($yamlParser->parse($build_config)); return $builder->getConfig('build_settings'); } } diff --git a/PHPCI/Model/Build/MercurialBuild.php b/PHPCI/Model/Build/MercurialBuild.php index dbfcf4e2..412c2ad3 100644 --- a/PHPCI/Model/Build/MercurialBuild.php +++ b/PHPCI/Model/Build/MercurialBuild.php @@ -34,17 +34,20 @@ class MercurialBuild extends Build */ public function createWorkingCopy(Builder $builder, $buildPath) { - $yamlParser = new YamlParser(); - $this->cloneByHttp($builder, $buildPath); - if (!is_file($buildPath . 'phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } + $build_config = $this->getProject()->getBuildConfig(); + if (!$build_config) + { + if (!is_file($buildPath . '/phpci.yml')) { + $builder->logFailure('Project does not contain a phpci.yml file.'); + return false; + } + $build_config = file_get_contents($buildPath . '/phpci.yml'); + } - $yamlFile = file_get_contents($buildPath . 'phpci.yml'); - $builder->setConfigArray($yamlParser->parse($yamlFile)); + $yamlParser = new YamlParser(); + $builder->setConfigArray($yamlParser->parse($build_config)); return true; } diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 4faf2557..3c84b06d 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -34,7 +34,6 @@ class RemoteGitBuild extends Build */ public function createWorkingCopy(Builder $builder, $buildPath) { - $yamlParser = new YamlParser(); $key = trim($this->getProject()->getGitKey()); if (!empty($key)) { @@ -48,13 +47,18 @@ class RemoteGitBuild extends Build return false; } - if (!is_file($buildPath . 'phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } + $build_config = $this->getProject()->getBuildConfig(); + if (!$build_config) + { + if (!is_file($buildPath . '/phpci.yml')) { + $builder->logFailure('Project does not contain a phpci.yml file.'); + return false; + } + $build_config = file_get_contents($buildPath . '/phpci.yml'); + } - $yamlFile = file_get_contents($buildPath . 'phpci.yml'); - $builder->setConfigArray($yamlParser->parse($yamlFile)); + $yamlParser = new YamlParser(); + $builder->setConfigArray($yamlParser->parse($build_config)); return true; } From f4df607a162d264855d171b39304636d2be2b80a Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sat, 15 Mar 2014 12:22:59 +0700 Subject: [PATCH 013/119] Moved handleConfig functionality into general Build method. --- PHPCI/Model/Build.php | 24 ++++++++++++++++++++++++ PHPCI/Model/Build/LocalBuild.php | 18 ------------------ PHPCI/Model/Build/MercurialBuild.php | 16 +--------------- PHPCI/Model/Build/RemoteGitBuild.php | 16 +--------------- 4 files changed, 26 insertions(+), 48 deletions(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index ff0a0b23..27cf4055 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -11,6 +11,8 @@ namespace PHPCI\Model; use b8\Store\Factory; use PHPCI\Model\Base\BuildBase; +use PHPCI\Builder; +use Symfony\Component\Yaml\Parser as YamlParser; /** * Build Model @@ -77,4 +79,26 @@ class Build extends BuildBase { return ($this->getStatus() === self::STATUS_SUCCESS); } + + /** + * @param Builder $builder + * @param string $buildPath + * + * @return bool + */ + protected function handleConfig(Builder $builder, $buildPath) + { + $build_config = $this->getProject()->getBuildConfig(); + if (!$build_config) { + if (!is_file($buildPath . '/phpci.yml')) { + $builder->logFailure('Project does not contain a phpci.yml file.'); + return false; + } + $build_config = file_get_contents($buildPath . '/phpci.yml'); + } + + $yamlParser = new YamlParser(); + $builder->setConfigArray($yamlParser->parse($build_config)); + return $builder->getConfig('build_settings'); + } } diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 3feae1b1..1148b72e 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -11,7 +11,6 @@ namespace PHPCI\Model\Build; use PHPCI\Model\Build; use PHPCI\Builder; -use Symfony\Component\Yaml\Parser as YamlParser; /** * Local Build Model @@ -83,21 +82,4 @@ class LocalBuild extends Build return true; } - - protected function handleConfig(Builder $builder, $reference) - { - $build_config = $this->getProject()->getBuildConfig(); - if (!$build_config) - { - if (!is_file($reference . '/phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } - $build_config = file_get_contents($reference . '/phpci.yml'); - } - - $yamlParser = new YamlParser(); - $builder->setConfigArray($yamlParser->parse($build_config)); - return $builder->getConfig('build_settings'); - } } diff --git a/PHPCI/Model/Build/MercurialBuild.php b/PHPCI/Model/Build/MercurialBuild.php index 412c2ad3..22ba9fb8 100644 --- a/PHPCI/Model/Build/MercurialBuild.php +++ b/PHPCI/Model/Build/MercurialBuild.php @@ -11,7 +11,6 @@ namespace PHPCI\Model\Build; use PHPCI\Model\Build; use PHPCI\Builder; -use Symfony\Component\Yaml\Parser as YamlParser; /** * Mercurial Build Model @@ -36,20 +35,7 @@ class MercurialBuild extends Build { $this->cloneByHttp($builder, $buildPath); - $build_config = $this->getProject()->getBuildConfig(); - if (!$build_config) - { - if (!is_file($buildPath . '/phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } - $build_config = file_get_contents($buildPath . '/phpci.yml'); - } - - $yamlParser = new YamlParser(); - $builder->setConfigArray($yamlParser->parse($build_config)); - - return true; + return $this->handleConfig($builder, $buildPath); } /** diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 3c84b06d..5be3000c 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -11,7 +11,6 @@ namespace PHPCI\Model\Build; use PHPCI\Model\Build; use PHPCI\Builder; -use Symfony\Component\Yaml\Parser as YamlParser; /** * Remote Git Build Model @@ -47,20 +46,7 @@ class RemoteGitBuild extends Build return false; } - $build_config = $this->getProject()->getBuildConfig(); - if (!$build_config) - { - if (!is_file($buildPath . '/phpci.yml')) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; - } - $build_config = file_get_contents($buildPath . '/phpci.yml'); - } - - $yamlParser = new YamlParser(); - $builder->setConfigArray($yamlParser->parse($build_config)); - - return true; + return $this->handleConfig($builder, $buildPath); } /** From 20bab0d47ab111abcbccaa7c1ada61ccfe3e6dd5 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sat, 15 Mar 2014 12:57:06 +0700 Subject: [PATCH 014/119] Windows fixes --- PHPCI/Helper/CommandExecutor.php | 2 +- PHPCI/Model/Build/LocalBuild.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 70bfcff5..2e88b938 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -127,7 +127,7 @@ class CommandExecutor } // Use "where" for windows and "which" for other OS - $findCmd = IS_WIN ? 'which' : 'where'; + $findCmd = IS_WIN ? 'where' : 'which'; $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); if (!empty($findCmdResult)) { diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 1148b72e..e5837595 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -46,7 +46,7 @@ class LocalBuild extends Build } else { $cmd = 'cp -Rf "%s" "%s/"'; if (IS_WIN) { - $cmd = 'copy /Y "%s" "%s/"'; + $cmd = 'xcopy /E /Y "%s" "%s/*"'; } $builder->executeCommand($cmd, $reference, $buildPath); } From 3aa4806e250c5ac197179625654941fa180147e3 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Sat, 15 Mar 2014 12:57:06 +0700 Subject: [PATCH 015/119] Windows fixes --- PHPCI/Helper/CommandExecutor.php | 2 +- PHPCI/Model/Build/LocalBuild.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 70bfcff5..2e88b938 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -127,7 +127,7 @@ class CommandExecutor } // Use "where" for windows and "which" for other OS - $findCmd = IS_WIN ? 'which' : 'where'; + $findCmd = IS_WIN ? 'where' : 'which'; $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); if (!empty($findCmdResult)) { diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 485376ad..8cf3844b 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -47,7 +47,7 @@ class LocalBuild extends Build } else { $cmd = 'cp -Rf "%s" "%s/"'; if (IS_WIN) { - $cmd = 'copy /Y "%s" "%s/"'; + $cmd = 'xcopy /E /Y "%s" "%s/*"'; } $builder->executeCommand($cmd, $reference, $buildPath); } From 92647c6bf9aa0b678e6da4108bd29fa5c5acf34f Mon Sep 17 00:00:00 2001 From: Corpsee Date: Tue, 18 Mar 2014 01:10:47 +0700 Subject: [PATCH 016/119] Added simple error/exception handler and logging --- PHPCI/Logging/Handler.php | 100 +++++++++++++++++++++++++++++++++ PHPCI/Logging/LoggerConfig.php | 4 +- bootstrap.php | 7 ++- console | 4 +- 4 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 PHPCI/Logging/Handler.php diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php new file mode 100644 index 00000000..3ae5e93f --- /dev/null +++ b/PHPCI/Logging/Handler.php @@ -0,0 +1,100 @@ + 'Warning', + E_NOTICE => 'Notice', + E_USER_ERROR => 'User Error', + E_USER_WARNING => 'User Warning', + E_USER_NOTICE => 'User Notice', + E_STRICT => 'Runtime Notice', + E_RECOVERABLE_ERROR => 'Catchable Fatal Error', + E_DEPRECATED => 'Deprecated', + E_USER_DEPRECATED => 'User Deprecated', + ); + + /** + * @var LoggerInterface + */ + protected $logger; + + public function __construct(LoggerInterface $logger = NULL) + { + $this->logger = $logger; + } + + public static function register(LoggerInterface $logger = NULL) + { + $handler = new static($logger); + + set_error_handler(array($handler, 'handleError')); + register_shutdown_function(array($handler, 'handleFatalError')); + + set_exception_handler(array($handler, 'handleException')); + } + + /** + * @param integer $level + * @param string $message + * @param string $file + * @param integer $line + * + * @throws \ErrorException + */ + public function handleError($level, $message, $file, $line) + { + if (error_reporting() & $level) { + + $exception_level = isset($this->levels[$level]) ? $this->levels[$level] : $level; + + throw new \ErrorException( + sprintf('%s: %s in %s line %d', $exception_level, $message, $file, $line), + 0, $level, $file, $line + ); + } + } + + /** + * @throws \ErrorException + */ + public function handleFatalError() + { + $fatal_error = error_get_last(); + + if ($fatal_error['type'] === E_ERROR) { + + $e = new \ErrorException( + sprintf('%s: %s in %s line %d', $fatal_error['type'], $fatal_error['message'], $fatal_error['file'], $fatal_error['line']), + 0, $fatal_error['type'], $fatal_error['file'], $fatal_error['line'] + ); + $this->log($e); + } + } + + /** + * @param \Exception $exception + */ + public function handleException(\Exception $exception) + { + $this->log($exception); + } + + protected function log(\Exception $exception) + { + if (null !== $this->logger) { + + $message = sprintf( + '%s: %s (uncaught exception) at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine() + ); + $this->logger->error($message); + } + } +} \ No newline at end of file diff --git a/PHPCI/Logging/LoggerConfig.php b/PHPCI/Logging/LoggerConfig.php index 5c579f6e..3eb0a5b2 100644 --- a/PHPCI/Logging/LoggerConfig.php +++ b/PHPCI/Logging/LoggerConfig.php @@ -22,7 +22,7 @@ class LoggerConfig { public static function newFromFile($filePath) { if (file_exists($filePath)) { - $configArray = require($filePath); + $configArray = require_once($filePath); } else { $configArray = array(); @@ -48,7 +48,7 @@ class LoggerConfig { */ public function getFor($name) { $handlers = $this->getHandlers(self::KEY_AlwaysLoaded); - $handlers = array_merge($handlers, $this->getHandlers($name)); + //$handlers = array_merge($handlers, $this->getHandlers($name)); return new Logger($name, $handlers); } diff --git a/bootstrap.php b/bootstrap.php index 01301dbb..a8ececf3 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -8,6 +8,9 @@ */ // Let PHP take a guess as to the default timezone, if the user hasn't set one: +use PHPCI\Logging\Handler; +use PHPCI\Logging\LoggerConfig; + date_default_timezone_set(@date_default_timezone_get()); // Set up a basic autoloader for PHPCI: @@ -37,10 +40,12 @@ if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_I exit(1); } - // Load Composer autoloader: require_once(dirname(__FILE__) . '/vendor/autoload.php'); +$loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); +Handler::register($loggerConfig->getFor('Exceptions')); + // Load configuration if present: $conf = array(); $conf['b8']['app']['namespace'] = 'PHPCI'; diff --git a/console b/console index 8a65f1c5..43fc2b8f 100755 --- a/console +++ b/console @@ -21,8 +21,6 @@ use PHPCI\Command\PollCommand; use PHPCI\Command\CreateAdminCommand; use Symfony\Component\Console\Application; -$loggerConfig = \PHPCI\Logging\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); - $application = new Application(); $application->add(new RunCommand($loggerConfig->getFor('RunCommand'))); @@ -33,4 +31,4 @@ $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand'))); $application->add(new PollCommand($loggerConfig->getFor('PollCommand'))); $application->add(new CreateAdminCommand); -$application->run(); +$application->run(); \ No newline at end of file From e7e685e9bd1203eb3a4a0ade32430784c45e4494 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Tue, 18 Mar 2014 22:57:05 +0700 Subject: [PATCH 017/119] ProjectController::view 404 fix --- PHPCI/Controller/ProjectController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 19fb3149..03c8c1ac 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -17,6 +17,7 @@ use b8\Config; use b8\Controller; use b8\Store; use b8\Form; +use b8\Exception\HttpException\NotFoundException; /** * Project Controller - Allows users to create, edit and view projects. @@ -47,7 +48,11 @@ class ProjectController extends \PHPCI\Controller */ public function view($projectId) { - $project = $this->projectStore->getById($projectId); + $project = $this->projectStore->getById($projectId); + if (!$project) { + throw new NotFoundException('Project with id: ' . $projectId . ' not found'); + } + $page = $this->getParam('p', 1); $builds = $this->getLatestBuildsHtml($projectId, (($page - 1) * 10)); From b2240104b45a09a940d980d987b5c4688b415c19 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Tue, 18 Mar 2014 23:58:23 +0700 Subject: [PATCH 018/119] Fixed rm for windows --- PHPCI/Builder.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index ba6d2e3a..6f04c9d8 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -216,7 +216,12 @@ class Builder implements LoggerAwareInterface // Clean up: $this->buildLogger->log('Removing build.'); - shell_exec(sprintf('rm -Rf "%s"', $this->buildPath)); + + $cmd = 'rm -Rf "%s"'; + if (IS_WIN) { + $cmd = 'deltree /Y "%s"'; + } + $this->executeCommand($cmd, $this->buildPath); // Update the build in the database, ping any external services, etc. $this->build->sendStatusPostback(); From b28b5a575f28f5a4b947228a7546ade18fa09712 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Wed, 19 Mar 2014 00:04:29 +0700 Subject: [PATCH 019/119] Fixed rm for windows --- PHPCI/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 6f04c9d8..34373ba8 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -219,7 +219,7 @@ class Builder implements LoggerAwareInterface $cmd = 'rm -Rf "%s"'; if (IS_WIN) { - $cmd = 'deltree /Y "%s"'; + $cmd = 'rmdir /S /Q "%s"'; } $this->executeCommand($cmd, $this->buildPath); From 15d5c022c57e612c6d04c1a1a95c3846ab71185c Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 20 Mar 2014 22:17:54 +0700 Subject: [PATCH 020/119] Improved error/exception handler and logging --- PHPCI/Logging/Handler.php | 13 +++++++++++-- PHPCI/Logging/LoggerConfig.php | 2 +- bootstrap.php | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index 3ae5e93f..36e80844 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -69,8 +69,17 @@ class Handler { $fatal_error = error_get_last(); - if ($fatal_error['type'] === E_ERROR) { - + try { + if (($e = error_get_last()) !== null) { + $e = new \ErrorException( + sprintf('%s: %s in %s line %d', $fatal_error['type'], $fatal_error['message'], $fatal_error['file'], $fatal_error['line']), + 0, $fatal_error['type'], $fatal_error['file'], $fatal_error['line'] + ); + $this->log($e); + } + } + catch (\Exception $e) + { $e = new \ErrorException( sprintf('%s: %s in %s line %d', $fatal_error['type'], $fatal_error['message'], $fatal_error['file'], $fatal_error['line']), 0, $fatal_error['type'], $fatal_error['file'], $fatal_error['line'] diff --git a/PHPCI/Logging/LoggerConfig.php b/PHPCI/Logging/LoggerConfig.php index 3eb0a5b2..b0ebeeec 100644 --- a/PHPCI/Logging/LoggerConfig.php +++ b/PHPCI/Logging/LoggerConfig.php @@ -48,7 +48,7 @@ class LoggerConfig { */ public function getFor($name) { $handlers = $this->getHandlers(self::KEY_AlwaysLoaded); - //$handlers = array_merge($handlers, $this->getHandlers($name)); + $handlers = array_merge($handlers, $this->getHandlers($name)); return new Logger($name, $handlers); } diff --git a/bootstrap.php b/bootstrap.php index a8ececf3..3cfcf038 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -44,7 +44,7 @@ if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_I require_once(dirname(__FILE__) . '/vendor/autoload.php'); $loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); -Handler::register($loggerConfig->getFor('Exceptions')); +Handler::register($loggerConfig->getFor('_')); // Load configuration if present: $conf = array(); From 2730b47e0b07e88ea3a37cd49e20a7c607a8a9c0 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 20 Mar 2014 22:32:57 +0700 Subject: [PATCH 021/119] Fixed log pathes --- loggerconfig.php.example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loggerconfig.php.example b/loggerconfig.php.example index dad42f17..c306673b 100644 --- a/loggerconfig.php.example +++ b/loggerconfig.php.example @@ -1,16 +1,16 @@ function() { return array( - new \Monolog\Handler\StreamHandler('c:\temp\errors.log', \Monolog\Logger::ERROR), + new \Monolog\Handler\StreamHandler(__DIR__ . DIRECTORY_SEPARATOR . 'errors.log', \Monolog\Logger::ERROR), ); }, - /** Loggers for the RunCommand */ 'RunCommand' => function() { return array( - new \Monolog\Handler\RotatingFileHandler('c:\temp\everything',3, \Monolog\Logger::INFO), + new \Monolog\Handler\RotatingFileHandler(__DIR__ . DIRECTORY_SEPARATOR . 'everything',3, \Monolog\Logger::DEBUG), ); - } + }, ); \ No newline at end of file From 1cdb29840e31e37abc8e20c59f424ac2807d6633 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 20 Mar 2014 22:33:25 +0700 Subject: [PATCH 022/119] Fixed log pathes --- loggerconfig.php.example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loggerconfig.php.example b/loggerconfig.php.example index dad42f17..c306673b 100644 --- a/loggerconfig.php.example +++ b/loggerconfig.php.example @@ -1,16 +1,16 @@ function() { return array( - new \Monolog\Handler\StreamHandler('c:\temp\errors.log', \Monolog\Logger::ERROR), + new \Monolog\Handler\StreamHandler(__DIR__ . DIRECTORY_SEPARATOR . 'errors.log', \Monolog\Logger::ERROR), ); }, - /** Loggers for the RunCommand */ 'RunCommand' => function() { return array( - new \Monolog\Handler\RotatingFileHandler('c:\temp\everything',3, \Monolog\Logger::INFO), + new \Monolog\Handler\RotatingFileHandler(__DIR__ . DIRECTORY_SEPARATOR . 'everything',3, \Monolog\Logger::DEBUG), ); - } + }, ); \ No newline at end of file From 04dae16157f2ee099bd6d5a3392a064722292366 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 20 Mar 2014 22:51:30 +0700 Subject: [PATCH 023/119] Fixed require() in LoggerConfig --- PHPCI/Logging/LoggerConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Logging/LoggerConfig.php b/PHPCI/Logging/LoggerConfig.php index b0ebeeec..5c579f6e 100644 --- a/PHPCI/Logging/LoggerConfig.php +++ b/PHPCI/Logging/LoggerConfig.php @@ -22,7 +22,7 @@ class LoggerConfig { public static function newFromFile($filePath) { if (file_exists($filePath)) { - $configArray = require_once($filePath); + $configArray = require($filePath); } else { $configArray = array(); From 08a15d872429bb625b0ef69213a2dfcef52cddd0 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Mon, 24 Mar 2014 23:43:20 +0700 Subject: [PATCH 024/119] Added exception context for errror/exception handler logging --- PHPCI/Logging/Handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index 36e80844..55e0e4a3 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -103,7 +103,7 @@ class Handler $message = sprintf( '%s: %s (uncaught exception) at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine() ); - $this->logger->error($message); + $this->logger->error($message, array('exception' => $exception)); } } } \ No newline at end of file From 7e669ada4797fcce9e7e5c1d21e1bbcd3ad11db2 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Tue, 25 Mar 2014 14:17:03 +0000 Subject: [PATCH 025/119] Merge remote-tracking branch 'origin/master' into feature/pluginfactoryconfig Conflicts: PHPCI/Builder.php PHPCI/Plugin/Util/Factory.php --- PHPCI/Plugin/Util/Factory.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 9740516f..097f8bf5 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -36,7 +36,28 @@ class Factory { 'array' ); } - + + /** + * Trys to get a function from the file path specified. If the + * file returns a function then $this will be passed to it. + * This enables the config file to call any public methods. + * + * @param $configPath + * @return bool - true if the function exists else false. + */ + public function addConfigFromFile($configPath) + { + // The file is expected to return a function which can + // act on the pluginFactory to register any resources needed. + if (file_exists($configPath)) { + $configFunction = require($configPath); + if (is_callable($configFunction)) { + $configFunction($this); + return true; + } + } + return false; + } public function getLastOptions() { From 326113ebbcc40fd83b00e61a44061f469f140e98 Mon Sep 17 00:00:00 2001 From: "steve.brazier" Date: Tue, 25 Mar 2014 14:18:50 +0000 Subject: [PATCH 026/119] psr tidy up of util/Factory.php --- PHPCI/Plugin/Util/Factory.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 097f8bf5..971b3e23 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -4,7 +4,8 @@ namespace PHPCI\Plugin\Util; -class Factory { +class Factory +{ const TYPE_ARRAY = "array"; const TYPE_CALLABLE = "callable"; @@ -18,18 +19,17 @@ class Factory { */ private $container; - function __construct(\Pimple $container = null) + public function __construct(\Pimple $container = null) { if ($container) { $this->container = $container; - } - else { + } else { $this->container = new \Pimple(); } $self = $this; $this->registerResource( - function() use ($self) { + function () use ($self) { return $self->getLastOptions(); }, 'options', @@ -89,7 +89,7 @@ class Factory { if ($constructor) { $argsToUse = array(); - foreach($constructor->getParameters() as $param) { + foreach ($constructor->getParameters() as $param) { $argsToUse = $this->addArgFromParam($argsToUse, $param); } $plugin = $reflectedPlugin->newInstanceArgs($argsToUse); @@ -107,11 +107,11 @@ class Factory { * @throws \InvalidArgumentException * @internal param mixed $resource */ - public function registerResource($loader, - $name = null, - $type = null - ) - { + public function registerResource( + $loader, + $name = null, + $type = null + ) { if ($name === null && $type === null) { throw new \InvalidArgumentException( "Type or Name must be specified" @@ -161,9 +161,9 @@ class Factory { $class = $param->getClass(); if ($class) { return $class->getName(); - } elseif($param->isArray()) { + } elseif ($param->isArray()) { return self::TYPE_ARRAY; - } elseif($param->isCallable()) { + } elseif ($param->isCallable()) { return self::TYPE_CALLABLE; } else { return null; @@ -188,4 +188,4 @@ class Factory { return $existingArgs; } -} \ No newline at end of file +} From 5892fcb26ebec5ad541b41b52fedea81883614f5 Mon Sep 17 00:00:00 2001 From: Remo Laubacher Date: Wed, 26 Mar 2014 08:22:27 +0100 Subject: [PATCH 027/119] fix BuildLogger instantiation --- PHPCI/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 9b88e597..b7b8c77e 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -121,7 +121,7 @@ class Builder implements LoggerAwareInterface $pluginFactory = $this->buildPluginFactory($build); $pluginFactory->addConfigFromFile(PHPCI_DIR . "/pluginconfig.php"); - $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this); + $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger); $this->commandExecutor = new CommandExecutor( $this->buildLogger, From 9f5b05aa2ae4b8bb58d267bf03fe3582fd624108 Mon Sep 17 00:00:00 2001 From: zigster Date: Sun, 30 Mar 2014 11:59:56 +0200 Subject: [PATCH 028/119] Bugfix Errors with PHPCI GitHub hook #296 > fixed access to undefined class member _buildStore to buildStore --- PHPCI/Controller/WebhookController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 1b118440..9a9d143b 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -97,7 +97,7 @@ class WebhookController extends \PHPCI\Controller } try { - $this->_buildStore->save($build); + $this->buildStore->save($build); /** bugfix: Errors with PHPCI GitHub hook #296 */ } catch (\Exception $ex) { header('HTTP/1.1 500 Internal Server Error'); header('Ex: ' . $ex->getMessage()); From 72b7a3d9126e314e2183fffe0ef6867ed66c7f1d Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Mon, 24 Mar 2014 16:55:42 +0100 Subject: [PATCH 029/119] Use args in Codeception plugin --- PHPCI/Plugin/Codeception.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index 802d3540..bac0e7be 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -20,7 +20,14 @@ use PHPCI\Model\Build; */ class Codeception implements \PHPCI\Plugin { - protected $args; + /** + * @var string + */ + protected $args = ''; + + /** + * @var Builder + */ protected $phpci; /** @@ -30,14 +37,13 @@ class Codeception implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; if (isset($options['config'])) { $this->xmlConfigFile = $options['config']; } - if (isset($options['args'])) { - $this->args = $options['args']; + $this->args = (string) $options['args']; } } @@ -69,9 +75,9 @@ class Codeception implements \PHPCI\Plugin return false; } - $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s"'; + $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" '. $this->args; if (IS_WIN) { - $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s"'; + $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" '. $this->args; } $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $this->phpci->buildPath . $configPath); From 3f8e76789326d752ce04c0060929649d42743157 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 15:37:28 +0100 Subject: [PATCH 030/119] Removing web based installer, as it is more trouble than it is worth. --- public/install.php | 408 --------------------------------------------- 1 file changed, 408 deletions(-) delete mode 100644 public/install.php diff --git a/public/install.php b/public/install.php deleted file mode 100644 index f1e61a23..00000000 --- a/public/install.php +++ /dev/null @@ -1,408 +0,0 @@ -dump($config, 5); - - file_put_contents(PHPCI_DIR . 'PHPCI/config.yml', $yaml); - - /** - * Create database: - */ - $dbhost = $config['b8']['database']['servers']['write'][0]; - $dbname = $config['b8']['database']['name'] ?: 'phpci'; - $dbuser = $config['b8']['database']['username'] ?: 'phpci'; - $dbpass = $config['b8']['database']['password']; - - $pdo = new PDO('mysql:host=' . $dbhost, $dbuser, $dbpass); - - $pdo->query('CREATE DATABASE IF NOT EXISTS `' . $dbname . '`'); - - /** - * Bootstrap PHPCI and populate database: - */ - require(PHPCI_DIR . 'bootstrap.php'); - - ob_start(); - $gen = new \b8\Database\Generator(\b8\Database::getConnection(), 'PHPCI', PHPCI_DIR . 'PHPCI/Model/Base/'); - $gen->generate(); - ob_end_clean(); - - /** - * Create our admin user: - */ - $store = \b8\Store\Factory::getStore('User'); - - try { - $user = $store->getByEmail($adminUser); - } catch (Exception $ex) { - } - - if (empty($user)) { - $user = new \PHPCI\Model\User(); - $user->setEmail($adminUser); - $user->setName($adminUser); - $user->setIsAdmin(1); - $user->setHash(password_hash($adminPass, PASSWORD_DEFAULT)); - - $store->save($user); - } - - $formAction = rtrim( $phpciUrl, '/' ) . '/session/login'; - } -} - - -switch ($installStage) { - case 'start': - $nextStage = 'database'; - break; - - case 'database': - $nextStage = 'github'; - break; - - case 'github': - $nextStage = 'email'; - break; - - case 'email': - $nextStage = 'complete'; - break; -} - -?> - - - - Install PHPCI - - - - - - - - -
-
- -
-
- - - - - -

Welcome to PHPCI!

- -

Your server has passed all of PHPCI's pre-installation checks, please press continue below to - begin installation.

- -

Please correct the problems below, then refresh this page to continue.

- - - -

- Important! - You need to run composer to install dependencies before running the installer. -

- - - - -

- Important! - ./PHPCI/config.yml needs to be writeable to continue. -

- - - -

Important! PHPCI requires PHP 5.3.3 or above.

- - - - -

Database Details

-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -

PHPCI Details

-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- - - -

Github App Settings (Optional)

-
- -
- -
-
- -
- -
- -
-
- - - -

SMTP Settings (Optional)

-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -

The address system emails should come from.

-
-
- -
- -
- -

The address to which notifications should go by default.

-
-
- - - -

Thank you for installing PHPCI. Click continue below to log in for the first time!

- - - - - - -
-
- -
-
- -
-
- - -
-
- - From efe8529d3f0a46d570a4f1a5f3c3724dca12be71 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 15:37:54 +0100 Subject: [PATCH 031/119] Removing warning about install.php being present. --- PHPCI/View/layout.phtml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index bc731848..c455334c 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -64,14 +64,6 @@
- - -
- - Warning! install.php detected, for security purposes please delete it immediately. -
- -
From 9f182aad9141c43e93cb4622d411a19778e169a0 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 15:38:16 +0100 Subject: [PATCH 032/119] Updating console installer to be more reliable, easier to use, and use Symfony console properly. --- PHPCI/Command/InstallCommand.php | 334 +++++++++++++++++++++---------- 1 file changed, 223 insertions(+), 111 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 7f9daf6d..4cfc818e 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -1,28 +1,34 @@ -* @package PHPCI -* @subpackage Console -*/ + * Install console command - Installs PHPCI. + * @author Dan Cryer + * @package PHPCI + * @subpackage Console + */ class InstallCommand extends Command { protected function configure() @@ -33,22 +39,70 @@ class InstallCommand extends Command } /** - * Installs PHPCI - Can be run more than once as long as you ^C instead of entering an email address. - */ + * Installs PHPCI - Can be run more than once as long as you ^C instead of entering an email address. + */ protected function execute(InputInterface $input, OutputInterface $output) { - // Gather initial data from the user: - $conf = array(); - $conf['b8']['database']['servers']['read'] = $this->ask('Enter your MySQL host: '); - $conf['b8']['database']['servers']['write'] = $conf['b8']['database']['servers']['read']; - $conf['b8']['database']['name'] = $this->ask('Enter the database name PHPCI should use: '); - $conf['b8']['database']['username'] = $this->ask('Enter your MySQL username: '); - $conf['b8']['database']['password'] = $this->ask('Enter your MySQL password: ', true); - $ask = 'Your PHPCI URL (without trailing slash): '; - $conf['phpci']['url'] = $this->ask($ask, false, array(FILTER_VALIDATE_URL,"/[^\/]$/i")); - $conf['phpci']['github']['id'] = $this->ask('(Optional) Github Application ID: ', true); - $conf['phpci']['github']['secret'] = $this->ask('(Optional) Github Application Secret: ', true); + $output->writeln(''); + $output->writeln('******************'); + $output->writeln(' Welcome to PHPCI'); + $output->writeln('******************'); + $output->writeln(''); + $this->checkRequirements($output); + + $output->writeln('Please answer the following questions:'); + $output->writeln('-------------------------------------'); + $output->writeln(''); + + + /** + * @var \Symfony\Component\Console\Helper\DialogHelper + */ + $dialog = $this->getHelperSet()->get('dialog'); + + // ---- + // Get MySQL connection information and verify that it works: + // ---- + $connectionVerified = false; + + while (!$connectionVerified) { + $db = array(); + $db['servers']['read'] = $dialog->ask($output, 'Please enter your MySQL host [localhost]: ', 'localhost'); + $db['servers']['write'] = $db['servers']['read']; + $db['name'] = $dialog->ask($output, 'Please enter your database name [phpci]: ', 'phpci'); + $db['username'] = $dialog->ask($output, 'Please enter your database username [phpci]: ', 'phpci'); + $db['password'] = $dialog->askHiddenResponse($output, 'Please enter your database password: '); + + $connectionVerified = $this->verifyDatabaseDetails($db, $output); + } + + $output->writeln(''); + + // ---- + // Get basic installation details (URL, etc) + // ---- + + $conf = array(); + $conf['b8']['database'] = $db; + $conf['phpci']['url'] = $dialog->askAndValidate( + $output, + 'Your PHPCI URL (without trailing slash): ', + function ($answer) { + if (!filter_var($answer, FILTER_VALIDATE_URL)) { + throw new Exception('Must be a valid URL'); + } + + return $answer; + }, + false + ); + + $this->writeConfigFile($conf); + $this->setupDatabase($output); + $this->createAdminUser($output, $dialog); + + /* $conf['phpci']['email_settings']['smtp_address'] = $this->ask('(Optional) Smtp server address: ', true); $conf['phpci']['email_settings']['smtp_port'] = $this->ask('(Optional) Smtp port: ', true); $conf['phpci']['email_settings']['smtp_encryption'] = $this->ask('(Optional) Smtp encryption: ', true); @@ -58,112 +112,170 @@ class InstallCommand extends Command $ask = '(Optional) Default address to email notifications to: '; $conf['phpci']['email_settings']['default_mailto_address'] = $this->ask($ask, true); + */ + } - $dbUser = $conf['b8']['database']['username']; - $dbPass = $conf['b8']['database']['password']; - $dbHost = $conf['b8']['database']['servers']['write']; - $dbName = $conf['b8']['database']['name']; + /** + * Check PHP version, required modules and for disabled functions. + * @param OutputInterface $output + */ + protected function checkRequirements(OutputInterface $output) + { + $output->write('Checking requirements...'); + $errors = false; - // Create the database if it doesn't exist: - $cmd = 'mysql -u' . $dbUser . (!empty($dbPass) ? ' -p' . $dbPass : '') . ' -h' . $dbHost . - ' -e "CREATE DATABASE IF NOT EXISTS ' . $dbName . '"'; + // Check PHP version: + if (!(version_compare(PHP_VERSION, '5.3.3') >= 0)) { + $output->writeln(''); + $output->writeln('PHPCI requires at least PHP 5.3.3 to function.'); + $errors = true; + } - shell_exec($cmd); + // Check for required extensions: + if (!extension_loaded('PDO')) { + $output->writeln(''); + $output->writeln('PDO extension must be installed.'); + $errors = true; + } + if (!extension_loaded('pdo_mysql')) { + $output->writeln(''); + $output->writeln('PDO MySQL extension must be installed.'); + $errors = true; + } + + if (!extension_loaded('mcrypt')) { + $output->writeln(''); + $output->writeln('Mcrypt extension must be installed.'); + $errors = true; + } + + // Check we can use the exec() and shell_exec() functions: + if (!function_exists('exec')) { + $output->writeln(''); + $output->writeln('PHPCI needs to be able to call the exec() function. Is it disabled in php.ini?'); + $errors = true; + } + + if (!function_exists('shell_exec')) { + $output->writeln(''); + $output->writeln('PHPCI needs to be able to call the shell_exec() function. Is it disabled in php.ini?'); + $errors = true; + } + + if (!function_exists('password_hash')) { + $output->writeln(''); + $output->writeln('PHPCI requires the password_hash() function available in PHP 5.4, or the password_compat library by ircmaxell.'); + $errors = true; + } + + if ($errors) { + $output->writeln(''); + die; + } + + $output->writeln(' OK'); + $output->writeln(''); + } + + /** + * Try and connect to MySQL using the details provided. + * @param array $db + * @param OutputInterface $output + * @return bool + */ + protected function verifyDatabaseDetails(array $db, OutputInterface $output) + { + try { + $pdo = new PDO( + 'mysql:host='.$db['servers']['write'].';dbname='.$db['name'], + $db['username'], + $db['password'], + array( + \PDO::ATTR_PERSISTENT => false, + \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, + \PDO::ATTR_TIMEOUT => 2, + \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'UTF8\'', + ) + ); + + return true; + + } catch (Exception $ex) { + $output->writeln('PHPCI could not connect to MySQL with the details provided. Please try again.'); + $output->writeln('' . $ex->getMessage() . ''); + } + + return false; + } + + /** + * Write the PHPCI config.yml file. + * @param array $config + */ + protected function writeConfigFile(array $config) + { $dumper = new \Symfony\Component\Yaml\Dumper(); - $yaml = $dumper->dump($conf); + $yaml = $dumper->dump($config); file_put_contents(PHPCI_DIR . 'PHPCI/config.yml', $yaml); + } + protected function setupDatabase(OutputInterface $output) + { + $output->write('Setting up your database... '); + + // Load PHPCI's bootstrap file: require(PHPCI_DIR . 'bootstrap.php'); - // Update the database: - $gen = new \b8\Database\Generator(\b8\Database::getConnection(), 'PHPCI', './PHPCI/Model/Base/'); - $gen->generate(); - - // Try to create a user account: - $adminEmail = $this->ask('Enter your email address (leave blank if updating): ', true, FILTER_VALIDATE_EMAIL); - - if (empty($adminEmail)) { - return; + try { + // Set up the database, based on table data from the models: + $gen = new Database\Generator(Database::getConnection(), 'PHPCI', './PHPCI/Model/Base/'); + $gen->generate(); + } catch (Exception $ex) { + $output->writeln(''); + $output->writeln('PHPCI failed to set up the database.'); + $output->writeln('' . $ex->getMessage() . ''); + die; } - $adminPass = $this->ask('Enter your desired admin password: '); - $adminName = $this->ask('Enter your name: '); + + $output->writeln('OK'); + } + + protected function createAdminUser(OutputInterface $output, DialogHelper $dialog) + { + // Try to create a user account: + $adminEmail = $dialog->askAndValidate( + $output, + 'Your email address: ', + function ($answer) { + if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) { + throw new Exception('Must be a valid email address.'); + } + + return $answer; + }, + false + ); + + $adminPass = $dialog->askHiddenResponse($output, 'Enter your desired admin password: '); + $adminName = $dialog->ask($output, 'Enter your name: '); try { - $user = new \PHPCI\Model\User(); + $user = new User(); $user->setEmail($adminEmail); $user->setName($adminName); $user->setIsAdmin(1); $user->setHash(password_hash($adminPass, PASSWORD_DEFAULT)); - $store = \b8\Store\Factory::getStore('User'); + $store = Factory::getStore('User'); $store->save($user); - print 'User account created!' . PHP_EOL; + $output->writeln('User account created!'); } catch (\Exception $ex) { - print 'There was a problem creating your account. :(' . PHP_EOL; - print $ex->getMessage(); + $output->writeln('PHPCI failed to create your admin account.'); + $output->writeln('' . $ex->getMessage() . ''); + die; } } - - protected function ask($question, $emptyOk = false, $validationFilter = null) - { - print $question . ' '; - - $rtn = ''; - $stdin = fopen('php://stdin', 'r'); - $rtn = fgets($stdin); - fclose($stdin); - - $rtn = trim($rtn); - - if (!$emptyOk && empty($rtn)) { - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } elseif ($validationFilter != null && ! empty($rtn)) { - if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { - print $statusMessage; - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } - } - - return $rtn; - } - protected function controlFormat($valueToInspect, $filter, &$statusMessage) - { - $filters = !(is_array($filter))? array($filter) : $filter; - $statusMessage = ''; - $status = true; - $options = array(); - - foreach ($filters as $filter) { - if (! is_int($filter)) { - $regexp = $filter; - $filter = FILTER_VALIDATE_REGEXP; - $options = array( - 'options' => array( - 'regexp' => $regexp, - ) - ); - } - if (! filter_var($valueToInspect, $filter, $options)) { - $status = false; - - switch ($filter) - { - case FILTER_VALIDATE_URL: - $statusMessage = 'Incorrect url format.' . PHP_EOL; - break; - case FILTER_VALIDATE_EMAIL: - $statusMessage = 'Incorrect e-mail format.' . PHP_EOL; - break; - case FILTER_VALIDATE_REGEXP: - $statusMessage = 'Incorrect format.' . PHP_EOL; - break; - } - } - } - - return $status; - } } From 65f51cff4a3283e777b3cff5485d2246eeb5a440 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 14:58:26 +0000 Subject: [PATCH 033/119] Adding verification to the install and update commands to check whether PHPCI is installed. --- PHPCI/Command/InstallCommand.php | 15 +++++++++++++++ PHPCI/Command/UpdateCommand.php | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 4cfc818e..6e846ab6 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -43,6 +43,8 @@ class InstallCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { + $this->verifyNotInstalled($output); + $output->writeln(''); $output->writeln('******************'); $output->writeln(' Welcome to PHPCI'); @@ -278,4 +280,17 @@ class InstallCommand extends Command die; } } + + protected function verifyNotInstalled(OutputInterface $output) + { + if (file_exists(PHPCI_DIR . 'PHPCI/config.yml')) { + $content = file_get_contents(PHPCI_DIR . 'PHPCI/config.yml'); + + if (!empty($content)) { + $output->writeln('PHPCI/config.yml exists and is not empty.'); + $output->writeln('If you were trying to update PHPCI, please use phpci:update instead.'); + die; + } + } + } } diff --git a/PHPCI/Command/UpdateCommand.php b/PHPCI/Command/UpdateCommand.php index 855ca893..127b272e 100644 --- a/PHPCI/Command/UpdateCommand.php +++ b/PHPCI/Command/UpdateCommand.php @@ -48,8 +48,30 @@ class UpdateCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { + $this->verifyInstalled($output); + + $output->writeln('Updating PHPCI database.'); + // Update the database: $gen = new \b8\Database\Generator(\b8\Database::getConnection(), 'PHPCI', './PHPCI/Model/Base/'); $gen->generate(); + + $output->writeln('Done!'); + } + + protected function verifyInstalled(OutputInterface $output) + { + if (!file_exists(PHPCI_DIR . 'PHPCI/config.yml')) { + $output->writeln('PHPCI does not appear to be installed.'); + $output->writeln('Please install PHPCI via phpci:install instead.'); + die; + } + + $content = file_get_contents(PHPCI_DIR . 'PHPCI/config.yml'); + if (empty($content)) { + $output->writeln('PHPCI does not appear to be installed.'); + $output->writeln('Please install PHPCI via phpci:install instead.'); + die; + } } } From 9849d31a0eb2a910f92dca176ced9b582ef000f0 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 14:59:24 +0000 Subject: [PATCH 034/119] Using UTC timezone if one is not set. --- bootstrap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 3cfcf038..4f3e8a67 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -11,7 +11,10 @@ use PHPCI\Logging\Handler; use PHPCI\Logging\LoggerConfig; -date_default_timezone_set(@date_default_timezone_get()); +$timezone = ini_get('date.timezone'); +if (empty($timezone)) { + date_default_timezone_set('UTC'); +} // Set up a basic autoloader for PHPCI: $autoload = function ($class) { From 2b791b1f3b6a9132d161958526f97864679bf0f8 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 16:31:10 +0100 Subject: [PATCH 035/119] Removing commented code from the installer --- PHPCI/Command/InstallCommand.php | 12 --- PHPCI/Controller/SettingsController.php | 110 ++++++++++++++++++++++-- PHPCI/View/Settings/index.phtml | 31 ++++++- 3 files changed, 132 insertions(+), 21 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 6e846ab6..3b8ca701 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -103,18 +103,6 @@ class InstallCommand extends Command $this->writeConfigFile($conf); $this->setupDatabase($output); $this->createAdminUser($output, $dialog); - - /* - $conf['phpci']['email_settings']['smtp_address'] = $this->ask('(Optional) Smtp server address: ', true); - $conf['phpci']['email_settings']['smtp_port'] = $this->ask('(Optional) Smtp port: ', true); - $conf['phpci']['email_settings']['smtp_encryption'] = $this->ask('(Optional) Smtp encryption: ', true); - $conf['phpci']['email_settings']['smtp_username'] = $this->ask('(Optional) Smtp Username: ', true); - $conf['phpci']['email_settings']['smtp_password'] = $this->ask('(Optional) Smtp Password: ', true); - $conf['phpci']['email_settings']['from_address'] = $this->ask('(Optional) Email address to send from: ', true); - - $ask = '(Optional) Default address to email notifications to: '; - $conf['phpci']['email_settings']['default_mailto_address'] = $this->ask($ask, true); - */ } /** diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 6f8f544c..c2ea099b 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -39,7 +39,15 @@ class SettingsController extends Controller public function index() { $this->view->settings = $this->settings; + + $emailSettings = array(); + + if (isset($this->settings['phpci']['email_settings'])) { + $emailSettings = $this->settings['phpci']['email_settings']; + } + $this->view->github = $this->getGithubForm(); + $this->view->emailSettings = $this->getEmailForm($emailSettings); if (!empty($this->settings['phpci']['github']['token'])) { $this->view->githubUser = $this->getGithubUser($this->settings['phpci']['github']['token']); @@ -52,17 +60,28 @@ class SettingsController extends Controller { $this->settings['phpci']['github']['id'] = $this->getParam('githubid', ''); $this->settings['phpci']['github']['secret'] = $this->getParam('githubsecret', ''); - $error = $this->storeSettings(); - if($error) - { + if($error) { header('Location: ' . PHPCI_URL . 'settings?saved=2'); - } - else - { + } else { header('Location: ' . PHPCI_URL . 'settings?saved=1'); } + + die; + } + + public function email() + { + $this->settings['phpci']['email_settings'] = $this->getParams(); + $error = $this->storeSettings(); + + if ($error) { + header('Location: ' . PHPCI_URL . 'settings?saved=2'); + } else { + header('Location: ' . PHPCI_URL . 'settings?saved=1'); + } + die; } @@ -120,18 +139,23 @@ class SettingsController extends Controller $field->setLabel('Application ID'); $field->setClass('form-control'); $field->setContainerClass('form-group'); - $field->setValue($this->settings['phpci']['github']['id']); $form->addField($field); + if (isset($this->settings['phpci']['github']['id'])) { + $field->setValue($this->settings['phpci']['github']['id']); + } + $field = new Form\Element\Text('githubsecret'); $field->setRequired(true); $field->setPattern('[a-zA-Z0-9]+'); $field->setLabel('Application Secret'); $field->setClass('form-control'); $field->setContainerClass('form-group'); - $field->setValue($this->settings['phpci']['github']['secret']); $form->addField($field); + if (isset($this->settings['phpci']['github']['secret'])) { + $field->setValue($this->settings['phpci']['github']['secret']); + } $field = new Form\Element\Submit(); $field->setValue('Save »'); @@ -141,6 +165,76 @@ class SettingsController extends Controller return $form; } + protected function getEmailForm($values = array()) + { + $form = new Form(); + $form->setMethod('POST'); + $form->setAction(PHPCI_URL . 'settings/email'); + $form->addField(new Form\Element\Csrf('csrf')); + + $field = new Form\Element\Text('smtp_address'); + $field->setRequired(false); + $field->setLabel('SMTP Server'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $field->setValue('localhost'); + $form->addField($field); + + $field = new Form\Element\Text('smtp_port'); + $field->setRequired(false); + $field->setPattern('[0-9]+'); + $field->setLabel('SMTP Port'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $field->setValue(25); + $form->addField($field); + + $field = new Form\Element\Text('smtp_username'); + $field->setRequired(false); + $field->setLabel('SMTP Username'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $form->addField($field); + + $field = new Form\Element\Text('smtp_password'); + $field->setRequired(false); + $field->setLabel('SMTP Password'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $form->addField($field); + + $field = new Form\Element\Email('from_address'); + $field->setRequired(false); + $field->setLabel('From Email Address'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $form->addField($field); + + $field = new Form\Element\Email('default_mailto_address'); + $field->setRequired(false); + $field->setLabel('Default Notification Address'); + $field->setClass('form-control'); + $field->setContainerClass('form-group'); + $form->addField($field); + + $field = new Form\Element\Checkbox('smtp_encryption'); + $field->setCheckedValue(1); + $field->setRequired(false); + $field->setLabel('Use SMTP encryption?'); + $field->setContainerClass('form-group'); + $field->setValue(1); + $form->addField($field); + + $field = new Form\Element\Submit(); + $field->setValue('Save »'); + $field->setClass('btn btn-success pull-right'); + $form->addField($field); + + $form->setValues($values); + + return $form; + } + protected function getGithubUser($token) { $http = new HttpClient('https://api.github.com'); diff --git a/PHPCI/View/Settings/index.phtml b/PHPCI/View/Settings/index.phtml index be0c88b2..3f0eb5ec 100644 --- a/PHPCI/View/Settings/index.phtml +++ b/PHPCI/View/Settings/index.phtml @@ -28,7 +28,12 @@

Github Application

@@ -66,3 +71,27 @@ + +
+
+
+

Email Settings

+ + + +

+ Before PHPCI can send build status emails, you need to configure your SMTP settings below. +

+ + +
+ +
+ +
+ +
+ +
+
+
\ No newline at end of file From 1a92779f25fbcb113bad10f76946102f00fbe74d Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 10 Apr 2014 16:31:48 +0100 Subject: [PATCH 036/119] Adding blank lane at end of index.php --- public/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.php b/public/index.php index 134e9a7b..e1754b62 100644 --- a/public/index.php +++ b/public/index.php @@ -16,3 +16,4 @@ require_once('../bootstrap.php'); $fc = new PHPCI\Application($config, new b8\Http\Request()); print $fc->handleRequest(); + From ccb3d91ae13b6aa2e9b8467e6a0285efe23ece96 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 10 Apr 2014 23:41:02 +0700 Subject: [PATCH 037/119] Inverted priority of configs: phpci.yml is primary now --- PHPCI/Model/Build.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 27cf4055..20ff6a34 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -88,13 +88,16 @@ class Build extends BuildBase */ protected function handleConfig(Builder $builder, $buildPath) { - $build_config = $this->getProject()->getBuildConfig(); - if (!$build_config) { - if (!is_file($buildPath . '/phpci.yml')) { + if (is_file($buildPath . '/phpci.yml')) { + $build_config = file_get_contents($buildPath . '/phpci.yml'); + } + + if (!is_file($buildPath . '/phpci.yml') || !$build_config) { + $build_config = $this->getProject()->getBuildConfig(); + if (!$build_config) { $builder->logFailure('Project does not contain a phpci.yml file.'); return false; } - $build_config = file_get_contents($buildPath . '/phpci.yml'); } $yamlParser = new YamlParser(); From 7ac671424edbe05087f8685e3bb33aeda3b20a7c Mon Sep 17 00:00:00 2001 From: Corpsee Date: Thu, 10 Apr 2014 23:52:21 +0700 Subject: [PATCH 038/119] Genereted models by console phpci:generate command --- PHPCI/Model/Base/BuildBase.php | 512 +++++++++++------------- PHPCI/Model/Base/BuildMetaBase.php | 254 ++++++------ PHPCI/Model/Base/ProjectBase.php | 346 ++++++++-------- PHPCI/Model/Base/UserBase.php | 231 +++++------ PHPCI/Store/Base/BuildMetaStoreBase.php | 15 +- PHPCI/Store/Base/BuildStoreBase.php | 19 +- PHPCI/Store/Base/ProjectStoreBase.php | 15 +- PHPCI/Store/Base/UserStoreBase.php | 14 +- 8 files changed, 643 insertions(+), 763 deletions(-) diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 59e4c21e..02dd6280 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/PHPCI/Model/Base/BuildBase.php @@ -3,7 +3,6 @@ /** * Build base model for table: build */ - namespace PHPCI\Model\Base; use PHPCI\Model; @@ -15,336 +14,323 @@ use b8\Store\Factory; class BuildBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'build'; /** - * @var string - */ + * @var string + */ protected $modelName = 'Build'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, - 'project_id' => null, - 'commit_id' => null, - 'status' => null, - 'log' => null, - 'branch' => null, - 'created' => null, - 'started' => null, - 'finished' => null, - 'plugins' => null, + 'id' => null, + 'project_id' => null, + 'commit_id' => null, + 'status' => null, + 'log' => null, + 'branch' => null, + 'created' => null, + 'started' => null, + 'finished' => null, + 'plugins' => null, 'committer_email' => null, - 'commit_message' => null, + 'commit_message' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'project_id' => 'getProjectId', - 'commit_id' => 'getCommitId', - 'status' => 'getStatus', - 'log' => 'getLog', - 'branch' => 'getBranch', - 'created' => 'getCreated', - 'started' => 'getStarted', - 'finished' => 'getFinished', - 'plugins' => 'getPlugins', + 'id' => 'getId', + 'project_id' => 'getProjectId', + 'commit_id' => 'getCommitId', + 'status' => 'getStatus', + 'log' => 'getLog', + 'branch' => 'getBranch', + 'created' => 'getCreated', + 'started' => 'getStarted', + 'finished' => 'getFinished', + 'plugins' => 'getPlugins', 'committer_email' => 'getCommitterEmail', - 'commit_message' => 'getCommitMessage', - + 'commit_message' => 'getCommitMessage', // Foreign key getters: - 'Project' => 'getProject', + 'Project' => 'getProject', ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'project_id' => 'setProjectId', - 'commit_id' => 'setCommitId', - 'status' => 'setStatus', - 'log' => 'setLog', - 'branch' => 'setBranch', - 'created' => 'setCreated', - 'started' => 'setStarted', - 'finished' => 'setFinished', - 'plugins' => 'setPlugins', + 'id' => 'setId', + 'project_id' => 'setProjectId', + 'commit_id' => 'setCommitId', + 'status' => 'setStatus', + 'log' => 'setLog', + 'branch' => 'setBranch', + 'created' => 'setCreated', + 'started' => 'setStarted', + 'finished' => 'setFinished', + 'plugins' => 'setPlugins', 'committer_email' => 'setCommitterEmail', - 'commit_message' => 'setCommitMessage', - + 'commit_message' => 'setCommitMessage', // Foreign key setters: - 'Project' => 'setProject', + 'Project' => 'setProject', ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, + 'default' => null, + ), + 'project_id' => array( + 'type' => 'int', + 'length' => 11, 'default' => null, ), - 'project_id' => array( - 'type' => 'int', - 'length' => 11, - 'default' => null, - ), - 'commit_id' => array( - 'type' => 'varchar', - 'length' => 50, + 'commit_id' => array( + 'type' => 'varchar', + 'length' => 50, 'nullable' => true, + 'default' => null, + ), + 'status' => array( + 'type' => 'tinyint', + 'length' => 4, 'default' => null, ), - 'status' => array( - 'type' => 'tinyint', - 'length' => 4, - 'default' => null, - ), - 'log' => array( - 'type' => 'longtext', + 'log' => array( + 'type' => 'longtext', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'branch' => array( - 'type' => 'varchar', - 'length' => 50, + 'branch' => array( + 'type' => 'varchar', + 'length' => 50, 'default' => 'master', ), - 'created' => array( - 'type' => 'datetime', + 'created' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'started' => array( - 'type' => 'datetime', + 'started' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'finished' => array( - 'type' => 'datetime', + 'finished' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'plugins' => array( - 'type' => 'text', + 'plugins' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), 'committer_email' => array( - 'type' => 'varchar', - 'length' => 512, + 'type' => 'varchar', + 'length' => 512, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'commit_message' => array( - 'type' => 'text', + 'commit_message' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'project_id' => array('columns' => 'project_id'), - 'idx_status' => array('columns' => 'status'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'project_id' => array('columns' => 'project_id'), + 'idx_status' => array('columns' => 'status'), ); /** - * @var array - */ + * @var array + */ public $foreignKeys = array( - 'build_ibfk_1' => array( - 'local_col' => 'project_id', - 'update' => 'CASCADE', - 'delete' => 'CASCADE', - 'table' => 'project', - 'col' => 'id' - ), + 'build_ibfk_1' => array( + 'local_col' => 'project_id', + 'update' => 'CASCADE', + 'delete' => 'CASCADE', + 'table' => 'project', + 'col' => 'id' + ), ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; - + $rtn = $this->data['id']; return $rtn; } /** - * Get the value of ProjectId / project_id. - * - * @return int - */ + * Get the value of ProjectId / project_id. + * + * @return int + */ public function getProjectId() { - $rtn = $this->data['project_id']; - + $rtn = $this->data['project_id']; return $rtn; } /** - * Get the value of CommitId / commit_id. - * - * @return string - */ + * Get the value of CommitId / commit_id. + * + * @return string + */ public function getCommitId() { - $rtn = $this->data['commit_id']; - + $rtn = $this->data['commit_id']; return $rtn; } /** - * Get the value of Status / status. - * - * @return int - */ + * Get the value of Status / status. + * + * @return int + */ public function getStatus() { - $rtn = $this->data['status']; - + $rtn = $this->data['status']; return $rtn; } /** - * Get the value of Log / log. - * - * @return string - */ + * Get the value of Log / log. + * + * @return string + */ public function getLog() { - $rtn = $this->data['log']; - + $rtn = $this->data['log']; return $rtn; } /** - * Get the value of Branch / branch. - * - * @return string - */ + * Get the value of Branch / branch. + * + * @return string + */ public function getBranch() { - $rtn = $this->data['branch']; - + $rtn = $this->data['branch']; return $rtn; } /** - * Get the value of Created / created. - * - * @return \DateTime - */ + * Get the value of Created / created. + * + * @return \DateTime + */ public function getCreated() { - $rtn = $this->data['created']; + $rtn = $this->data['created']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } - return $rtn; } /** - * Get the value of Started / started. - * - * @return \DateTime - */ + * Get the value of Started / started. + * + * @return \DateTime + */ public function getStarted() { - $rtn = $this->data['started']; + $rtn = $this->data['started']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } - return $rtn; } /** - * Get the value of Finished / finished. - * - * @return \DateTime - */ + * Get the value of Finished / finished. + * + * @return \DateTime + */ public function getFinished() { - $rtn = $this->data['finished']; + $rtn = $this->data['finished']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } - return $rtn; } /** - * Get the value of Plugins / plugins. - * - * @return string - */ + * Get the value of Plugins / plugins. + * + * @return string + */ public function getPlugins() { - $rtn = $this->data['plugins']; - + $rtn = $this->data['plugins']; return $rtn; } /** - * Get the value of CommitterEmail / committer_email. - * - * @return string - */ + * Get the value of CommitterEmail / committer_email. + * + * @return string + */ public function getCommitterEmail() { - $rtn = $this->data['committer_email']; - + $rtn = $this->data['committer_email']; return $rtn; } /** - * Get the value of CommitMessage / commit_message. - * - * @return string - */ + * Get the value of CommitMessage / commit_message. + * + * @return string + */ public function getCommitMessage() { - $rtn = $this->data['commit_message']; - + $rtn = $this->data['commit_message']; return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -353,18 +339,17 @@ class BuildBase extends Model if ($this->data['id'] === $value) { return; } - $this->data['id'] = $value; - $this->_setModified('id'); } /** - * Set the value of ProjectId / project_id. - * - * Must not be null. - * @param $value int - */ + * Set the value of ProjectId / project_id. + * + * Must not be null. + * + * @param $value int + */ public function setProjectId($value) { $this->_validateNotNull('ProjectId', $value); @@ -373,17 +358,15 @@ class BuildBase extends Model if ($this->data['project_id'] === $value) { return; } - $this->data['project_id'] = $value; - $this->_setModified('project_id'); } /** - * Set the value of CommitId / commit_id. - * - * @param $value string - */ + * Set the value of CommitId / commit_id. + * + * @param $value string + */ public function setCommitId($value) { $this->_validateString('CommitId', $value); @@ -391,18 +374,17 @@ class BuildBase extends Model if ($this->data['commit_id'] === $value) { return; } - $this->data['commit_id'] = $value; - $this->_setModified('commit_id'); } /** - * Set the value of Status / status. - * - * Must not be null. - * @param $value int - */ + * Set the value of Status / status. + * + * Must not be null. + * + * @param $value int + */ public function setStatus($value) { $this->_validateNotNull('Status', $value); @@ -411,17 +393,15 @@ class BuildBase extends Model if ($this->data['status'] === $value) { return; } - $this->data['status'] = $value; - $this->_setModified('status'); } /** - * Set the value of Log / log. - * - * @param $value string - */ + * Set the value of Log / log. + * + * @param $value string + */ public function setLog($value) { $this->_validateString('Log', $value); @@ -429,18 +409,17 @@ class BuildBase extends Model if ($this->data['log'] === $value) { return; } - $this->data['log'] = $value; - $this->_setModified('log'); } /** - * Set the value of Branch / branch. - * - * Must not be null. - * @param $value string - */ + * Set the value of Branch / branch. + * + * Must not be null. + * + * @param $value string + */ public function setBranch($value) { $this->_validateNotNull('Branch', $value); @@ -449,17 +428,15 @@ class BuildBase extends Model if ($this->data['branch'] === $value) { return; } - $this->data['branch'] = $value; - $this->_setModified('branch'); } /** - * Set the value of Created / created. - * - * @param $value \DateTime - */ + * Set the value of Created / created. + * + * @param $value \DateTime + */ public function setCreated($value) { $this->_validateDate('Created', $value); @@ -467,17 +444,15 @@ class BuildBase extends Model if ($this->data['created'] === $value) { return; } - $this->data['created'] = $value; - $this->_setModified('created'); } /** - * Set the value of Started / started. - * - * @param $value \DateTime - */ + * Set the value of Started / started. + * + * @param $value \DateTime + */ public function setStarted($value) { $this->_validateDate('Started', $value); @@ -485,17 +460,15 @@ class BuildBase extends Model if ($this->data['started'] === $value) { return; } - $this->data['started'] = $value; - $this->_setModified('started'); } /** - * Set the value of Finished / finished. - * - * @param $value \DateTime - */ + * Set the value of Finished / finished. + * + * @param $value \DateTime + */ public function setFinished($value) { $this->_validateDate('Finished', $value); @@ -503,17 +476,15 @@ class BuildBase extends Model if ($this->data['finished'] === $value) { return; } - $this->data['finished'] = $value; - $this->_setModified('finished'); } /** - * Set the value of Plugins / plugins. - * - * @param $value string - */ + * Set the value of Plugins / plugins. + * + * @param $value string + */ public function setPlugins($value) { $this->_validateString('Plugins', $value); @@ -521,17 +492,15 @@ class BuildBase extends Model if ($this->data['plugins'] === $value) { return; } - $this->data['plugins'] = $value; - $this->_setModified('plugins'); } /** - * Set the value of CommitterEmail / committer_email. - * - * @param $value string - */ + * Set the value of CommitterEmail / committer_email. + * + * @param $value string + */ public function setCommitterEmail($value) { $this->_validateString('CommitterEmail', $value); @@ -539,17 +508,15 @@ class BuildBase extends Model if ($this->data['committer_email'] === $value) { return; } - $this->data['committer_email'] = $value; - $this->_setModified('committer_email'); } /** - * Set the value of CommitMessage / commit_message. - * - * @param $value string - */ + * Set the value of CommitMessage / commit_message. + * + * @param $value string + */ public function setCommitMessage($value) { $this->_validateString('CommitMessage', $value); @@ -557,9 +524,7 @@ class BuildBase extends Model if ($this->data['commit_message'] === $value) { return; } - $this->data['commit_message'] = $value; - $this->_setModified('commit_message'); } @@ -578,22 +543,21 @@ class BuildBase extends Model return null; } - $cacheKey = 'Cache.Project.' . $key; - $rtn = $this->cache->get($cacheKey, null); + $cacheKey = 'Cache.Project.' . $key; + $rtn = $this->cache->get($cacheKey, null); if (empty($rtn)) { - $rtn = Factory::getStore('Project', 'PHPCI')->getById($key); + $rtn = Factory::getStore('Project', 'PHPCI')->getById($key); $this->cache->set($cacheKey, $rtn); } - return $rtn; } /** - * Set Project - Accepts an ID, an array representing a Project or a Project model. - * - * @param $value mixed - */ + * Set Project - Accepts an ID, an array representing a Project or a Project model. + * + * @param $value mixed + */ public function setProject($value) { // Is this an instance of Project? @@ -611,15 +575,16 @@ class BuildBase extends Model } /** - * Set Project - Accepts a Project model. - * - * @param $value \PHPCI\Model\Project - */ + * Set Project - Accepts a Project model. + * + * @param $value \PHPCI\Model\Project + */ public function setProjectObject(\PHPCI\Model\Project $value) { return $this->setProjectId($value->getId()); } + /** * Get BuildMeta models by BuildId for this Build. * @@ -632,15 +597,11 @@ class BuildBase extends Model return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($this->getId()); } - - - public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('Build', 'PHPCI')->getByPrimaryKey($value, $useConnection); } - public static function getById($value, $useConnection = 'read') { return Factory::getStore('Build', 'PHPCI')->getById($value, $useConnection); @@ -655,7 +616,4 @@ class BuildBase extends Model { return Factory::getStore('Build', 'PHPCI')->getByStatus($value, $limit, $useConnection); } - - - } diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index 83333102..7c360075 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -15,182 +15,176 @@ use b8\Store\Factory; class BuildMetaBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'build_meta'; /** - * @var string - */ + * @var string + */ protected $modelName = 'BuildMeta'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, + 'id' => null, 'project_id' => null, - 'build_id' => null, - 'meta_key' => null, + 'build_id' => null, + 'meta_key' => null, 'meta_value' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', + 'id' => 'getId', 'project_id' => 'getProjectId', - 'build_id' => 'getBuildId', - 'meta_key' => 'getMetaKey', + 'build_id' => 'getBuildId', + 'meta_key' => 'getMetaKey', 'meta_value' => 'getMetaValue', - // Foreign key getters: - 'Build' => 'getBuild', + 'Build' => 'getBuild', ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', + 'id' => 'setId', 'project_id' => 'setProjectId', - 'build_id' => 'setBuildId', - 'meta_key' => 'setMetaKey', + 'build_id' => 'setBuildId', + 'meta_key' => 'setMetaKey', 'meta_value' => 'setMetaValue', - // Foreign key setters: - 'Build' => 'setBuild', + 'Build' => 'setBuild', ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 10, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 10, + 'primary_key' => true, 'auto_increment' => true, - 'default' => null, + 'default' => null, ), 'project_id' => array( - 'type' => 'int', - 'length' => 11, + 'type' => 'int', + 'length' => 11, 'default' => null, ), - 'build_id' => array( - 'type' => 'int', - 'length' => 11, + 'build_id' => array( + 'type' => 'int', + 'length' => 11, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'meta_key' => array( - 'type' => 'varchar', - 'length' => 255, + 'meta_key' => array( + 'type' => 'varchar', + 'length' => 255, 'default' => null, ), 'meta_value' => array( - 'type' => 'text', + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_meta_id' => array('unique' => true, 'columns' => 'build_id, meta_key'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_meta_id' => array('unique' => true, 'columns' => 'build_id, meta_key'), ); /** - * @var array - */ + * @var array + */ public $foreignKeys = array( - 'fk_meta_build_id' => array( - 'local_col' => 'build_id', - 'update' => 'CASCADE', - 'delete' => 'CASCADE', - 'table' => 'build', - 'col' => 'id' - ), + 'fk_meta_build_id' => array( + 'local_col' => 'build_id', + 'update' => 'CASCADE', + 'delete' => 'CASCADE', + 'table' => 'build', + 'col' => 'id' + ), ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; - + $rtn = $this->data['id']; return $rtn; } /** - * Get the value of ProjectId / project_id. - * - * @return int - */ + * Get the value of ProjectId / project_id. + * + * @return int + */ public function getProjectId() { - $rtn = $this->data['project_id']; - + $rtn = $this->data['project_id']; return $rtn; } /** - * Get the value of BuildId / build_id. - * - * @return int - */ + * Get the value of BuildId / build_id. + * + * @return int + */ public function getBuildId() { - $rtn = $this->data['build_id']; - + $rtn = $this->data['build_id']; return $rtn; } /** - * Get the value of MetaKey / meta_key. - * - * @return string - */ + * Get the value of MetaKey / meta_key. + * + * @return string + */ public function getMetaKey() { - $rtn = $this->data['meta_key']; - + $rtn = $this->data['meta_key']; return $rtn; } /** - * Get the value of MetaValue / meta_value. - * - * @return string - */ + * Get the value of MetaValue / meta_value. + * + * @return string + */ public function getMetaValue() { - $rtn = $this->data['meta_value']; - + $rtn = $this->data['meta_value']; return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -199,18 +193,17 @@ class BuildMetaBase extends Model if ($this->data['id'] === $value) { return; } - $this->data['id'] = $value; - $this->_setModified('id'); } /** - * Set the value of ProjectId / project_id. - * - * Must not be null. - * @param $value int - */ + * Set the value of ProjectId / project_id. + * + * Must not be null. + * + * @param $value int + */ public function setProjectId($value) { $this->_validateNotNull('ProjectId', $value); @@ -219,17 +212,15 @@ class BuildMetaBase extends Model if ($this->data['project_id'] === $value) { return; } - $this->data['project_id'] = $value; - $this->_setModified('project_id'); } /** - * Set the value of BuildId / build_id. - * - * @param $value int - */ + * Set the value of BuildId / build_id. + * + * @param $value int + */ public function setBuildId($value) { $this->_validateInt('BuildId', $value); @@ -237,18 +228,17 @@ class BuildMetaBase extends Model if ($this->data['build_id'] === $value) { return; } - $this->data['build_id'] = $value; - $this->_setModified('build_id'); } /** - * Set the value of MetaKey / meta_key. - * - * Must not be null. - * @param $value string - */ + * Set the value of MetaKey / meta_key. + * + * Must not be null. + * + * @param $value string + */ public function setMetaKey($value) { $this->_validateNotNull('MetaKey', $value); @@ -257,17 +247,15 @@ class BuildMetaBase extends Model if ($this->data['meta_key'] === $value) { return; } - $this->data['meta_key'] = $value; - $this->_setModified('meta_key'); } /** - * Set the value of MetaValue / meta_value. - * - * @param $value string - */ + * Set the value of MetaValue / meta_value. + * + * @param $value string + */ public function setMetaValue($value) { $this->_validateString('MetaValue', $value); @@ -275,9 +263,7 @@ class BuildMetaBase extends Model if ($this->data['meta_value'] === $value) { return; } - $this->data['meta_value'] = $value; - $this->_setModified('meta_value'); } @@ -296,22 +282,21 @@ class BuildMetaBase extends Model return null; } - $cacheKey = 'Cache.Build.' . $key; - $rtn = $this->cache->get($cacheKey, null); + $cacheKey = 'Cache.Build.' . $key; + $rtn = $this->cache->get($cacheKey, null); if (empty($rtn)) { - $rtn = Factory::getStore('Build', 'PHPCI')->getById($key); + $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 - */ + * 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? @@ -329,24 +314,20 @@ class BuildMetaBase extends Model } /** - * Set Build - Accepts a Build model. - * - * @param $value \PHPCI\Model\Build - */ + * Set Build - Accepts a Build model. + * + * @param $value \PHPCI\Model\Build + */ public function setBuildObject(\PHPCI\Model\Build $value) { return $this->setBuildId($value->getId()); } - - - public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('BuildMeta', 'PHPCI')->getByPrimaryKey($value, $useConnection); } - public static function getById($value, $useConnection = 'read') { return Factory::getStore('BuildMeta', 'PHPCI')->getById($value, $useConnection); @@ -356,7 +337,4 @@ class BuildMetaBase extends Model { return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($value, $limit, $useConnection); } - - - } diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index adb9ac5a..b208bfff 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -15,255 +15,244 @@ use b8\Store\Factory; class ProjectBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'project'; /** - * @var string - */ + * @var string + */ protected $modelName = 'Project'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, - 'title' => null, - 'reference' => null, - 'git_key' => null, - 'build_config' => null, - 'type' => null, - 'token' => null, + 'id' => null, + 'title' => null, + 'reference' => null, + 'git_key' => null, + 'build_config' => null, + 'type' => null, + 'token' => null, 'access_information' => null, - 'last_commit' => null, + 'last_commit' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'title' => 'getTitle', - 'reference' => 'getReference', - 'git_key' => 'getGitKey', - 'build_config' => 'getBuildConfig', - 'type' => 'getType', - 'token' => 'getToken', + 'id' => 'getId', + 'title' => 'getTitle', + 'reference' => 'getReference', + 'git_key' => 'getGitKey', + 'build_config' => 'getBuildConfig', + 'type' => 'getType', + 'token' => 'getToken', 'access_information' => 'getAccessInformation', - 'last_commit' => 'getLastCommit', - + 'last_commit' => 'getLastCommit', // Foreign key getters: ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'title' => 'setTitle', - 'reference' => 'setReference', - 'git_key' => 'setGitKey', - 'build_config' => 'setBuildConfig', - 'type' => 'setType', - 'token' => 'setToken', + 'id' => 'setId', + 'title' => 'setTitle', + 'reference' => 'setReference', + 'git_key' => 'setGitKey', + 'build_config' => 'setBuildConfig', + 'type' => 'setType', + 'token' => 'setToken', 'access_information' => 'setAccessInformation', - 'last_commit' => 'setLastCommit', - + 'last_commit' => 'setLastCommit', // Foreign key setters: ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, + 'default' => null, + ), + 'title' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), - 'title' => array( - 'type' => 'varchar', - 'length' => 250, + 'reference' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), - 'reference' => array( - 'type' => 'varchar', - 'length' => 250, - 'default' => null, - ), - 'git_key' => array( - 'type' => 'text', + 'git_key' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'build_config' => array( - 'type' => 'text', + 'build_config' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'type' => array( - 'type' => 'varchar', - 'length' => 50, + 'type' => array( + 'type' => 'varchar', + 'length' => 50, 'default' => 1, ), - 'token' => array( - 'type' => 'varchar', - 'length' => 50, + 'token' => array( + 'type' => 'varchar', + 'length' => 50, 'nullable' => true, - 'default' => null, + 'default' => null, ), 'access_information' => array( - 'type' => 'varchar', - 'length' => 250, + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'last_commit' => array( - 'type' => 'varchar', - 'length' => 250, + 'last_commit' => array( + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), 'idx_project_title' => array('columns' => 'title'), ); /** - * @var array - */ - public $foreignKeys = array( - ); + * @var array + */ + public $foreignKeys = array(); /** - * Get the value of Id / id. - * - * @return int - */ + * 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 - */ + * Get the value of Title / title. + * + * @return string + */ public function getTitle() { $rtn = $this->data['title']; - return $rtn; } /** - * Get the value of Reference / reference. - * - * @return string - */ + * Get the value of Reference / reference. + * + * @return string + */ public function getReference() { $rtn = $this->data['reference']; - return $rtn; } /** - * Get the value of GitKey / git_key. - * - * @return string - */ + * Get the value of GitKey / git_key. + * + * @return string + */ public function getGitKey() { $rtn = $this->data['git_key']; - return $rtn; } /** - * Get the value of BuildConfig / build_config. - * - * @return string - */ + * Get the value of BuildConfig / build_config. + * + * @return string + */ public function getBuildConfig() { $rtn = $this->data['build_config']; - return $rtn; } /** - * Get the value of Type / type. - * - * @return string - */ + * Get the value of Type / type. + * + * @return string + */ public function getType() { $rtn = $this->data['type']; - return $rtn; } /** - * Get the value of Token / token. - * - * @return string - */ + * Get the value of Token / token. + * + * @return string + */ public function getToken() { $rtn = $this->data['token']; - return $rtn; } /** - * Get the value of AccessInformation / access_information. - * - * @return string - */ + * Get the value of AccessInformation / access_information. + * + * @return string + */ public function getAccessInformation() { $rtn = $this->data['access_information']; - return $rtn; } /** - * Get the value of LastCommit / last_commit. - * - * @return string - */ + * Get the value of LastCommit / last_commit. + * + * @return string + */ public function getLastCommit() { $rtn = $this->data['last_commit']; - return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -272,18 +261,17 @@ class ProjectBase extends Model 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 - */ + * Set the value of Title / title. + * + * Must not be null. + * + * @param $value string + */ public function setTitle($value) { $this->_validateNotNull('Title', $value); @@ -292,18 +280,17 @@ class ProjectBase extends Model if ($this->data['title'] === $value) { return; } - $this->data['title'] = $value; - $this->_setModified('title'); } /** - * Set the value of Reference / reference. - * - * Must not be null. - * @param $value string - */ + * Set the value of Reference / reference. + * + * Must not be null. + * + * @param $value string + */ public function setReference($value) { $this->_validateNotNull('Reference', $value); @@ -312,17 +299,15 @@ class ProjectBase extends Model if ($this->data['reference'] === $value) { return; } - $this->data['reference'] = $value; - $this->_setModified('reference'); } /** - * Set the value of GitKey / git_key. - * - * @param $value string - */ + * Set the value of GitKey / git_key. + * + * @param $value string + */ public function setGitKey($value) { $this->_validateString('GitKey', $value); @@ -330,17 +315,15 @@ class ProjectBase extends Model if ($this->data['git_key'] === $value) { return; } - $this->data['git_key'] = $value; - $this->_setModified('git_key'); } /** - * Set the value of BuildConfig / build_config. - * - * @param $value string - */ + * Set the value of BuildConfig / build_config. + * + * @param $value string + */ public function setBuildConfig($value) { $this->_validateString('BuildConfig', $value); @@ -348,18 +331,17 @@ class ProjectBase extends Model if ($this->data['build_config'] === $value) { return; } - $this->data['build_config'] = $value; - $this->_setModified('build_config'); } /** - * Set the value of Type / type. - * - * Must not be null. - * @param $value string - */ + * Set the value of Type / type. + * + * Must not be null. + * + * @param $value string + */ public function setType($value) { $this->_validateNotNull('Type', $value); @@ -368,17 +350,16 @@ class ProjectBase extends Model if ($this->data['type'] === $value) { return; } - $this->data['type'] = $value; - $this->_setModified('type'); } + /** - * Set the value of Token / token. - * - * @param $value string - */ + * Set the value of Token / token. + * + * @param $value string + */ public function setToken($value) { $this->_validateString('Token', $value); @@ -386,17 +367,15 @@ class ProjectBase extends Model if ($this->data['token'] === $value) { return; } - $this->data['token'] = $value; - $this->_setModified('token'); } /** - * Set the value of AccessInformation / access_information. - * - * @param $value string - */ + * Set the value of AccessInformation / access_information. + * + * @param $value string + */ public function setAccessInformation($value) { $this->_validateString('AccessInformation', $value); @@ -404,17 +383,15 @@ class ProjectBase extends Model if ($this->data['access_information'] === $value) { return; } - $this->data['access_information'] = $value; - $this->_setModified('access_information'); } /** - * Set the value of LastCommit / last_commit. - * - * @param $value string - */ + * Set the value of LastCommit / last_commit. + * + * @param $value string + */ public function setLastCommit($value) { $this->_validateString('LastCommit', $value); @@ -422,9 +399,7 @@ class ProjectBase extends Model if ($this->data['last_commit'] === $value) { return; } - $this->data['last_commit'] = $value; - $this->_setModified('last_commit'); } @@ -440,15 +415,11 @@ class ProjectBase extends Model return Factory::getStore('Build', 'PHPCI')->getByProjectId($this->getId()); } - - - public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('Project', 'PHPCI')->getByPrimaryKey($value, $useConnection); } - public static function getById($value, $useConnection = 'read') { return Factory::getStore('Project', 'PHPCI')->getById($value, $useConnection); @@ -458,7 +429,4 @@ class ProjectBase extends Model { return Factory::getStore('Project', 'PHPCI')->getByTitle($value, $limit, $useConnection); } - - - } diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php index f0b0e393..055eacce 100644 --- a/PHPCI/Model/Base/UserBase.php +++ b/PHPCI/Model/Base/UserBase.php @@ -15,173 +15,168 @@ use b8\Store\Factory; class UserBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'user'; /** - * @var string - */ + * @var string + */ protected $modelName = 'User'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, - 'email' => null, - 'hash' => null, + + 'id' => null, + 'email' => null, + 'hash' => null, 'is_admin' => null, - 'name' => null, + 'name' => null, + ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'email' => 'getEmail', - 'hash' => 'getHash', + 'id' => 'getId', + 'email' => 'getEmail', + 'hash' => 'getHash', 'is_admin' => 'getIsAdmin', - 'name' => 'getName', - + 'name' => 'getName', // Foreign key getters: ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'email' => 'setEmail', - 'hash' => 'setHash', + 'id' => 'setId', + 'email' => 'setEmail', + 'hash' => 'setHash', 'is_admin' => 'setIsAdmin', - 'name' => 'setName', - + 'name' => 'setName', // Foreign key setters: ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, + 'default' => null, + ), + 'email' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), - 'email' => array( - 'type' => 'varchar', - 'length' => 250, - 'default' => null, - ), - 'hash' => array( - 'type' => 'varchar', - 'length' => 250, + 'hash' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), 'is_admin' => array( - 'type' => 'tinyint', - 'length' => 1, + 'type' => 'tinyint', + 'length' => 1, 'default' => null, ), - 'name' => array( - 'type' => 'varchar', - 'length' => 250, + 'name' => array( + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_email' => array('unique' => true, 'columns' => 'email'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_email' => array('unique' => true, 'columns' => 'email'), ); /** - * @var array - */ - public $foreignKeys = array( - ); + * @var array + */ + public $foreignKeys = array(); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; - + $rtn = $this->data['id']; return $rtn; } /** - * Get the value of Email / email. - * - * @return string - */ + * Get the value of Email / email. + * + * @return string + */ public function getEmail() { - $rtn = $this->data['email']; - + $rtn = $this->data['email']; return $rtn; } /** - * Get the value of Hash / hash. - * - * @return string - */ + * Get the value of Hash / hash. + * + * @return string + */ public function getHash() { - $rtn = $this->data['hash']; - + $rtn = $this->data['hash']; return $rtn; } /** - * Get the value of IsAdmin / is_admin. - * - * @return int - */ + * Get the value of IsAdmin / is_admin. + * + * @return int + */ public function getIsAdmin() { - $rtn = $this->data['is_admin']; - + $rtn = $this->data['is_admin']; return $rtn; } /** - * Get the value of Name / name. - * - * @return string - */ + * Get the value of Name / name. + * + * @return string + */ public function getName() { - $rtn = $this->data['name']; - + $rtn = $this->data['name']; return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -190,18 +185,17 @@ class UserBase extends Model if ($this->data['id'] === $value) { return; } - $this->data['id'] = $value; - $this->_setModified('id'); } /** - * Set the value of Email / email. - * - * Must not be null. - * @param $value string - */ + * Set the value of Email / email. + * + * Must not be null. + * + * @param $value string + */ public function setEmail($value) { $this->_validateNotNull('Email', $value); @@ -210,18 +204,17 @@ class UserBase extends Model if ($this->data['email'] === $value) { return; } - $this->data['email'] = $value; - $this->_setModified('email'); } /** - * Set the value of Hash / hash. - * - * Must not be null. - * @param $value string - */ + * Set the value of Hash / hash. + * + * Must not be null. + * + * @param $value string + */ public function setHash($value) { $this->_validateNotNull('Hash', $value); @@ -230,18 +223,17 @@ class UserBase extends Model if ($this->data['hash'] === $value) { return; } - $this->data['hash'] = $value; - $this->_setModified('hash'); } /** - * Set the value of IsAdmin / is_admin. - * - * Must not be null. - * @param $value int - */ + * Set the value of IsAdmin / is_admin. + * + * Must not be null. + * + * @param $value int + */ public function setIsAdmin($value) { $this->_validateNotNull('IsAdmin', $value); @@ -250,17 +242,15 @@ class UserBase extends Model if ($this->data['is_admin'] === $value) { return; } - $this->data['is_admin'] = $value; - $this->_setModified('is_admin'); } /** - * Set the value of Name / name. - * - * @param $value string - */ + * Set the value of Name / name. + * + * @param $value string + */ public function setName($value) { $this->_validateString('Name', $value); @@ -268,21 +258,15 @@ class UserBase extends Model if ($this->data['name'] === $value) { return; } - $this->data['name'] = $value; - $this->_setModified('name'); } - - - public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('User', 'PHPCI')->getByPrimaryKey($value, $useConnection); } - public static function getById($value, $useConnection = 'read') { return Factory::getStore('User', 'PHPCI')->getById($value, $useConnection); @@ -292,7 +276,4 @@ class UserBase extends Model { return Factory::getStore('User', 'PHPCI')->getByEmail($value, $useConnection); } - - - } diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 4abd97a3..1be8292a 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -16,9 +16,11 @@ use PHPCI\Model\BuildMeta; */ class BuildMetaStoreBase extends Store { - protected $tableName = 'build_meta'; - protected $modelName = '\PHPCI\Model\BuildMeta'; - protected $primaryKey = 'id'; + protected $tableName = 'build_meta'; + + protected $modelName = '\PHPCI\Model\BuildMeta'; + + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -32,7 +34,7 @@ class BuildMetaStoreBase extends Store } $query = 'SELECT * FROM `build_meta` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -40,7 +42,6 @@ class BuildMetaStoreBase extends Store return new BuildMeta($data); } } - return null; } @@ -51,15 +52,13 @@ class BuildMetaStoreBase extends Store } $add = ''; - if ($limit) { $add .= ' LIMIT ' . $limit; } - $count = null; $query = 'SELECT * FROM `build_meta` WHERE `build_id` = :build_id' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':build_id', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php index b67d5f73..4b797375 100644 --- a/PHPCI/Store/Base/BuildStoreBase.php +++ b/PHPCI/Store/Base/BuildStoreBase.php @@ -16,9 +16,11 @@ use PHPCI\Model\Build; */ class BuildStoreBase extends Store { - protected $tableName = 'build'; - protected $modelName = '\PHPCI\Model\Build'; - protected $primaryKey = 'id'; + protected $tableName = 'build'; + + protected $modelName = '\PHPCI\Model\Build'; + + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -32,7 +34,7 @@ class BuildStoreBase extends Store } $query = 'SELECT * FROM `build` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -40,7 +42,6 @@ class BuildStoreBase extends Store return new Build($data); } } - return null; } @@ -51,15 +52,13 @@ class BuildStoreBase extends Store } $add = ''; - if ($limit) { $add .= ' LIMIT ' . $limit; } - $count = null; $query = 'SELECT * FROM `build` WHERE `project_id` = :project_id' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $value); if ($stmt->execute()) { @@ -83,15 +82,13 @@ class BuildStoreBase extends Store } $add = ''; - if ($limit) { $add .= ' LIMIT ' . $limit; } - $count = null; $query = 'SELECT * FROM `build` WHERE `status` = :status' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':status', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php index 410a305e..808f83c9 100644 --- a/PHPCI/Store/Base/ProjectStoreBase.php +++ b/PHPCI/Store/Base/ProjectStoreBase.php @@ -16,9 +16,11 @@ use PHPCI\Model\Project; */ class ProjectStoreBase extends Store { - protected $tableName = 'project'; - protected $modelName = '\PHPCI\Model\Project'; - protected $primaryKey = 'id'; + protected $tableName = 'project'; + + protected $modelName = '\PHPCI\Model\Project'; + + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -32,7 +34,7 @@ class ProjectStoreBase extends Store } $query = 'SELECT * FROM `project` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -40,7 +42,6 @@ class ProjectStoreBase extends Store return new Project($data); } } - return null; } @@ -51,15 +52,13 @@ class ProjectStoreBase extends Store } $add = ''; - if ($limit) { $add .= ' LIMIT ' . $limit; } - $count = null; $query = 'SELECT * FROM `project` WHERE `title` = :title' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php index fd903d8e..cafebea3 100644 --- a/PHPCI/Store/Base/UserStoreBase.php +++ b/PHPCI/Store/Base/UserStoreBase.php @@ -16,9 +16,11 @@ use PHPCI\Model\User; */ class UserStoreBase extends Store { - protected $tableName = 'user'; - protected $modelName = '\PHPCI\Model\User'; - protected $primaryKey = 'id'; + protected $tableName = 'user'; + + protected $modelName = '\PHPCI\Model\User'; + + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -32,7 +34,7 @@ class UserStoreBase extends Store } $query = 'SELECT * FROM `user` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -40,7 +42,6 @@ class UserStoreBase extends Store return new User($data); } } - return null; } @@ -51,7 +52,7 @@ class UserStoreBase extends Store } $query = 'SELECT * FROM `user` WHERE `email` = :email LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':email', $value); if ($stmt->execute()) { @@ -59,7 +60,6 @@ class UserStoreBase extends Store return new User($data); } } - return null; } } From 7e2aef058fcfbc16f269f814a6906144589a5aef Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Sat, 12 Apr 2014 00:11:46 +0200 Subject: [PATCH 039/119] fix #334: fix flickering of quality trend graph; fix hidden data points for single errors / warnings --- public/assets/js/build-plugins/loc.js | 15 +++--- public/assets/js/build-plugins/warnings.js | 61 ++++++++++------------ 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index aa75c073..df0b4ce6 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -36,25 +36,26 @@ var locPlugin = PHPCI.UiPlugin.extend({ }, displayChart: function() { - var build = this.lastData; + var builds = this.lastData; - if (!build || !build.length) { + if (!builds || !builds.length) { return; } $('#phploc-lines').empty().animate({height: '275px'}); - var data = [["Build", "Lines", "Comment Lines", "Non-Comment Lines", "Logical Lines"]]; - for (var idx in build) { - data.push(['Build ' + build[idx].build_id, parseInt(build[idx].meta_value.LOC), parseInt(build[idx].meta_value.CLOC), parseInt(build[idx].meta_value.NCLOC), parseInt(build[idx].meta_value.LLOC)]); + var titles = ['Build', 'Lines', 'Comment Lines', 'Non-Comment Lines', 'Logical Lines']; + var data = [titles]; + for (var i in builds) { + data.push(['Build ' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]); } var data = google.visualization.arrayToDataTable(data); - var options = { hAxis: {title: 'Builds'}, vAxis: {title: 'Lines'}, - backgroundColor: { fill: 'transparent' } + backgroundColor: { fill: 'transparent' }, + height: 275 }; var chart = new google.visualization.LineChart(document.getElementById('phploc-lines')); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index c485dd4e..6bd371a1 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -1,17 +1,23 @@ -var plugin = PHPCI.UiPlugin.extend({ +var warningsPlugin = PHPCI.UiPlugin.extend({ id: 'build-warnings-chart', css: 'col-lg-6 col-md-6 col-sm-12 col-xs-12', title: 'Quality Trend', + keys: { + 'phpmd-warnings': 'PHPMD Warnings', + 'phpcs-warnings': 'PHPCS Warnings', + 'phpcs-errors': 'PHPCS Errors', + 'phplint-errors': 'PHPLint Errors' + }, data: {}, - keys: null, displayOnUpdate: false, register: function() { var self = this; - var query1 = PHPCI.registerQuery('phpmd-warnings', -1, {num_builds: 10, key: 'phpmd-warnings'}) - var query2 = PHPCI.registerQuery('phpcs-warnings', -1, {num_builds: 10, key: 'phpcs-warnings'}) - var query3 = PHPCI.registerQuery('phpcs-errors', -1, {num_builds: 10, key: 'phpcs-errors'}) - var query4 = PHPCI.registerQuery('phplint-errors', -1, {num_builds: 10, key: 'phplint-errors'}) + + var queries = []; + for (var key in self.keys) { + queries.push(PHPCI.registerQuery(key, -1, {num_builds: 10, key: key})); + } $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors', function(data) { self.onUpdate(data); @@ -20,10 +26,9 @@ var plugin = PHPCI.UiPlugin.extend({ $(window).on('build-updated', function(data) { if (data.queryData.status > 1) { self.displayOnUpdate = true; - query1(); - query2(); - query3(); - query4(); + for (var query in queries) { + queries[query](); + } } }); @@ -36,23 +41,22 @@ var plugin = PHPCI.UiPlugin.extend({ onUpdate: function(e) { var self = this; - var build = e.queryData; + var builds = e.queryData; - if (!build || !build.length) { + if (!builds || !builds.length) { return; } - for (var i in build) { - var buildId = build[i]['build_id']; - var metaKey = build[i]['meta_key']; - var metaVal = build[i]['meta_value']; + for (var i in builds) { + var buildId = builds[i]['build_id']; + var metaKey = builds[i]['meta_key']; + var metaVal = builds[i]['meta_value']; if (!self.data[buildId]) { self.data[buildId] = {}; } self.data[buildId][metaKey] = metaVal; - self.keys = Object.keys(self.data[buildId]); } if (self.displayOnUpdate) { @@ -66,25 +70,16 @@ var plugin = PHPCI.UiPlugin.extend({ $('#build-warnings').empty().animate({height: '275px'}); var titles = ['Build']; - var keys = self.keys; - - for (var i in keys) { - var t = { - 'phpmd-warnings': 'PHPMD Warnings', - 'phpcs-warnings': 'PHPCS Warnings', - 'phpcs-errors': 'PHPCS Errors', - 'phplint-errors': 'PHPLint Errors' - }; - titles.push(t[keys[i]]); + for (var key in self.keys) { + titles.push(self.keys[key]); } var data = [titles]; - for (var build in self.data) { var thisBuild = ['#' + build]; - for (var i in keys) { - thisBuild.push(parseInt(self.data[build][keys[i]])); + for (var key in self.keys) { + thisBuild.push(parseInt(self.data[build][key])); } data.push(thisBuild); @@ -94,7 +89,9 @@ var plugin = PHPCI.UiPlugin.extend({ var options = { hAxis: {title: 'Build'}, vAxis: {title: 'Warnings'}, - backgroundColor: { fill: 'transparent' } + backgroundColor: { fill: 'transparent' }, + height: 275, + pointSize: 3 }; var chart = new google.visualization.LineChart(document.getElementById('build-warnings')); @@ -102,4 +99,4 @@ var plugin = PHPCI.UiPlugin.extend({ } }); -PHPCI.registerPlugin(new plugin()); \ No newline at end of file +PHPCI.registerPlugin(new warningsPlugin()); From 187d6898088a26c78ea27f2da9c6d6bf430dabed Mon Sep 17 00:00:00 2001 From: Claus Due Date: Sat, 12 Apr 2014 02:44:27 +0200 Subject: [PATCH 040/119] Bad copy/pasted method comment in CopyBuild plugin --- PHPCI/Plugin/CopyBuild.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index 494a0d3f..4449d16c 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -32,7 +32,7 @@ class CopyBuild implements \PHPCI\Plugin } /** - * Executes Composer and runs a specified command (e.g. install / update) + * Copies files from the root of the build directory into the target folder */ public function execute() { From 402e576cadf1b258a77169a0796d9ac61749ec7b Mon Sep 17 00:00:00 2001 From: Claus Due Date: Sat, 12 Apr 2014 13:50:10 +0200 Subject: [PATCH 041/119] Missing property declaration for `ignore` on Plugin.CopyBuild --- PHPCI/Plugin/CopyBuild.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index 494a0d3f..f9151004 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -21,6 +21,7 @@ use PHPCI\Model\Build; class CopyBuild implements \PHPCI\Plugin { protected $directory; + protected $ignore; protected $phpci; public function __construct(Builder $phpci, Build $build, array $options = array()) From 9cb63dbe0651600f796a0965b7a1c62f62a78e73 Mon Sep 17 00:00:00 2001 From: Claus Due Date: Sat, 12 Apr 2014 14:31:31 +0200 Subject: [PATCH 042/119] Wipe Plugin - wipes a folder --- PHPCI/Plugin/Wipe.php | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 PHPCI/Plugin/Wipe.php diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php new file mode 100644 index 00000000..3efd8a44 --- /dev/null +++ b/PHPCI/Plugin/Wipe.php @@ -0,0 +1,49 @@ + +* @package PHPCI +* @subpackage Plugins +*/ +class Wipe implements \PHPCI\Plugin +{ + protected $directory; + protected $phpci; + + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $path = $phpci->buildPath; + $this->phpci = $phpci; + $this->directory = isset($options['directory']) ? $options['directory'] : $path; + } + + /** + * Wipes a directory's contents + */ + public function execute() + { + $build = $this->phpci->buildPath; + + if ($this->directory == $build || empty($this->directory)) { + return true; + } + if (is_dir($this->directory)) { + $cmd = 'rm -rf %s*'; + $success = $this->phpci->executeCommand($cmd, $this->directory); + } + return $success; + } +} From 34ea46e1395ccfa73e273aa971440594adcf7a36 Mon Sep 17 00:00:00 2001 From: Claus Due Date: Sat, 12 Apr 2014 17:28:52 +0200 Subject: [PATCH 043/119] Preserve absolute paths in Plugin.PhpMessDetector Before: all paths, including absolute paths, were treated relative to build directory. After: any absolute path is not prefixed with the build directory path; it gets used as-is. --- PHPCI/Plugin/PhpMessDetector.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index 89c22f66..c634c238 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -32,7 +32,8 @@ class PhpMessDetector implements \PHPCI\Plugin /** * @var string, based on the assumption the root may not hold the code to be - * tested, exteds the base path + * tested, exteds the base path only if the provided path is relative. Absolute + * paths are used verbatim */ protected $path; @@ -97,11 +98,16 @@ class PhpMessDetector implements \PHPCI\Plugin $this->phpci->logFailure('Could not find phpmd.'); return false; } + + $path = $this->phpci->buildPath . $this->path; + if ($this->path{0} == '/') { + $path = $this->path; + } $cmd = $phpmd . ' "%s" text %s %s %s'; $success = $this->phpci->executeCommand( $cmd, - $this->phpci->buildPath . $this->path, + $path, implode(',', $this->rules), $ignore, $suffixes From 0bf7698cac0cd9fb9ced6069e6417a4ab0c77afd Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 08:57:17 +0100 Subject: [PATCH 044/119] Check $this->path is set before use, fixes #355 --- PHPCI/Plugin/PhpMessDetector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index c634c238..c5e56e4e 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -100,7 +100,7 @@ class PhpMessDetector implements \PHPCI\Plugin } $path = $this->phpci->buildPath . $this->path; - if ($this->path{0} == '/') { + if (!empty($this->path) && $this->path{0} == '/') { $path = $this->path; } From 6513454265720b5a911271c70cfc7c36000abeca Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:05:46 +0100 Subject: [PATCH 045/119] Adding global try/catch in Builder, in hope of fixing forever-hanging. Closes #354, Closes #304 --- PHPCI/Builder.php | 66 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index b7b8c77e..04c5c48e 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -188,41 +188,47 @@ class Builder implements LoggerAwareInterface $this->build->sendStatusPostback(); $this->success = true; - // Set up the build: - $this->setupBuild(); + try { + // Set up the build: + $this->setupBuild(); - // Run the core plugin stages: - foreach (array('setup', 'test') as $stage) { - $this->success &= $this->pluginExecutor->executePlugins($this->config, $stage); - } + // Run the core plugin stages: + foreach (array('setup', 'test') as $stage) { + $this->success &= $this->pluginExecutor->executePlugins($this->config, $stage); + } - // Set the status so this can be used by complete, success and failure - // stages. - if ($this->success) { - $this->build->setStatus(Build::STATUS_SUCCESS); - } else { + // Set the status so this can be used by complete, success and failure + // stages. + if ($this->success) { + $this->build->setStatus(Build::STATUS_SUCCESS); + } else { + $this->build->setStatus(Build::STATUS_FAILED); + } + + // Complete stage plugins are always run + $this->pluginExecutor->executePlugins($this->config, 'complete'); + + if ($this->success) { + $this->pluginExecutor->executePlugins($this->config, 'success'); + $this->buildLogger->logSuccess('BUILD SUCCESSFUL!'); + } else { + $this->pluginExecutor->executePlugins($this->config, 'failure'); + $this->buildLogger->logFailure("BUILD FAILURE"); + } + + // Clean up: + $this->buildLogger->log('Removing build.'); + + $cmd = 'rm -Rf "%s"'; + if (IS_WIN) { + $cmd = 'rmdir /S /Q "%s"'; + } + $this->executeCommand($cmd, $this->buildPath); + } catch (\Exception $ex) { $this->build->setStatus(Build::STATUS_FAILED); + $this->buildLogger->logFailure('Exception: ' . $ex->getMessage()); } - // Complete stage plugins are always run - $this->pluginExecutor->executePlugins($this->config, 'complete'); - - if ($this->success) { - $this->pluginExecutor->executePlugins($this->config, 'success'); - $this->buildLogger->logSuccess('BUILD SUCCESSFUL!'); - } else { - $this->pluginExecutor->executePlugins($this->config, 'failure'); - $this->buildLogger->logFailure("BUILD FAILURE"); - } - - // Clean up: - $this->buildLogger->log('Removing build.'); - - $cmd = 'rm -Rf "%s"'; - if (IS_WIN) { - $cmd = 'rmdir /S /Q "%s"'; - } - $this->executeCommand($cmd, $this->buildPath); // Update the build in the database, ping any external services, etc. $this->build->sendStatusPostback(); From 6917e88f9b3f31c4f4448dd92df34928f0bdd034 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:05:48 +0100 Subject: [PATCH 046/119] Adding global try/catch in Builder, in hope of fixing forever-hanging. Closes #354, Closes #304 --- PHPCI/Builder.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 04c5c48e..92b43e9d 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -136,16 +136,22 @@ class Builder implements LoggerAwareInterface /** * Set the config array, as read from phpci.yml - * @param array + * @param array|null $config + * @throws \Exception */ - public function setConfigArray(array $config) + public function setConfigArray($config) { + if (is_null($config) || !is_array($config)) { + throw new \Exception('This project does not contain a phpci.yml file, or it is empty.'); + } + $this->config = $config; } /** * Access a variable from the phpci.yml file. * @param string + * @return mixed */ public function getConfig($key) { From 1bc5f9048cde20a2ae6f3560de6dfe27b62245df Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:29:01 +0100 Subject: [PATCH 047/119] Fixes for feedback in #341. --- PHPCI/Command/InstallCommand.php | 47 ++++++++++++-------------------- composer.json | 4 +++ 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 3b8ca701..e6432103 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -121,36 +121,26 @@ class InstallCommand extends Command $errors = true; } - // Check for required extensions: - if (!extension_loaded('PDO')) { - $output->writeln(''); - $output->writeln('PDO extension must be installed.'); - $errors = true; + // Check required extensions are present: + $requiredExtensions = array('PDO', 'pdo_mysql', 'mcrypt'); + + foreach ($requiredExtensions as $extension) { + if (!extension_loaded($extension)) { + $output->writeln(''); + $output->writeln(''.$extension.' extension must be installed.'); + $errors = true; + } } - if (!extension_loaded('pdo_mysql')) { - $output->writeln(''); - $output->writeln('PDO MySQL extension must be installed.'); - $errors = true; - } + // Check required functions are callable: + $requiredFunctions = array('exec', 'shell_exec'); - if (!extension_loaded('mcrypt')) { - $output->writeln(''); - $output->writeln('Mcrypt extension must be installed.'); - $errors = true; - } - - // Check we can use the exec() and shell_exec() functions: - if (!function_exists('exec')) { - $output->writeln(''); - $output->writeln('PHPCI needs to be able to call the exec() function. Is it disabled in php.ini?'); - $errors = true; - } - - if (!function_exists('shell_exec')) { - $output->writeln(''); - $output->writeln('PHPCI needs to be able to call the shell_exec() function. Is it disabled in php.ini?'); - $errors = true; + foreach ($requiredFunctions as $function) { + if (!function_exists($function)) { + $output->writeln(''); + $output->writeln('PHPCI needs to be able to call the '.$function.'() function. Is it disabled in php.ini?'); + $errors = true; + } } if (!function_exists('password_hash')) { @@ -160,8 +150,7 @@ class InstallCommand extends Command } if ($errors) { - $output->writeln(''); - die; + throw new Exception('PHPCI cannot be installed, as not all requirements are met. Please review the errors above before continuing.'); } $output->writeln(' OK'); diff --git a/composer.json b/composer.json index 7ccbc600..8de9e9eb 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,10 @@ }, "require": { + "php": ">=5.3.3", + "ext-mcrypt": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*", "block8/b8framework" : "1.*", "ircmaxell/password-compat": "1.*", "swiftmailer/swiftmailer" : "5.0.*", From 1ba1087b5aedf440e0ac79ca42c837c440983299 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:48:39 +0100 Subject: [PATCH 048/119] Updating dependencies - Fixes #320, thanks @GrahamCampbell --- composer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 8de9e9eb..40aada7d 100644 --- a/composer.json +++ b/composer.json @@ -27,19 +27,19 @@ "ext-mcrypt": "*", "ext-pdo": "*", "ext-pdo_mysql": "*", - "block8/b8framework" : "1.*", - "ircmaxell/password-compat": "1.*", - "swiftmailer/swiftmailer" : "5.0.*", - "symfony/yaml" : "2.*", - "symfony/console" : "2.*", - "psr/log": "1.0.0", - "monolog/monolog": "1.6.0", - "pimple/pimple": "1.1.*" + "block8/b8framework" : "~1.1", + "ircmaxell/password-compat": "~1.0", + "swiftmailer/swiftmailer" : "~5.0", + "symfony/yaml" : "~2.1", + "symfony/console" : "~2.1", + "psr/log": "~1.0", + "monolog/monolog": "~1.6", + "pimple/pimple": "~1.1" }, "require-dev": { - "phpunit/phpunit": "3.7.*", - "phpspec/prophecy-phpunit": "1.*" + "phpunit/phpunit": "~3.7", + "phpspec/prophecy-phpunit": "~1.0" }, "suggest": { From 97fd9bea666cfcc81439037661e39568d54377b1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:54:09 +0100 Subject: [PATCH 049/119] Updating composer.lock to reflect new dependency versions --- composer.lock | 195 +++++++++++++------------------------------------- 1 file changed, 50 insertions(+), 145 deletions(-) diff --git a/composer.lock b/composer.lock index f2c730ae..62788338 100644 --- a/composer.lock +++ b/composer.lock @@ -3,20 +3,20 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "07f37de4c8bacd8a1a7b6e14269178d1", + "hash": "0ac85acececb32f472d8aa807ed054e7", "packages": [ { "name": "block8/b8framework", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/Block8/b8framework.git", - "reference": "f643e0d3497599016cb62611ceb9288710423121" + "reference": "63a18f2fdc1dc31b657ea39ef841339d89f24ce8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Block8/b8framework/zipball/f643e0d3497599016cb62611ceb9288710423121", - "reference": "f643e0d3497599016cb62611ceb9288710423121", + "url": "https://api.github.com/repos/Block8/b8framework/zipball/63a18f2fdc1dc31b657ea39ef841339d89f24ce8", + "reference": "63a18f2fdc1dc31b657ea39ef841339d89f24ce8", "shasum": "" }, "require": { @@ -50,7 +50,7 @@ "mvc", "php" ], - "time": "2014-02-24 11:25:23" + "time": "2014-04-01 15:30:13" }, { "name": "ircmaxell/password-compat", @@ -93,16 +93,16 @@ }, { "name": "monolog/monolog", - "version": "1.6.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd" + "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f72392d0e6eb855118f5a84e89ac2d257c704abd", - "reference": "f72392d0e6eb855118f5a84e89ac2d257c704abd", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174", + "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174", "shasum": "" }, "require": { @@ -110,26 +110,32 @@ "psr/log": "~1.0" }, "require-dev": { - "doctrine/couchdb": "dev-master", - "mlehner/gelf-php": "1.0.*", - "raven/raven": "0.5.*" + "aws/aws-sdk-php": "~2.4, >2.4.8", + "doctrine/couchdb": "~1.0@dev", + "graylog2/gelf-php": "~1.0", + "phpunit/phpunit": "~3.7.0", + "raven/raven": "~0.5", + "ruflin/elastica": "0.90.*" }, "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", - "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", - "raven/raven": "Allow sending log messages to a Sentry server" + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "raven/raven": "Allow sending log messages to a Sentry server", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { - "psr-0": { - "Monolog": "src/" + "psr-4": { + "Monolog\\": "src/Monolog" } }, "notification-url": "https://packagist.org/downloads/", @@ -151,7 +157,7 @@ "logging", "psr-3" ], - "time": "2013-07-28 22:38:30" + "time": "2014-03-23 19:50:26" }, { "name": "pimple/pimple", @@ -241,16 +247,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.0.3", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230" + "reference": "748c01c1144713ac0118396935d10b6ceec91b68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/32edc3b0de0fdc1b10f5c4912e8677b3f411a230", - "reference": "32edc3b0de0fdc1b10f5c4912e8677b3f411a230", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/748c01c1144713ac0118396935d10b6ceec91b68", + "reference": "748c01c1144713ac0118396935d10b6ceec91b68", "shasum": "" }, "require": { @@ -274,7 +280,9 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Chris Corbyn" @@ -286,21 +294,21 @@ "mail", "mailer" ], - "time": "2013-12-03 13:33:24" + "time": "2014-03-18 09:03:27" }, { "name": "symfony/console", - "version": "v2.4.2", + "version": "v2.4.3", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe" + "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/940f217cbc3c8a33e5403e7c595495c4884400fe", - "reference": "940f217cbc3c8a33e5403e7c595495c4884400fe", + "url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb", + "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb", "shasum": "" }, "require": { @@ -341,21 +349,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-02-11 13:52:09" + "time": "2014-03-01 17:35:04" }, { "name": "symfony/yaml", - "version": "v2.4.2", + "version": "v2.4.3", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3" + "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/bb6ddaf8956139d1b8c360b4b713ed0138e876b3", - "reference": "bb6ddaf8956139d1b8c360b4b713ed0138e876b3", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", + "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", "shasum": "" }, "require": { @@ -390,116 +398,10 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-01-07 13:28:54" - } - ], - "packages-dev": [ - { - "name": "phpspec/prophecy", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "976a65af02a2a0e17ce6c949f7b43437205628bb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/976a65af02a2a0e17ce6c949f7b43437205628bb", - "reference": "976a65af02a2a0e17ce6c949f7b43437205628bb", - "shasum": "" - }, - "require-dev": { - "phpspec/phpspec": "2.0.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "http://phpspec.org", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "time": "2014-01-24 11:03:43" - }, - { - "name": "phpspec/prophecy-phpunit", - "version": "v1.0.0", - "target-dir": "Prophecy/PhpUnit", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "ebc983be95b026fcea18afb7870e7b9041dc9d11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/ebc983be95b026fcea18afb7870e7b9041dc9d11", - "reference": "ebc983be95b026fcea18afb7870e7b9041dc9d11", - "shasum": "" - }, - "require": { - "phpspec/prophecy": "~1.0" - }, - "suggest": { - "phpunit/phpunit": "if it is not installed globally" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\PhpUnit\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christophe Coevoet", - "email": "stof@notk.org" - } - ], - "description": "PhpUnit test case integrating the Prophecy mocking library", - "homepage": "http://phpspec.org", - "keywords": [ - "phpunit", - "prophecy" - ], - "time": "2013-07-04 21:27:53" + "time": "2014-03-12 18:29:58" } ], + "packages-dev": null, "aliases": [ ], @@ -507,9 +409,12 @@ "stability-flags": [ ], - "platform": [ - - ], + "platform": { + "php": ">=5.3.3", + "ext-mcrypt": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*" + }, "platform-dev": [ ] From 257249fadde1885cdbbb631da2cc6284bbd5b630 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 09:15:39 +0000 Subject: [PATCH 050/119] Adding guard around ssh-keygen in project controller, hopefully fixes #340 --- PHPCI/Controller/ProjectController.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index cf41aee3..7c336eca 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -160,12 +160,17 @@ class ProjectController extends \PHPCI\Controller mkdir($tempPath); } - shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); + if ($this->canGenerateKeys()) { + shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); - $pub = file_get_contents($keyFile . '.pub'); - $prv = file_get_contents($keyFile); + $pub = file_get_contents($keyFile . '.pub'); + $prv = file_get_contents($keyFile); - $values = array('key' => $prv, 'pubkey' => $pub); + $values = array('key' => $prv, 'pubkey' => $pub); + } else { + $pub = null; + $values = array(); + } } $form = $this->projectForm($values); @@ -325,7 +330,7 @@ class ProjectController extends \PHPCI\Controller $field = new Form\Element\TextArea('build_config'); $field->setRequired(false); - $field->setLabel('PHPCI build config for this project (instead phpci.yml in the project repository)'); + $field->setLabel('PHPCI build config for this project (if you cannot add a phpci.yml file in the project repository)'); $field->setClass('form-control'); $field->setContainerClass('form-group'); $field->setRows(6); @@ -425,4 +430,10 @@ class ProjectController extends \PHPCI\Controller return true; }; } + + protected function canGenerateKeys() + { + $result = @shell_exec('ssh-keygen'); + return !empty($result); + } } From ad38db47bd1efd42f8664105dd460af5d14da00c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 10:23:04 +0100 Subject: [PATCH 051/119] Updating PHPSpec plugin to work with v2. Fixes #339 --- PHPCI/Plugin/PhpSpec.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php index afd36699..02aebba7 100644 --- a/PHPCI/Plugin/PhpSpec.php +++ b/PHPCI/Plugin/PhpSpec.php @@ -21,15 +21,10 @@ use PHPCI\Model\Build; class PhpSpec implements \PHPCI\Plugin { protected $phpci; - protected $bootstrap; public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; - - if (!empty($options['bootstrap'])) { - $this->bootstrap = $this->buildPath . $options['bootstrap']; - } } /** @@ -47,11 +42,7 @@ class PhpSpec implements \PHPCI\Plugin return false; } - if ($this->bootstrap) { - $success = $this->phpci->executeCommand($phpspec . ' -f d'); - } else { - $success = $this->phpci->executeCommand($phpspec . ' -f d --bootstrap "%s"', $this->bootstrap); - } + $success = $this->phpci->executeCommand($phpspec . ' --format=pretty --no-code-generation'); chdir($curdir); From 886d79946d4438ffb736a445d084119c8a61008a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 10:14:06 +0000 Subject: [PATCH 052/119] Fixing issues when adding a gitlab project --- PHPCI/Controller/ProjectController.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 7c336eca..95f8c2cd 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -189,11 +189,21 @@ class ProjectController extends \PHPCI\Controller if ($values['type'] == "gitlab") { preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches); + $info = array(); - $info["user"] = $matches[1]; - $info["domain"] = $matches[2]; + if (isset($matches[1])) { + $info["user"] = $matches[1]; + } + + if (isset($matches[2])) { + $info["domain"] = $matches[2]; + } + $values['access_information'] = serialize($info); - $values['reference'] = $matches[3]."/".$matches[4]; + + if (isset($matches[3]) && isset($matches[4])) { + $values['reference'] = $matches[3]."/".$matches[4]; + } } $values['git_key'] = $values['key']; From 0e6523e2cd9c9e41a9229d326ade7b15a6c717a6 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 10:14:19 +0000 Subject: [PATCH 053/119] Adding basic git plugin --- PHPCI/Plugin/Git.php | 125 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 PHPCI/Plugin/Git.php diff --git a/PHPCI/Plugin/Git.php b/PHPCI/Plugin/Git.php new file mode 100644 index 00000000..54f1f160 --- /dev/null +++ b/PHPCI/Plugin/Git.php @@ -0,0 +1,125 @@ + + * @package PHPCI + * @subpackage Plugins + */ +class Git implements \PHPCI\Plugin +{ + protected $phpci; + protected $build; + protected $actions = array(); + + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + $this->actions = $options; + } + + + public function execute() + { + $buildPath = $this->phpci->buildPath; + + // Check if there are any actions to be run for the branch we're running on: + if (!array_key_exists($this->build->getBranch(), $this->actions)) { + return true; + } + + // If there are, run them: + $curdir = getcwd(); + chdir($buildPath); + + $success = true; + foreach ($this->actions[$this->build->getBranch()] as $action => $options) { + if (!$this->runAction($action, $options)) { + $success = false; + break; + } + } + + chdir($curdir); + + return $success; + } + + protected function runAction($action, $options = array()) + { + // If options isn't an array, it should be. + if (!is_array($options)) { + $options = array(); + } + + // Handle git merges. + if ($action == 'merge' && array_key_exists('branch', $options)) { + $cmd = 'git checkout %s && git merge ' . $this->build->getBranch(); + return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']); + } + + // Handle tagging: + if ($action == 'tag') { + $tagName = date('Ymd-His'); + $message = 'Tag created by PHPCI: ' . date('Y-m-d H:i:s'); + + if (array_key_exists('name', $options)) { + $tagName = $this->phpci->interpolate($options['name']); + } + + if (array_key_exists('message', $options)) { + $message = $this->phpci->interpolate($options['message']); + } + + $cmd = 'git tag %s -m "%s"'; + return $this->phpci->executeCommand($cmd, $tagName, $message); + } + + // Handle pull: + if ($action == 'pull') { + $branch = $this->build->getBranch(); + $remote = 'origin'; + + if (array_key_exists('branch', $options)) { + $branch = $this->phpci->interpolate($options['branch']); + } + + if (array_key_exists('remote', $options)) { + $remote = $this->phpci->interpolate($options['remote']); + } + + return $this->phpci->executeCommand('git pull %s %s', $remote, $branch); + } + + // Handle push: + if ($action == 'push') { + $branch = $this->build->getBranch(); + $remote = 'origin'; + + if (array_key_exists('branch', $options)) { + $branch = $this->phpci->interpolate($options['branch']); + } + + if (array_key_exists('remote', $options)) { + $remote = $this->phpci->interpolate($options['remote']); + } + + return $this->phpci->executeCommand('git push %s %s', $remote, $branch); + } + + return false; + } +} From b7e0a545bc84c8104c78d3537ccbb725e03709d1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 11:03:40 +0000 Subject: [PATCH 054/119] Adding post install script --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index 40aada7d..2f7b45b7 100644 --- a/composer.json +++ b/composer.json @@ -52,5 +52,11 @@ "atoum/atoum": "Atoum", "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", "behat/behat": "Behat BDD Testing" + }, + + "scripts": { + "post-root-package-install": [ + "./console phpci:install" + ] } } From 6c01406935c721e30de82258afc1b50b49f5851e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 12:05:00 +0100 Subject: [PATCH 055/119] Fixing previous commit >_> --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2f7b45b7..b3b9213b 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ }, "scripts": { - "post-root-package-install": [ + "post-create-project-cmd": [ "./console phpci:install" ] } From 959864c5827769220664e970abf8eb1e50df84a0 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 12:05:45 +0100 Subject: [PATCH 056/119] Fixing previous commit >_> --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index b3b9213b..40aada7d 100644 --- a/composer.json +++ b/composer.json @@ -52,11 +52,5 @@ "atoum/atoum": "Atoum", "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", "behat/behat": "Behat BDD Testing" - }, - - "scripts": { - "post-create-project-cmd": [ - "./console phpci:install" - ] } } From acf4d093bbd1715b1e3aa020089502e27a9d6594 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 12:30:03 +0100 Subject: [PATCH 057/119] Updating PHPMD to enforce rules being an array. Fixes #319 --- PHPCI/Plugin/PhpMessDetector.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index c5e56e4e..06bc72e8 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -86,6 +86,11 @@ class PhpMessDetector implements \PHPCI\Plugin $suffixes = ' --suffixes ' . implode(',', $this->suffixes); } + if (!empty($this->rules) && !is_array($this->rules)) { + $this->phpci->logFailure('The "rules" option must be an array.'); + return false; + } + foreach ($this->rules as &$rule) { if (strpos($rule, '/') !== false) { $rule = $this->phpci->buildPath . $rule; From 3bf9e1ab254e9353bc4a2223aaed65feb00053fc Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 12:37:32 +0100 Subject: [PATCH 058/119] Inlining the validateSession functionality in Application, fixes #312 --- PHPCI/Application.php | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 3d889967..5c9647d2 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -26,11 +26,27 @@ class Application extends b8\Application $route = '/:controller/:action'; $opts = array('controller' => 'Home', 'action' => 'index'); - $this->router->clearRoutes(); - $this->router->register($route, $opts, function (&$route, Response &$response) use (&$request) { + // Inlined as a closure to fix "using $this when not in object context" on 5.3 + $validateSession = function () { + if (!empty($_SESSION['user_id'])) { + $user = b8\Store\Factory::getStore('User')->getByPrimaryKey($_SESSION['user_id']); + + if ($user) { + $_SESSION['user'] = $user; + return true; + } + + unset($_SESSION['user_id']); + } + + return false; + }; + + // Handler for the route we're about to register, checks for a valid session where necessary: + $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession) { $skipValidation = in_array($route['controller'], array('session', 'webhook', 'build-status')); - if (!$skipValidation && !$this->validateSession()) { + if (!$skipValidation && !$validateSession()) { if ($request->isAjax()) { $response->setResponseCode(401); $response->setContent(''); @@ -43,7 +59,10 @@ class Application extends b8\Application } return true; - }); + }; + + $this->router->clearRoutes(); + $this->router->register($route, $opts, $routeHandler); } /** * Handle an incoming web request. @@ -60,23 +79,4 @@ class Application extends b8\Application return $this->response; } - - /** - * Validate whether or not the remote user has a valid session: - */ - protected function validateSession() - { - if (!empty($_SESSION['user_id'])) { - $user = b8\Store\Factory::getStore('User')->getByPrimaryKey($_SESSION['user_id']); - - if ($user) { - $_SESSION['user'] = $user; - return true; - } - - unset($_SESSION['user_id']); - } - - return false; - } } From c888b445411a20e4b3dd81b0d803864998a18ef3 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 14:46:15 +0100 Subject: [PATCH 059/119] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 6f5a14af..defd1998 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,7 @@ _**Please be aware that PHPCI is a beta-release project, so whilst it is very st We've got documentation on our wiki on [installing PHPCI](https://github.com/Block8/PHPCI/wiki/Installing-PHPCI) and [adding support for PHPCI to your projects](https://github.com/Block8/PHPCI/wiki/Adding-PHPCI-Support-to-Your-Projects). ##Contributing -Contributions from others would be very much appreciated! If you just want to make a simple change, simply fork the repository, and send us a pull request when you're ready. - -If you'd like to get more involved in developing PHPCI or to become a maintainer / committer on the main PHPCI repository, join the [mailing list](https://groups.google.com/forum/#!forum/php-ci). +Contributions from others would be very much appreciated! Please read our [guide to contributing](https://github.com/Block8/PHPCI/wiki/Contributing-to-PHPCI) for more information on how to get involved. ##Questions? Your best place to go is the [mailing list](https://groups.google.com/forum/#!forum/php-ci), if you're already a member of the mailing list, you can simply email php-ci@googlegroups.com. From 03141f41c4c7ccadbb52966945bbd740bbaed9a3 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 16:45:14 +0100 Subject: [PATCH 060/119] Fixing redirect to install.php --- bootstrap.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 4f3e8a67..ee819c49 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -33,9 +33,8 @@ $autoload = function ($class) { spl_autoload_register($autoload, true, true); -if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE) && substr($_SERVER['PHP_SELF'], -12) != '/install.php') { - header('Location: install.php'); - die; +if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { + die('PHPCI has not yet been installed - Please use the command ./console phpci:install to install it.'); } if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) { From 78e4b9d1041dfc61f592e3137ebf0007af9d2357 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 16 Apr 2014 16:38:19 +0000 Subject: [PATCH 061/119] Updating RemoteGitBuild to support a Git SSH wrapper. See #114 --- PHPCI/Model/Build/RemoteGitBuild.php | 67 +++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 5be3000c..bc4192b1 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -72,22 +72,24 @@ class RemoteGitBuild extends Build */ protected function cloneBySsh(Builder $builder, $cloneTo) { - // Copy the project's keyfile to disk: - $keyPath = realpath($cloneTo); + $keyFile = $this->writeSshKey($cloneTo); - if ($keyPath === false) { - $keyPath = dirname($cloneTo); + if (!IS_WIN) { + $gitSshWrapper = $this->writeSshWrapper($cloneTo, $keyFile); } - $keyFile = $keyPath . '.key'; + // Do the git clone: + $cmd = 'git clone -b %s %s "%s"'; - file_put_contents($keyFile, $this->getProject()->getGitKey()); - chmod($keyFile, 0600); + if (!IS_WIN) { + $cmd = 'export GIT_SSH="'.$gitSshWrapper.'" && ' . $cmd; + } - // Use the key file to do an SSH clone: - $cmd = 'eval `ssh-agent -s` && ssh-add "%s" && git clone -b %s %s "%s" && ssh-agent -k'; - $success = $builder->executeCommand($cmd, $keyFile, $this->getBranch(), $this->getCloneUrl(), $cloneTo); + var_dump($cmd); + $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); + + // Checkout a specific commit if we need to: $commit = $this->getCommitId(); if (!empty($commit) && $commit != 'Manual') { @@ -98,9 +100,52 @@ class RemoteGitBuild extends Build $builder->executeCommand($cmd, $cloneTo, $this->getCommitId()); } - // Remove the key file: + // Remove the key file and git wrapper: unlink($keyFile); + unlink($gitSshWrapper); return $success; } + + /** + * Create an SSH key file on disk for this build. + * @param $cloneTo + * @return string + */ + protected function writeSshKey($cloneTo) + { + $keyPath = dirname($cloneTo . '/temp'); + $keyFile = $keyPath . '.key'; + + // Write the contents of this project's git key to the file: + file_put_contents($keyFile, $this->getProject()->getGitKey()); + chmod($keyFile, 0600); + + // Return the filename: + return $keyFile; + } + + /** + * Create an SSH wrapper script for Git to use, to disable host key checking, etc. + * @param $cloneTo + * @param $keyFile + * @return string + */ + protected function writeSshWrapper($cloneTo, $keyFile) + { + $path = dirname($cloneTo . '/temp'); + $wrapperFile = $path . '.sh'; + + // Write out the wrapper script for this build: + $script = << Date: Wed, 16 Apr 2014 16:38:40 +0000 Subject: [PATCH 062/119] Removing top level build directory, as it is not used. --- build/.gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100755 build/.gitignore diff --git a/build/.gitignore b/build/.gitignore deleted file mode 100755 index c96a04f0..00000000 --- a/build/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file From ef5ba4693d86414c6053a8543b0e45bd5e58de75 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Fri, 11 Apr 2014 21:55:01 +0200 Subject: [PATCH 063/119] fix #335: unify (loc / quality trend) graph labels --- public/assets/js/build-plugins/loc.js | 4 ++-- public/assets/js/build-plugins/warnings.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js index df0b4ce6..d71a42ad 100644 --- a/public/assets/js/build-plugins/loc.js +++ b/public/assets/js/build-plugins/loc.js @@ -47,7 +47,7 @@ var locPlugin = PHPCI.UiPlugin.extend({ var titles = ['Build', 'Lines', 'Comment Lines', 'Non-Comment Lines', 'Logical Lines']; var data = [titles]; for (var i in builds) { - data.push(['Build ' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]); + data.push(['#' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]); } var data = google.visualization.arrayToDataTable(data); @@ -63,4 +63,4 @@ var locPlugin = PHPCI.UiPlugin.extend({ } }); -PHPCI.registerPlugin(new locPlugin()); \ No newline at end of file +PHPCI.registerPlugin(new locPlugin()); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 6bd371a1..8b86a1e7 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -87,8 +87,8 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ var data = google.visualization.arrayToDataTable(data); var options = { - hAxis: {title: 'Build'}, - vAxis: {title: 'Warnings'}, + hAxis: {title: 'Builds'}, + vAxis: {title: 'Warnings / Errors'}, backgroundColor: { fill: 'transparent' }, height: 275, pointSize: 3 From 1f8a18d11346a53c0eb5e562f9c30f5485f2b98b Mon Sep 17 00:00:00 2001 From: Claus Due Date: Sat, 12 Apr 2014 13:52:26 +0200 Subject: [PATCH 064/119] Cross-platform safe copy in Plugin.CopyBuild Rather than using `xargs` which behaves differently on BSD and Linux, it's safer to use the straight `cp`. We lose the output of which files were copied - but I'd be more than happy to add this as a separate command to list which files were copied and which were ignored. --- PHPCI/Plugin/CopyBuild.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index c06408b8..39d41e3f 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -43,7 +43,7 @@ class CopyBuild implements \PHPCI\Plugin return false; } - $cmd = 'mkdir -p "%s" && ls -1a "%s"* | xargs -r -t "%s/"'; + $cmd = 'mkdir -p "%s" && cp -R "%s" "%s"'; $success = $this->phpci->executeCommand($cmd, $this->directory, $build, $this->directory); if ($this->ignore) { From 08afe7b10467738d97c574e19a12f361f520e6ed Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 24 Apr 2014 16:25:24 +0100 Subject: [PATCH 065/119] Adding per-page titles throughout PHPCI, fixes #371 --- PHPCI/Application.php | 6 ++++++ PHPCI/Controller/BuildController.php | 3 +++ PHPCI/Controller/HomeController.php | 2 ++ PHPCI/Controller/PluginController.php | 2 ++ PHPCI/Controller/ProjectController.php | 7 +++++++ PHPCI/Controller/UserController.php | 8 ++++++++ PHPCI/View/layout.phtml | 2 +- 7 files changed, 29 insertions(+), 1 deletion(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 5c9647d2..ecc71ad5 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -73,6 +73,12 @@ class Application extends b8\Application if (View::exists('layout') && $this->response->hasLayout()) { $view = new View('layout'); + $pageTitle = $this->config->get('page_title', null); + + if (!is_null($pageTitle)) { + $view->title = $pageTitle; + } + $view->content = $this->response->getContent(); $this->response->setContent($view->render()); } diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index 032ce118..3ebb8432 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -40,6 +40,9 @@ class BuildController extends \PHPCI\Controller $this->view->plugins = $this->getUiPlugins(); $this->view->build = $build; $this->view->data = $this->getBuildData($build); + + $title = 'Build #' . $build->getId() . ' - ' . $build->getProjectTitle(); + $this->config->set('page_title', $title); } protected function getUiPlugins() diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 95676efc..b2d4bd6b 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -56,6 +56,8 @@ class HomeController extends \PHPCI\Controller $this->view->projects = $projects['items']; $this->view->summary = $summaryView->render(); + $this->config->set('page_title', 'Dashboard'); + return $this->view->render(); } diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index b7e32ddb..4f51e6c9 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -75,6 +75,8 @@ class PluginController extends \PHPCI\Controller $this->view->plugins = $pluginInfo->getInstalledPlugins(); + $this->config->set('page_title', 'Plugins'); + return $this->view->render(); } diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 95f8c2cd..42c74a10 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -61,6 +61,8 @@ class ProjectController extends \PHPCI\Controller $this->view->project = $project; $this->view->page = $page; + $this->config->set('page_title', $project->getTitle()); + return $this->view->render(); } @@ -134,6 +136,8 @@ class ProjectController extends \PHPCI\Controller */ public function add() { + $this->config->set('page_title', 'Add Project'); + if (!$_SESSION['user']->getIsAdmin()) { throw new \Exception('You do not have permission to do that.'); } @@ -229,6 +233,9 @@ class ProjectController extends \PHPCI\Controller $method = $this->request->getMethod(); $project = $this->projectStore->getById($projectId); + $this->config->set('page_title', 'Edit: ' . $project->getTitle()); + + if ($method == 'POST') { $values = $this->getParams(); } else { diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index ad41aff6..c8fade0c 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -40,6 +40,8 @@ class UserController extends Controller $users = $this->userStore->getWhere(array(), 1000, 0, array(), array('email' => 'ASC')); $this->view->users = $users; + $this->config->set('page_title', 'Users'); + return $this->view->render(); } @@ -52,6 +54,9 @@ class UserController extends Controller throw new \Exception('You do not have permission to do that.'); } + $this->config->set('page_title', 'Add User'); + + $method = $this->request->getMethod(); if ($method == 'POST') { @@ -96,6 +101,9 @@ class UserController extends Controller $method = $this->request->getMethod(); $user = $this->userStore->getById($userId); + $this->config->set('page_title', 'Edit: ' . $user->getName()); + + if ($method == 'POST') { $values = $this->getParams(); } else { diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index c455334c..73c97d75 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -1,7 +1,7 @@ - PHPCI + <?php if (!empty($title)) { print $title . ' - '; } ?>PHPCI From 2e4e3129b77c4f798aeb08424a376af16730c5c6 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 10:17:39 +0100 Subject: [PATCH 066/119] Adding the ability to run projects with no build configuration. Runs what plugins it can automatically. Closes #235 --- PHPCI/Model/Build.php | 67 +++++++++++++++++++++++++++---- PHPCI/Plugin/Composer.php | 14 ++++++- PHPCI/Plugin/Lint.php | 3 +- PHPCI/Plugin/PhpCodeSniffer.php | 68 ++++++++++++++++++++++++++------ PHPCI/Plugin/PhpLoc.php | 12 +++++- PHPCI/Plugin/PhpMessDetector.php | 24 ++++++++++- PHPCI/Plugin/PhpSpec.php | 3 +- PHPCI/Plugin/PhpUnit.php | 40 ++++++++++++++++++- PHPCI/ZeroConfigPlugin.php | 21 ++++++++++ 9 files changed, 224 insertions(+), 28 deletions(-) create mode 100644 PHPCI/ZeroConfigPlugin.php diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 20ff6a34..c5b0dc1a 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -88,20 +88,73 @@ class Build extends BuildBase */ protected function handleConfig(Builder $builder, $buildPath) { + $build_config = null; + + // Try phpci.yml first: if (is_file($buildPath . '/phpci.yml')) { $build_config = file_get_contents($buildPath . '/phpci.yml'); } - if (!is_file($buildPath . '/phpci.yml') || !$build_config) { + // Try getting the project build config from the database: + if (empty($build_config)) { $build_config = $this->getProject()->getBuildConfig(); - if (!$build_config) { - $builder->logFailure('Project does not contain a phpci.yml file.'); - return false; + } + + // Fall back to zero config plugins: + if (empty($build_config)) { + $build_config = $this->getZeroConfigPlugins($builder); + } + + if (is_string($build_config)) { + $yamlParser = new YamlParser(); + $build_config = $yamlParser->parse($build_config); + } + + $builder->setConfigArray($build_config); + return true; + } + + protected function getZeroConfigPlugins(Builder $builder) + { + $pluginDir = PHPCI_DIR . 'PHPCI/Plugin/'; + $dir = new \DirectoryIterator($pluginDir); + + $config = array( + 'build_settings' => array( + 'ignore' => array( + 'vendor/', + ) + ) + ); + + foreach ($dir as $item) { + if ($item->isDot()) { + continue; + } + + if (!$item->isFile()) { + continue; + } + + if ($item->getExtension() != 'php') { + continue; + } + + $className = '\PHPCI\Plugin\\'.$item->getBasename('.php'); + + $reflectedPlugin = new \ReflectionClass($className); + + if (!$reflectedPlugin->implementsInterface('\PHPCI\ZeroConfigPlugin')) { + continue; + } + + foreach (array('setup', 'test', 'complete', 'success', 'failure') as $stage) { + if ($className::canExecute($stage, $builder, $this)) { + $config[$stage][$className] = array(); + } } } - $yamlParser = new YamlParser(); - $builder->setConfigArray($yamlParser->parse($build_config)); - return $builder->getConfig('build_settings'); + return $config; } } diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index d40ac100..70462eba 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,13 +19,24 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Composer implements \PHPCI\Plugin +class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { protected $directory; protected $action; protected $preferDist; protected $phpci; + public static function canExecute($stage, Builder $builder, Build $build) + { + $path = $builder->buildPath . '/composer.json'; + + if (file_exists($path) && $stage == 'setup') { + return true; + } + + return false; + } + public function __construct(Builder $phpci, Build $build, array $options = array()) { $path = $phpci->buildPath; diff --git a/PHPCI/Plugin/Lint.php b/PHPCI/Plugin/Lint.php index ebab146e..73b4beaf 100644 --- a/PHPCI/Plugin/Lint.php +++ b/PHPCI/Plugin/Lint.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class Lint implements \PHPCI\Plugin +class Lint implements PHPCI\Plugin { protected $directories; protected $recursive = true; diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index 2f0d7592..b942e44b 100755 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PhpCodeSniffer implements \PHPCI\Plugin +class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { /** * @var \PHPCI\Builder @@ -50,6 +51,16 @@ class PhpCodeSniffer implements \PHPCI\Plugin */ protected $encoding; + /** + * @var int + */ + protected $allowed_errors; + + /** + * @var int + */ + protected $allowed_warnings; + /** * @var string, based on the assumption the root may not hold the code to be * tested, exteds the base path @@ -61,21 +72,33 @@ class PhpCodeSniffer implements \PHPCI\Plugin */ protected $ignore; + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + /** * @param \PHPCI\Builder $phpci + * @param \PHPCI\Model\Build $build * @param array $options */ public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; - $this->build = $build; - $this->suffixes = array('php'); - $this->directory = $phpci->buildPath; - $this->standard = 'PSR2'; - $this->tab_width = ''; - $this->encoding = ''; - $this->path = ''; - $this->ignore = $this->phpci->ignore; + $this->phpci = $phpci; + $this->build = $build; + $this->suffixes = array('php'); + $this->directory = $phpci->buildPath; + $this->standard = 'PSR2'; + $this->tab_width = ''; + $this->encoding = ''; + $this->path = ''; + $this->ignore = $this->phpci->ignore; + $this->allowed_warnings = -1; + $this->allowed_errors = -1; if (isset($options['suffixes'])) { $this->suffixes = (array)$options['suffixes']; @@ -104,6 +127,14 @@ class PhpCodeSniffer implements \PHPCI\Plugin if (isset($options['ignore'])) { $this->ignore = $options['ignore']; } + + if (isset($options['allowed_warnings'])) { + $this->allowed_warnings = (int)$options['allowed_warnings']; + } + + if (isset($options['allowed_errors'])) { + $this->allowed_errors = (int)$options['allowed_errors']; + } } /** @@ -121,7 +152,7 @@ class PhpCodeSniffer implements \PHPCI\Plugin } $cmd = $phpcs . ' --report=emacs %s %s %s %s %s "%s"'; - $success = $this->phpci->executeCommand( + $this->phpci->executeCommand( $cmd, $standard, $suffixes, @@ -133,14 +164,25 @@ class PhpCodeSniffer implements \PHPCI\Plugin $output = $this->phpci->getLastOutput(); + $success = true; $matches = array(); if (preg_match_all('/\: warning \-/', $output, $matches)) { - $this->build->storeMeta('phpcs-warnings', count($matches[0])); + $warnings = count($matches[0]); + $this->build->storeMeta('phpcs-warnings', $warnings); + + if ($this->allowed_warnings != -1 && $warnings > $this->allowed_warnings) { + $success = false; + } } $matches = array(); if (preg_match_all('/\: error \-/', $output, $matches)) { - $this->build->storeMeta('phpcs-errors', count($matches[0])); + $errors = count($matches[0]); + $this->build->storeMeta('phpcs-errors', $errors); + + if ($this->allowed_errors != -1 && $errors > $this->allowed_errors) { + $success = false; + } } return $success; diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php index 809b6409..000b82cc 100644 --- a/PHPCI/Plugin/PhpLoc.php +++ b/PHPCI/Plugin/PhpLoc.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PhpLoc implements \PHPCI\Plugin +class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { /** * @var string @@ -29,6 +30,15 @@ class PhpLoc implements \PHPCI\Plugin */ protected $phpci; + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index 06bc72e8..f68d7aec 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PhpMessDetector implements \PHPCI\Plugin +class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { /** * @var \PHPCI\Builder @@ -49,6 +50,15 @@ class PhpMessDetector implements \PHPCI\Plugin */ protected $rules; + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + /** * @param \PHPCI\Builder $phpci * @param array $options @@ -61,11 +71,16 @@ class PhpMessDetector implements \PHPCI\Plugin $this->ignore = $phpci->ignore; $this->path = ''; $this->rules = array('codesize', 'unusedcode', 'naming'); + $this->allowed_warnings = -1; if (!empty($options['path'])) { $this->path = $options['path']; } + if (array_key_exists('allowed_warnings', $options)) { + $this->allowed_warnings = (int)$options['allowed_warnings']; + } + foreach (array('rules', 'ignore', 'suffixes') as $key) { $this->overrideSetting($options, $key); } @@ -110,7 +125,7 @@ class PhpMessDetector implements \PHPCI\Plugin } $cmd = $phpmd . ' "%s" text %s %s %s'; - $success = $this->phpci->executeCommand( + $this->phpci->executeCommand( $cmd, $path, implode(',', $this->rules), @@ -118,9 +133,14 @@ class PhpMessDetector implements \PHPCI\Plugin $suffixes ); + $success = true; $errors = count(array_filter(explode(PHP_EOL, trim($this->phpci->getLastOutput())))); $this->build->storeMeta('phpmd-warnings', $errors); + if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { + $success = false; + } + return $success; } diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php index 02aebba7..843017b9 100644 --- a/PHPCI/Plugin/PhpSpec.php +++ b/PHPCI/Plugin/PhpSpec.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PhpSpec implements \PHPCI\Plugin +class PhpSpec implements PHPCI\Plugin { protected $phpci; diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index fde1b2fa..ab0cfc58 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -9,6 +9,7 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; @@ -18,7 +19,7 @@ use PHPCI\Model\Build; * @package PHPCI * @subpackage Plugins */ -class PhpUnit implements \PHPCI\Plugin +class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { protected $args; protected $phpci; @@ -46,9 +47,44 @@ class PhpUnit implements \PHPCI\Plugin */ protected $xmlConfigFile; + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test' && !is_null(self::findConfigFile($builder->buildPath))) { + return true; + } + + return false; + } + + public static function findConfigFile($buildPath) + { + if (file_exists($buildPath . '/phpunit.xml')) { + return $buildPath . '/phpunit.xml'; + } + + if (file_exists($buildPath . '/tests/phpunit.xml')) { + return $buildPath . '/tests/phpunit.xml'; + } + + if (file_exists($buildPath . '/phpunit.xml.dist')) { + return $buildPath . '/phpunit.xml.dist'; + } + + if (file_exists($buildPath . '/tests/phpunit.xml.dist')) { + return $buildPath . '/tests/phpunit.xml.dist'; + } + + return null; + } + public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; + + if (!count($options)) { + $this->runFrom = $phpci->buildPath; + $this->xmlConfigFile = self::findConfigFile($phpci->buildPath); + } if (isset($options['directory'])) { $this->directory = $options['directory']; diff --git a/PHPCI/ZeroConfigPlugin.php b/PHPCI/ZeroConfigPlugin.php new file mode 100644 index 00000000..b779cf5e --- /dev/null +++ b/PHPCI/ZeroConfigPlugin.php @@ -0,0 +1,21 @@ + + */ +interface ZeroConfigPlugin +{ + public static function canExecute($stage, Builder $builder, Build $build); +} From ab848b9ebfd61056629a7bf93dc993d99763475d Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 11:25:46 +0000 Subject: [PATCH 067/119] UI improvements for the Build view screen --- PHPCI/View/Build/view.phtml | 98 +++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 16 deletions(-) diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 0c6817c9..52d4db80 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -1,38 +1,60 @@ -
-

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

+
+ + +
+

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

+
+
+ getCommitMessage()): ?> +
+ getCommitMessage(); ?> +
+ + Branch: getBranch(); ?>
- Committer: getCommitterEmail(); ?>
- Commit ID: getCommitId() == 'Manual' ? 'HEAD' : $build->getCommitId(); ?>
- Commit Message: getCommitMessage(); ?> + Committer: getCommitterEmail(); ?> + + getCommitId() != 'Manual'): ?> +
Commit ID: getCommitId(); ?>
+
- -
Options
-
-
+
getStatus(); ?>); }); + + function updateBuildStatus(status) { + var statusClass = null; + var statusText = null; + + switch (status) { + case 0: + statusClass = 'info'; + statusText = 'Pending'; + break; + case 1: + statusClass = 'warning'; + statusText = 'Running'; + break; + case 2: + statusClass = 'success'; + statusText = 'Success'; + break; + case 3: + statusClass = 'danger'; + statusText = 'Failed'; + break; + } + + $('#title') + .removeClass('panel-info') + .removeClass('panel-warning') + .removeClass('panel-success') + .removeClass('panel-danger') + .addClass('panel-' + statusClass); + + $('#title .label') + .removeClass('label-info') + .removeClass('label-warning') + .removeClass('label-success') + .removeClass('label-danger') + .addClass('label-' + statusClass) + .text(statusText); + } From 96eee9c9b75d75121445ed87ff282f080e3ccf2f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 11:26:33 +0000 Subject: [PATCH 068/119] Making new manual builds use the active user's email as the committer address --- PHPCI/Controller/ProjectController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 42c74a10..2ecc177b 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -80,6 +80,7 @@ class ProjectController extends \PHPCI\Controller $build->setStatus(Build::STATUS_NEW); $build->setBranch($project->getType() === 'hg' ? 'default' : 'master'); $build->setCreated(new \DateTime()); + $build->setCommitterEmail($_SESSION['user']->getEmail()); $build = $this->buildStore->save($build); From 985c51c5e435e2272d686ff66ced8d677989498c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 11:28:27 +0000 Subject: [PATCH 069/119] Migrating PHPMD to use XML report format and add a UI plugin to display warning information. See #305 --- PHPCI/Builder.php | 5 ++ PHPCI/Helper/CommandExecutor.php | 5 +- PHPCI/Model/Build.php | 5 ++ PHPCI/Model/Build/GithubBuild.php | 20 +++++++ PHPCI/Plugin/PhpMessDetector.php | 48 ++++++++++++++++- public/assets/css/phpci.css | 35 +++++++++++-- public/assets/js/build-plugins/phpmd.js | 69 +++++++++++++++++++++++++ public/assets/js/phpci.js | 11 ++-- 8 files changed, 184 insertions(+), 14 deletions(-) create mode 100644 public/assets/js/build-plugins/phpmd.js diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 92b43e9d..4547564a 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -258,6 +258,11 @@ class Builder implements LoggerAwareInterface return $this->commandExecutor->getLastOutput(); } + public function logExecOutput($enableLog = true) + { + $this->commandExecutor->logExecOutput = $enableLog; + } + /** * Find a binary required by a plugin. * @param $binary diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 2e88b938..dc284b6a 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -25,6 +25,9 @@ class CommandExecutor protected $lastOutput; + public $logExecOutput = true; + + /** * The path which findBinary will look in. * @var string @@ -80,7 +83,7 @@ class CommandExecutor $lastOutput = trim($lastOutput, '"'); } - if (!empty($this->lastOutput) && ($this->verbose|| $status != 0)) { + if ($this->logExecOutput && !empty($this->lastOutput) && ($this->verbose|| $status != 0)) { $this->logger->log($this->lastOutput); } diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index c5b0dc1a..edd8fd2c 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -157,4 +157,9 @@ class Build extends BuildBase return $config; } + + public function getFileLink($file, $line = null) + { + return null; + } } diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 98d7a8eb..02118c60 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -93,4 +93,24 @@ class GithubBuild extends RemoteGitBuild return 'https://github.com/' . $this->getProject()->getReference() . '.git'; } } + + public function getCommitMessage() + { + $rtn = $this->data['commit_message']; + + $rtn = preg_replace('/\#([0-9]+)/', '#$1', $rtn); + $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '@$1', $rtn); + + return $rtn; + } + + public function getFileLinkTemplate() + { + $link = 'https://github.com/' . $this->getProject()->getReference() . '/'; + $link .= 'blob/' . $this->getBranch() . '/'; + $link .= '{FILE}'; + $link .= '#L{LINE}'; + + return $link; + } } diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index f68d7aec..7745c363 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -124,7 +124,12 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $path = $this->path; } - $cmd = $phpmd . ' "%s" text %s %s %s'; + $cmd = $phpmd . ' "%s" xml %s %s %s'; + + // Disable exec output logging, as we don't want the XML report in the log: + $this->phpci->logExecOutput(false); + + // Run PHPMD: $this->phpci->executeCommand( $cmd, $path, @@ -133,9 +138,14 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $suffixes ); + // Re-enable exec output logging: + $this->phpci->logExecOutput(true); + $success = true; - $errors = count(array_filter(explode(PHP_EOL, trim($this->phpci->getLastOutput())))); + + list($errors, $data) = $this->processReport(trim($this->phpci->getLastOutput())); $this->build->storeMeta('phpmd-warnings', $errors); + $this->build->storeMeta('phpmd-data', $data); if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { $success = false; @@ -150,4 +160,38 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->{$key} = $options[$key]; } } + + protected function processReport($xml) + { + $xml = simplexml_load_string($xml); + + if ($xml === false) { + throw new \Exception('Could not process PHPMD report XML.'); + } + + $warnings = 0; + $data = array(); + + foreach ($xml->file as $file) { + $fileName = (string)$file['name']; + $fileName = str_replace($this->phpci->buildPath, '', $fileName); + + foreach ($file->violation as $violation) { + $warnings++; + $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, + ); + + $data[] = $warning; + } + } + + return array($warnings, $data); + } } diff --git a/public/assets/css/phpci.css b/public/assets/css/phpci.css index ce34fe82..6b09a8e7 100644 --- a/public/assets/css/phpci.css +++ b/public/assets/css/phpci.css @@ -57,11 +57,16 @@ td .label { #title { - border-bottom: 1px solid #ccc; - margin: -10px -10px 15px -10px; - padding: 10px; } + #title img { + border: 1px solid #fff; + border-radius: 50%; + box-shadow: 2px 2px 2px rgba(0,0,0,0.1); + margin-bottom: 15px; + margin-right: 15px; + } + #title h1 { font-size: 2em; @@ -69,6 +74,23 @@ td .label { padding: 0; } + #title h1 span { + font-weight: lighter; + margin-left: 15px; + } + + #title h1 label { + margin-top: -6px; + } + + #build-info { + margin-left: 100px; + } + .commit-message { + font-size: 1.2em; + margin-bottom: 10px; + } + h2 { color: #246; font-size: 1.8em; @@ -135,8 +157,13 @@ td .label { .ui-sortable-placeholder * { visibility: hidden; } -.ui-plugin { padding-top: 15px; } +.ui-plugin .panel-title { + cursor: move; +} +.panel-body table { + margin-bottom: 0; +} #loading { font-family: Roboto, Arial, Sans-Serif; diff --git a/public/assets/js/build-plugins/phpmd.js b/public/assets/js/build-plugins/phpmd.js new file mode 100644 index 00000000..56e8e995 --- /dev/null +++ b/public/assets/js/build-plugins/phpmd.js @@ -0,0 +1,69 @@ +var phpmdPlugin = PHPCI.UiPlugin.extend({ + id: 'build-phpmd-warnings', + css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', + title: 'PHP Mess Detector', + lastData: null, + displayOnUpdate: false, + + register: function() { + var self = this; + var query = PHPCI.registerQuery('phpmd-data', -1, {key: 'phpmd-data'}) + + $(window).on('phpmd-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function(data) { + if (data.queryData.status > 1) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('' + + '' + + '' + + ' ' + + ' ' + + ' ' + + ' ' + + '' + + '
FileStartEndMessage
'); + }, + + onUpdate: function(e) { + if (this.lastData && this.lastData[0]) { + return; + } + + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#phpmd-data tbody'); + tbody.empty(); + + for (var i in errors) { + var file = errors[i].file; + + if (PHPCI.fileLinkTemplate) { + var fileLink = PHPCI.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line_start); + + file = '' + file + ''; + } + + var row = $('' + + ''+file+'' + + ''+errors[i].line_start+'' + + ''+errors[i].line_end+'' + + ''+errors[i].message+''); + + tbody.append(row); + } + } +}); + +PHPCI.registerPlugin(new phpmdPlugin()); diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index 7cf07458..e4c29791 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -382,7 +382,7 @@ var PHPCIObject = Class.extend({ } $('#plugins').sortable({ - handle: '.title', + handle: '.panel-title', connectWith: '#plugins', update: self.storePluginOrder }); @@ -391,16 +391,13 @@ var PHPCIObject = Class.extend({ }, renderPlugin: function(plugin) { - var output = $('
').addClass('box-content').append(plugin.render()); + var output = $('
').addClass('panel-body').append(plugin.render()); var container = $('
').addClass('ui-plugin ' + plugin.css); var content = $('
').attr('id', plugin.id).append(output); - - if (plugin.box) { - content.addClass('box'); - } + content.addClass('panel'); if (plugin.title) { - content.prepend('

'+plugin.title+'

'); + content.prepend('

'+plugin.title+'

'); } content.append(output); From 77ce6b3c1d6a0e736c2c7a15530224adb4e81fe2 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 11:29:00 +0000 Subject: [PATCH 070/119] Updating phpci.yml to allow the current level of PHPMD errors, but no more than that. --- phpci.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/phpci.yml b/phpci.yml index ec5b056a..7cad819a 100644 --- a/phpci.yml +++ b/phpci.yml @@ -1,18 +1,19 @@ build_settings: - verbose: false - ignore: - - "vendor" - - "Tests" - - "PHPCI/Command" # PHPMD complains about un-used parameters, but they are required. - - "public/install.php" # PHPCS really doesn't like PHP mixed with HTML (and so it shouldn't) + verbose: false + ignore: + - "vendor" + - "Tests" + - "PHPCI/Command" # PHPMD complains about un-used parameters, but they are required. + - "public/install.php" # PHPCS really doesn't like PHP mixed with HTML (and so it shouldn't) test: - php_mess_detector: - php_code_sniffer: - standard: "PSR2" - php_loc: + php_mess_detector: + allowed_warnings: 31 # Set max warnings at the current level - Disallow any further errors creeping in. + php_code_sniffer: + standard: "PSR2" + php_loc: failure: - email: - committer: true - cc: ["php-ci@googlegroups.com"] + email: + committer: true + cc: ["php-ci@googlegroups.com"] From ad4692685488b8de34cbc2b4b68c5ea8af9fba02 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 25 Apr 2014 12:35:36 +0100 Subject: [PATCH 071/119] Updating allowed PHPMD warning limit --- phpci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpci.yml b/phpci.yml index 7cad819a..52330436 100644 --- a/phpci.yml +++ b/phpci.yml @@ -8,7 +8,7 @@ build_settings: test: php_mess_detector: - allowed_warnings: 31 # Set max warnings at the current level - Disallow any further errors creeping in. + allowed_warnings: 35 # Set max warnings at the current level - Disallow any further errors creeping in. php_code_sniffer: standard: "PSR2" php_loc: From a789f7cb266828bb7846d9ed057bc58ace048b1c Mon Sep 17 00:00:00 2001 From: Joseph Pugh Date: Mon, 28 Apr 2014 14:26:37 -0500 Subject: [PATCH 072/119] implement RemoteGitBuild::getFileLinkTemplate required by PHPCI/View/Build/view.phtml --- PHPCI/Model/Build/GitlabBuild.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/PHPCI/Model/Build/GitlabBuild.php b/PHPCI/Model/Build/GitlabBuild.php index 98be17c8..8c1e038b 100644 --- a/PHPCI/Model/Build/GitlabBuild.php +++ b/PHPCI/Model/Build/GitlabBuild.php @@ -38,6 +38,18 @@ class GitlabBuild extends RemoteGitBuild return 'http://' . $domain . '/' . $this->getProject()->getReference() . '/tree/' . $this->getBranch(); } + /** + * Get link to specific file (and line) in a the repo's branch + */ + public function getFileLinkTemplate() + { + return sprintf('http://%s/%s/blob/%s/{FILE}#L{LINE}', + $this->getProject()->getAccessInformation("domain"), + $this->getProject()->getReference(), + $this->getBranch() + ); + } + /** * Get the URL to be used to clone this remote repository. */ From a38adb5d783732d4a9c8ed0e499f93dbf79d4197 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Tue, 29 Apr 2014 23:22:04 +0700 Subject: [PATCH 073/119] Humanised yaml application config --- PHPCI/Command/InstallCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index e6432103..aac34dca 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -195,7 +195,7 @@ class InstallCommand extends Command protected function writeConfigFile(array $config) { $dumper = new \Symfony\Component\Yaml\Dumper(); - $yaml = $dumper->dump($config); + $yaml = $dumper->dump($config, 2); file_put_contents(PHPCI_DIR . 'PHPCI/config.yml', $yaml); } From a474a5d179a1cba16291db1e6819c43e3090248f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:13:07 +0100 Subject: [PATCH 074/119] UI updates --- PHPCI/View/Build/view.phtml | 59 +++-- PHPCI/View/BuildsTable.phtml | 4 +- PHPCI/View/Home/index.phtml | 68 +++--- PHPCI/View/Project/view.phtml | 83 ++++--- PHPCI/View/ProjectForm.phtml | 32 ++- PHPCI/View/SummaryTable.phtml | 2 +- PHPCI/View/User/index.phtml | 18 +- PHPCI/View/layout.phtml | 4 +- public/assets/css/bootstrap-theme.min.css | 7 + public/assets/css/bootstrap.min.css | 14 +- public/assets/css/phpci.css | 200 ++++----------- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ++++++++++++++++++ .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes public/assets/js/bootstrap.min.js | 13 +- public/assets/js/build-plugins/phpcs.js | 72 ++++++ public/assets/js/build-plugins/phpmd.js | 1 + public/assets/js/phpci.js | 12 +- 19 files changed, 537 insertions(+), 281 deletions(-) create mode 100755 public/assets/css/bootstrap-theme.min.css mode change 100644 => 100755 public/assets/css/bootstrap.min.css create mode 100755 public/assets/fonts/glyphicons-halflings-regular.eot create mode 100755 public/assets/fonts/glyphicons-halflings-regular.svg create mode 100755 public/assets/fonts/glyphicons-halflings-regular.ttf create mode 100755 public/assets/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 public/assets/js/bootstrap.min.js create mode 100644 public/assets/js/build-plugins/phpcs.js diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 52d4db80..567df543 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -1,48 +1,47 @@ -
+

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

+
+
+ getCommitMessage()): ?> +
+ getCommitMessage(); ?> +
+ -
- getCommitMessage()): ?> -
- getCommitMessage(); ?> + Branch: getBranch(); ?>
+ Committer: getCommitterEmail(); ?> + + getCommitId() != 'Manual'): ?> +
Commit ID: getCommitId(); ?>
+
- - - Branch: getBranch(); ?>
- Committer: getCommitterEmail(); ?> - - getCommitId() != 'Manual'): ?> -
Commit ID: getCommitId(); ?>
-
- - - -
Options
- - +
+
+

Options

+
+ +
@@ -104,14 +103,14 @@ foreach ($plugins as $plugin) { break; } - $('#title') + $('.build-info-panel') .removeClass('panel-info') .removeClass('panel-warning') .removeClass('panel-success') .removeClass('panel-danger') .addClass('panel-' + statusClass); - $('#title .label') + $('.build-info-panel .label') .removeClass('label-info') .removeClass('label-warning') .removeClass('label-success') diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index 9c1b3aea..da67e087 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -79,9 +79,9 @@ switch($build->getStatus())
- View + View User()->getIsAdmin()): ?> -
    diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index 44c5af1d..d6da55eb 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -1,43 +1,49 @@
    -

    Dashboard

    +

    Dashboard

    + +
    - + +
    +
    +

    Projects

    +
    +
    + + getTitle()); ?> + +
    +
    - -
    Projects
    -
    -
    -

    Project Overview

    - - - - - - - - - - - - - - -
    HealthProjectLast SuccessLast FailureSuccess/Failures
    +
    +

    Project Overview

    + + + + + + + + + + + + + + +
    HealthProjectLast SuccessLast FailureSuccess/Failures
    -
    -

    Last 5 Builds

    +
    +
    +

    Last 5 Builds

    +
    + @@ -46,7 +52,7 @@ - + diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml index 1512071e..c3aa629c 100644 --- a/PHPCI/View/Project/view.phtml +++ b/PHPCI/View/Project/view.phtml @@ -1,26 +1,32 @@ -
    -

    Project: getTitle()) : ' - '; ?>

    -
    + +

    getTitle()); ?>

    +
    - -
    Options
    - +
    + Build Now + + User()->getIsAdmin()): ?> + Edit Project + Delete Project + +
    +
    getType(), array('github', 'gitlab','bitbucket'))): ?> -
    -

    To automatically build this project when new commits are pushed, add the URL below +

    +
    +

    Webhooks

    +
    + +
    + To automatically build this project when new commits are pushed, add the URL below -

    +
    +
    + + getPublicKey()): ?> +
    +

    Public Key

    +
    getPublicKey(); ?>
    +
    +
    +
    +

    Builds

    Commit Branch Status
    @@ -60,25 +76,32 @@
    +
    -
      '; - $pages = ceil($total / 10); - $pages = $pages == 0 ? 1 : $pages; + print '
        '; + $pages = ceil($total / 10); + $pages = $pages == 0 ? 1 : $pages; - print '
      • «
        • '; + if ($page > 1) { + print '
      • « Prev
        • '; + } - for($i = 1; $i <= $pages; $i++) - { - print '
      • ' . $i . '
        • '; - } + for($i = 1; $i <= $pages; $i++) + { + print '
      • ' . $i . '
        • '; + } - print '
      • »
        • '; + if ($page < $pages) { + print '
      • Next »
        • '; + } + + print '
      '; + + ?> - print '
    '; -?>
    diff --git a/PHPCI/View/ProjectForm.phtml b/PHPCI/View/ProjectForm.phtml index 2b6f7d49..7a2b93d2 100644 --- a/PHPCI/View/ProjectForm.phtml +++ b/PHPCI/View/ProjectForm.phtml @@ -4,21 +4,29 @@
    -
    - -

    To make it easier to get started, we've generated a public / private key pair for you to use for this project. To use it, just add the following public key to the "deploy keys" section of your repository settings on Github / Bitbucket.

    +
    +
    + +

    To make it easier to get started, we've generated a public / private key pair for you to use for this project. To use it, just add the following public key to the "deploy keys" section of your repository settings on Github / Bitbucket.

    - - -

    Fill in the form to the right to add your new project.

    - -

    Edit your project details using the form to the right.

    - -
    + + +

    Fill in the form to the right to add your new project.

    + +

    Edit your project details using the form to the right.

    + +
    +
    -
    - +
    +
    +

    Project Details

    +
    + +
    + +
    diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml index 948cff06..a299f0e9 100644 --- a/PHPCI/View/SummaryTable.phtml +++ b/PHPCI/View/SummaryTable.phtml @@ -92,6 +92,6 @@ foreach($projects as $project): } ?> - build now » + build now » diff --git a/PHPCI/View/User/index.phtml b/PHPCI/View/User/index.phtml index d39303be..ecebe7f1 100644 --- a/PHPCI/View/User/index.phtml +++ b/PHPCI/View/User/index.phtml @@ -4,13 +4,17 @@
    - +
    +
    +

    Options

    +
    + +
    + User()->getIsAdmin()): ?> + Add User + +
    +
    diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 73c97d75..58b78cc2 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -35,8 +35,8 @@ -
    -
      +
      +

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

      • Log out
        • User()->getIsAdmin()): ?> diff --git a/public/assets/css/bootstrap-theme.min.css b/public/assets/css/bootstrap-theme.min.css new file mode 100755 index 00000000..8dee0720 --- /dev/null +++ b/public/assets/css/bootstrap-theme.min.css @@ -0,0 +1,7 @@ +/*! + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:linear-gradient(to bottom, #fff 0, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top, #428bca 0, #2d6ca2 100%);background-image:linear-gradient(to bottom, #428bca 0, #2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f3f3f3 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #222 0, #282828 100%);background-image:linear-gradient(to bottom, #222 0, #282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #428bca 0, #3071a9 100%);background-image:linear-gradient(to bottom, #428bca 0, #3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top, #428bca 0, #3278b3 100%);background-image:linear-gradient(to bottom, #428bca 0, #3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)} \ No newline at end of file diff --git a/public/assets/css/bootstrap.min.css b/public/assets/css/bootstrap.min.css old mode 100644 new mode 100755 index e3cf0d55..85b03e0f --- a/public/assets/css/bootstrap.min.css +++ b/public/assets/css/bootstrap.min.css @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.0 - * - * Copyright 2013 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:inline-block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-circle{border-radius:500px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h4,h5,h6{margin-top:10px;margin-bottom:10px}h1,.h1{font-size:38px}h2,.h2{font-size:32px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}h1 small,.h1 small{font-size:24px}h2 small,.h2 small{font-size:18px}h3 small,.h3 small,h4 small,.h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}@media(min-width:768px){.row{margin-right:-15px;margin-left:-15px}}.row .row{margin-right:-15px;margin-left:-15px}.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12{float:left}.col-1{width:8.333333333333332%}.col-2{width:16.666666666666664%}.col-3{width:25%}.col-4{width:33.33333333333333%}.col-5{width:41.66666666666667%}.col-6{width:50%}.col-7{width:58.333333333333336%}.col-8{width:66.66666666666666%}.col-9{width:75%}.col-10{width:83.33333333333334%}.col-11{width:91.66666666666666%}.col-12{width:100%}@media(min-width:768px){.container{max-width:728px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-push-1{left:8.333333333333332%}.col-push-2{left:16.666666666666664%}.col-push-3{left:25%}.col-push-4{left:33.33333333333333%}.col-push-5{left:41.66666666666667%}.col-push-6{left:50%}.col-push-7{left:58.333333333333336%}.col-push-8{left:66.66666666666666%}.col-push-9{left:75%}.col-push-10{left:83.33333333333334%}.col-push-11{left:91.66666666666666%}.col-pull-1{right:8.333333333333332%}.col-pull-2{right:16.666666666666664%}.col-pull-3{right:25%}.col-pull-4{right:33.33333333333333%}.col-pull-5{right:41.66666666666667%}.col-pull-6{right:50%}.col-pull-7{right:58.333333333333336%}.col-pull-8{right:66.66666666666666%}.col-pull-9{right:75%}.col-pull-10{right:83.33333333333334%}.col-pull-11{right:91.66666666666666%}}@media(min-width:992px){.container{max-width:940px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-offset-1{margin-left:8.333333333333332%}.col-offset-2{margin-left:16.666666666666664%}.col-offset-3{margin-left:25%}.col-offset-4{margin-left:33.33333333333333%}.col-offset-5{margin-left:41.66666666666667%}.col-offset-6{margin-left:50%}.col-offset-7{margin-left:58.333333333333336%}.col-offset-8{margin-left:66.66666666666666%}.col-offset-9{margin-left:75%}.col-offset-10{margin-left:83.33333333333334%}.col-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class^="col-"]{display:table-column;float:none}table td[class^="col-"],table th[class^="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td{background-color:#d0e9c6;border-color:#c9e2b3}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td{background-color:#ebcccc;border-color:#e6c1c7}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td{background-color:#faf2cc;border-color:#f8e5be}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:38px;padding:8px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:rgba(82,168,236,0.8);outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}.form-control.input-large{height:56px;padding:14px 16px;font-size:18px;border-radius:6px}.form-control.input-small{height:30px;padding:5px 10px;font-size:12px;border-radius:3px}select.input-large{height:56px;line-height:56px}select.input-small{height:30px;line-height:30px}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{padding-right:32px;border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{padding-right:32px;border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{padding-right:32px;border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}.input-group{display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:8px 12px;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-group-addon.input-small{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-large{padding:14px 16px;font-size:18px;border-radius:6px}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.form-inline .form-control,.form-inline .radio,.form-inline .checkbox{display:inline-block}.form-inline .radio,.form-inline .checkbox{margin-top:0;margin-bottom:0}.form-horizontal .control-label{padding-top:6px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}}.form-horizontal .form-group .row{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:8px 12px;margin-bottom:0;font-size:14px;font-weight:500;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#fff;text-decoration:none}.btn:active,.btn.active{outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:default;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#fff;background-color:#474949;border-color:#474949}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active{background-color:#3a3c3c;border-color:#2e2f2f}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#474949;border-color:#474949}.btn-primary{color:#fff;background-color:#428bca;border-color:#428bca}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active{background-color:#357ebd;border-color:#3071a9}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#428bca}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#f0ad4e}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active{background-color:#eea236;border-color:#ec971f}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#f0ad4e}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d9534f}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active{background-color:#d43f3a;border-color:#c9302c}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d9534f}.btn-success{color:#fff;background-color:#5cb85c;border-color:#5cb85c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active{background-color:#4cae4c;border-color:#449d44}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#5cb85c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#5bc0de}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active{background-color:#46b8da;border-color:#31b0d5}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#5bc0de}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#333;text-decoration:none}.btn-large{padding:14px 16px;font-size:18px;border-radius:6px}.btn-small{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.list-group{padding-left:0;margin-bottom:20px;background-color:#fff}.list-group-item{position:relative;display:block;padding:10px 30px 10px 15px;margin-bottom:-1px;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right;margin-right:-15px}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item .list-group-item-text{color:#555}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text{color:#e1edf7}.panel{padding:15px;margin-bottom:20px;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-heading{padding:10px 15px;margin:-15px -15px 15px;background-color:#f5f5f5;border-bottom:1px solid #ddd;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:17.5px;font-weight:500}.panel-footer{padding:10px 15px;margin:15px -15px -15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-primary{border-color:#428bca}.panel-primary .panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success .panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning .panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger .panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info .panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.list-group-flush{margin:15px -15px -15px}.list-group-flush .list-group-item{border-width:1px 0}.list-group-flush .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.list-group-flush .list-group-item:last-child{border-bottom:0}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;border-radius:6px}.well-small{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav>li+.nav-header{margin-top:9px}.nav.open>a,.nav.open>a:hover,.nav.open>a:focus{color:#fff;background-color:#428bca;border-color:#428bca}.nav.open>a .caret,.nav.open>a:hover .caret,.nav.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.nav>.pull-right{float:right}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{display:table-cell;float:none;width:1%}.nav-tabs.nav-justified>li>a{text-align:center}.nav-tabs.nav-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs.nav-justified>.active>a{border-bottom-color:#fff}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li>a{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{display:table-cell;float:none;width:1%}.nav-justified>li>a{text-align:center}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs-justified>.active>a{border-bottom-color:#fff}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;padding-right:15px;padding-left:15px;margin-bottom:20px;background-color:#eee;border-radius:4px}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar-nav{margin-top:10px;margin-bottom:15px}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px;line-height:20px;color:#777;border-radius:4px}.navbar-nav>li>a:hover,.navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-nav>.active>a,.navbar-nav>.active>a:hover,.navbar-nav>.active>a:focus{color:#555;background-color:#d5d5d5}.navbar-nav>.disabled>a,.navbar-nav>.disabled>a:hover,.navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-nav.pull-right{width:100%}.navbar-static-top{border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;border-radius:0}.navbar-fixed-top{top:0}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{display:block;max-width:200px;padding:15px 15px;margin-right:auto;margin-left:auto;font-size:18px;font-weight:500;line-height:20px;color:#777;text-align:center}.navbar-brand:hover,.navbar-brand:focus{color:#5e5e5e;text-decoration:none;background-color:transparent}.navbar-toggle{position:absolute;top:9px;right:10px;width:48px;height:32px;padding:8px 12px;background-color:transparent;border:1px solid #ddd;border-radius:4px}.navbar-toggle:hover,.navbar-toggle:focus{background-color:#ddd}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;background-color:#ccc;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}.navbar-form{margin-top:6px;margin-bottom:6px}.navbar-form .form-control,.navbar-form .radio,.navbar-form .checkbox{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{margin-top:0;margin-bottom:0}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav>.dropdown>a:hover .caret,.navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-nav>.open>a,.navbar-nav>.open>a:hover,.navbar-nav>.open>a:focus{color:#555;background-color:#d5d5d5}.navbar-nav>.open>a .caret,.navbar-nav>.open>a:hover .caret,.navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-inverse{background-color:#222}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media screen and (min-width:768px){.navbar-brand{float:left;margin-right:5px;margin-left:-15px}.navbar-nav{float:left;margin-top:0;margin-bottom:0}.navbar-nav>li{float:left}.navbar-nav>li>a{border-radius:0}.navbar-nav.pull-right{float:right;width:auto}.navbar-toggle{position:relative;top:auto;left:auto;display:none}.nav-collapse.collapse{display:block!important;height:auto!important;overflow:visible!important}}.navbar-btn{margin-top:6px}.navbar-text{margin-top:15px;margin-bottom:15px}.navbar-link{color:#777}.navbar-link:hover{color:#333}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.btn .caret{border-top-color:#fff}.dropup .btn .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:active,.btn-group-vertical>.btn:active{z-index:2}.btn-group .btn+.btn{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-large+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-large .caret{border-width:5px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-group-vertical>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn+.btn{margin-top:-1px}.btn-group-vertical .btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical .btn:first-child{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical .btn:last-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%}.btn-group-justified .btn{display:table-cell;float:none;width:1%}.btn-group[data-toggle="buttons"]>.btn>input[type="radio"],.btn-group[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{float:left;padding:4px 12px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination>li:first-child>a,.pagination>li:first-child>span{border-left-width:1px;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>a:focus,.pagination>.active>a,.pagination>.active>span{background-color:#f5f5f5}.pagination>.active>a,.pagination>.active>span{color:#999;cursor:default}.pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff}.pagination-large>li>a,.pagination-large>li>span{padding:14px 16px;font-size:18px}.pagination-large>li:first-child>a,.pagination-large>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-large>li:last-child>a,.pagination-large>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-small>li>a,.pagination-small>li>span{padding:5px 10px;font-size:12px}.pagination-small>li:first-child>a,.pagination-small>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-small>li:last-child>a,.pagination-small>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.fade.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;top:0;right:0;left:0;z-index:1050;width:auto;padding:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.fade.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:560px;padding-top:30px;padding-bottom:30px;margin-left:-280px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:1;filter:alpha(opacity=100)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:rgba(0,0,0,0.9);border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:rgba(0,0,0,0.9);border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:rgba(0,0,0,0.9);border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:rgba(0,0,0,0.9);border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:rgba(0,0,0,0.9);border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:rgba(0,0,0,0.9);border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:rgba(0,0,0,0.9);border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:rgba(0,0,0,0.9);border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:rgba(0,0,0,0.9);border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;-webkit-bg-clip:padding-box;-moz-bg-clip:padding}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.alert{padding:10px 35px 10px 15px;margin-bottom:20px;color:#c09853;background-color:#fcf8e3;border:1px solid #fbeed5;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert hr{border-top-color:#f8e5be}.alert .alert-link{font-weight:500;color:#a47e3c}.alert .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-block{padding-top:15px;padding-bottom:15px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.thumbnail,.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail{display:block}.thumbnail>img,.img-thumbnail{display:inline-block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.label{display:inline;padding:.25em .6em;font-size:75%;font-weight:500;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#999;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer;background-color:#808080}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-color:#428bca;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-color:#d9534f;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-color:#5cb85c;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-color:#f0ad4e;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px;cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:inline-block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-color:rgba(0,0,0,0.0001);background-color:transparent;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-color:rgba(0,0,0,0.5);background-color:transparent;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .glyphicon,.carousel-control .icon-prev,.carousel-control .icon-next{position:absolute;top:50%;left:50%;z-index:5;display:inline-block;width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:120px;padding-left:0;margin-left:-60px;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}@media screen and (min-width:768px){.jumbotron{padding:50px 60px;border-radius:6px}.jumbotron h1{font-size:63px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.pull-right{float:right}.pull-left{float:left}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.affix{position:fixed}@-ms-viewport{width:device-width}@media screen and (max-width:400px){@-ms-viewport{width:320px}}.hidden{display:none!important;visibility:hidden!important}.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}.visible-md{display:none!important}tr.visible-md{display:none!important}th.visible-md,td.visible-md{display:none!important}.visible-lg{display:none!important}tr.visible-lg{display:none!important}th.visible-lg,td.visible-lg{display:none!important}.hidden-sm{display:none!important}tr.hidden-sm{display:none!important}th.hidden-sm,td.hidden-sm{display:none!important}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(min-width:768px) and (max-width:991px){.visible-sm{display:none!important}tr.visible-sm{display:none!important}th.visible-sm,td.visible-sm{display:none!important}.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}.visible-lg{display:none!important}tr.visible-lg{display:none!important}th.visible-lg,td.visible-lg{display:none!important}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}.hidden-md{display:none!important}tr.hidden-md{display:none!important}th.hidden-md,td.hidden-md{display:none!important}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}}@media(min-width:992px){.visible-sm{display:none!important}tr.visible-sm{display:none!important}th.visible-sm,td.visible-sm{display:none!important}.visible-md{display:none!important}tr.visible-md{display:none!important}th.visible-md,td.visible-md{display:none!important}.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}.hidden-lg{display:none!important}tr.hidden-lg{display:none!important}th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print{display:none!important}tr.visible-print{display:none!important}th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print{display:none!important}tr.hidden-print{display:none!important}th.hidden-print,td.hidden-print{display:none!important}} \ No newline at end of file + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}input[type="date"]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:none}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-transform:translate(0, -25%);transform:translate(0, -25%);-webkit-transition:-webkit-transform 0.3s ease-out;-moz-transition:-moz-transform 0.3s ease-out;-o-transition:-o-transform 0.3s ease-out;transition:transform 0.3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}@media print{.hidden-print{display:none !important}} \ No newline at end of file diff --git a/public/assets/css/phpci.css b/public/assets/css/phpci.css index 6b09a8e7..7093c2aa 100644 --- a/public/assets/css/phpci.css +++ b/public/assets/css/phpci.css @@ -1,179 +1,83 @@ -body -{ +body { background: #f9f9f9; - font-family: Roboto, Arial, Sans-Serif; - font-style: normal; - font-weight: 300; - padding-top: 70px; + font-family: Arial, Sans-Serif; + font-style: normal; + font-weight: 300; + padding-top: 70px; } - strong, th, .control-label { - font-weight: 500; +.navbar { + background-color: #eee; +} + + .navbar-brand { + padding: 10px 15px; } - .btn, .dropdown-menu>li>a, .controls, .controls input, .controls label { - font-weight: 300; - } - -#content -{ - -border: 10px solid #369; - padding: 10px; -} - -td .label { - margin-right: 5px; - line-height: 2; -} -#project-overview td .label { - margin-right: 0; -} - -.success-message { - background-color: #4F8A10; -} - -.error-message { - background-color: #FF4747; -} - #latest-builds td, #project-overview td, #users td { vertical-align: middle; } -.widget-title, .modal-header, .table th, div.dataTables_wrapper .ui-widget-header, .ui-dialog .ui-dialog-titlebar { - background-color: #efefef; - background-image: -webkit-gradient(linear, 0 0%, 0 100%, from(#fdfdfd), to(#eaeaea)); - background-image: -webkit-linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); +.table th { + background-color: #efefef; + background-image: -webkit-gradient(linear, 0 0%, 0 100%, from(#fdfdfd), to(#eaeaea)); + background-image: -webkit-linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); background-image: -moz-linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); background-image: -ms-linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); background-image: -o-linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); background-image: -linear-gradient(top, #fdfdfd 0%, #eaeaea 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fdfdfd', endColorstr='#eaeaea',GradientType=0 ); /* IE6-9 */ border-bottom: 1px solid #CDCDCD; } -#title -{ + +h1 { + border-bottom: 1px solid #ddd; + font-size: 2em; + padding: 10px 0; } - #title img { + h1 i { + font-size: 23px; + margin-right: 10px; + } + + +.build-info-panel { + +} + + .build-info-panel h1.panel-title { + border: 0; + font-size: 2em; + font-weight: bold; + padding: 0; + } + + .build-info-panel h1.panel-title span { + font-weight: normal; + } + + .build-info-panel img { border: 1px solid #fff; border-radius: 50%; box-shadow: 2px 2px 2px rgba(0,0,0,0.1); - margin-bottom: 15px; - margin-right: 15px; + margin: 7px 15px 15px 7px; } - #title h1 - { - font-size: 2em; - margin: 0; - padding: 0; - } - - #title h1 span { - font-weight: lighter; - margin-left: 15px; - } - - #title h1 label { - margin-top: -6px; - } - - #build-info { - margin-left: 100px; + .build-info-panel #build-info { + margin-left: 90px; } - .commit-message { - font-size: 1.2em; - margin-bottom: 10px; - } - - h2 { - color: #246; - font-size: 1.8em; - } - -.icon-build-ok -{ - background: url('../img/icon-build-ok.png') no-repeat top left; -} - -.icon-build-failed -{ - background: url('../img/icon-build-failed.png') no-repeat top left; -} - -.icon-build-pending -{ - background: url('../img/icon-build-pending.png') no-repeat top left; -} - -.icon-build-running -{ - background: url('../img/icon-build-running.png') no-repeat top left; -} - -.navbar-brand { - padding: 10px 15px; -} - -.box { - background: #fff; - box-shadow: 0 0 5px rgba(0,0,0,0.1); - margin-bottom: 15px; - padding: 10px; -} - .box .title { - border-bottom: 1px solid #eee; - cursor: move; - font-size: 1.2em; - margin: 0; - margin-bottom: 20px; - padding: 8px 0; - } - - .box .box-content { - } - - .box .box-content table, .box .box-content pre { - margin-bottom: 0; - } - - .box .box-content pre { - background: #fff; - border: 0; - } - -.ui-sortable-placeholder { - border: 1px dashed #ccc; - background: #ffe; - height: 100px; - margin-bottom: 15px; - visibility: visible !important; -} - -.ui-sortable-placeholder * { visibility: hidden; } - -.ui-plugin .panel-title { - cursor: move; -} - -.panel-body table { - margin-bottom: 0; -} #loading { - font-family: Roboto, Arial, Sans-Serif; - - background: #369; + background: #246; + bottom: 25px; color: #fff; display: none; - position: fixed; - bottom: 20px; - font-size: 2em; - right: 20px; - padding: 15px 50px; + font-size: 1.5em; + padding: 20px 40px; + position: absolute; + right: 25px; + width: 200px; } \ No newline at end of file diff --git a/public/assets/fonts/glyphicons-halflings-regular.eot b/public/assets/fonts/glyphicons-halflings-regular.eot new file mode 100755 index 0000000000000000000000000000000000000000..4a4ca865d67e86f961bc6e2ef00bffa4e34bb9ed GIT binary patch literal 20335 zcma%iRa9Lu*X_aGIXLtH2X}XOcXxM};>BGK?k>gMi@Uo+afec%&=$Y_zI(@iAMVRd zMzYtMnVHGh`(bBgBrYld0G2WU0R1n+0{)ZW{#ye8Pyh%N;2)-_`hS4`dHjR_o8s?3 z%Kr!aAA=Sk15gC$0aO9906BmJKn0)-&;Wq`d1e4dfc3v(2XF@106hNnKnJJ;tp3?v z|4=i4`#;17p#2YV|JP~t*4IuDO^FK=e+xx$$?LVd`z~aAr@Bit+ z4B+|46aYB=Q+D{L`5%t;Kdt|aZw_GpXL0?v@B%pgd3^uI=KcSkIq3hHHvk~6A@l#d zDHwovCxFWvz!d;sGQ^&}h@CLq(3!MVaFhSyL!rg*&d8F%X_&hML`QYBTiRZ}i=N8C zfX|m2SCm$2B^?XKJ=3POS}r1sVM9Nj*l5q`5#S% zQ}FD^zy1Pj*xUGOm4;*C;l80oktO?~%SdX8H^8@@idBFWyOINSr_!xo{REWRlXgw| z3-(h5XcHaEdPKzyy2-P+Rljn4lR?IelEOtWLiC?_9FW&x@kpuRtfsn*-QLS4EoN{{q0u8pt_^hD_!V);D{hen z-XpV~5QeQTYTIl1+B^5r72`!7FRQQ$Jh74=Gm*OkaIoNUC7!wk7rRZVuVK6urnp@}QDpB~9*S zkVWg8LyXz8-%53>GXb$%*H0(bqkUIN`Oz8g=bse?bAumC8`5XqA+(_y{fV^j(1$BZ za*@mJ(&?Dl2k;8tW}O6OaavJE|17u#1t>M^0!@SDJc2)cLZL`m7!-)74CQUXoksM* z9m|Sjh}@dm-Tnc8<77&TfjT6H{3)kXMM774`D!eA0|(RuQz@iQO(4-7lX|aK*M`Y=f%R{_&<*A? zB(AZUl6JXgz^9c9q7ZW~Lpncpv1I^6O4mGX@3P^Q)?jBgx(f#RD_4y0q5aC_beGG> zn%RbEy_vdx`sL?|Jvlgyxal-}XM^FDQYp|Euiu=%8o(=wic+XSimJ4(Adn3`QH6^D zQ}H@oBN{|Zg^2u|@8c~h7Kv&HCx??xy^J$3{B0{XnlrThDaoQqjXjXHi#b!KIjA7( z$hT;Ah_VP&j)(Z6&(xn;KF3rHsF^A#il?$)q4Pp#sly?|%OmoRG|MiNW3+)?3Wd9= zgbUjzTLX+!G&oYj9P;jnHmT91qKPzxkj@>rsqi|=M5$PfrRCY%E7${xLDZFtYcC%k zorpLj$T65dN+HV@=yRlKSS8W~SMxFkK1~U-XW2@DXcG`4-V)z|605uD4Q{MP10fD5 zc!T#)n57))zXXfg=dwnZuD_`DCJc3cHE6HuA(>36o_neqgoF0pRK0eEc~{rD8%Pfh z@dtE6ovkazKj3fd{)*&tB0YA^1d^^?2oeNyB7u(P+O4$@lCNc~%mb5iP)dLGM|z;x zEkRYM_^U`g%s5jiH=8Q2h zlS%BdC6DaYEWi0UNhnc*zFT$fV`4_VMNU~nH;q(Ld?!#lIvm)K;W_4C(l3+4TZ=QI zD%siB%cY+Y7vMFM_KAg?sxm(^nJsMIV?v|vAS8l;zotv$#Ml-Y!n7|X5Y5C)=TiGZ zQ+=(9%lk0&L&hDtwRD=Ua6wQeS{g2mvwc>^|4$ot-2Hi`z)|V$N{mNAEZC3gw_8%z zq(L3Bcwr2gin62dXM8cG-D-auD7HayLz zJI2|m=8$F?Ko>v@P4{(W5g=}-b$%tJgfywp`6&A96|Zx{9N;1@_>hto7TQf3EIMm+ zJ`;@@4ycXnHM>|iJ?FXkWGc8YuGviO&L*^ajd+vyLIxAAT{isADQQM5S;YP+jAYp7 z3E1Nm1HDd%SXi``NR*so7XidvRPj#BM7A`S{cU%VISQOhrMLr08;N36AYg9}40Ml# zU)GUxQy(D1%P`@`HDaXn&%m8`hOu~_2a`%P{v7w2;KUNhll)N(y4wD#p#{+($uLOB z!X;K=sci1erRm1=Qcx#ja(r=E8*89RNH8`C7T4|#uVRc=Kaf}0Xw)>8g0(4H!ZrK^ zh-Kf(V#NQcMU79on9bk?`U7eI{Nu-CdboLYH-7lJI|7VCob2872$p->3n)-J>N|b% zIn3vzKet~nvHB=bP6rDRV|&&4LL}S7`iu2ok&r8ecw~yUROul?44VSV3;z7qSQWl+y^cX=$j~OQ;o~0+_)5WDRF0^JbuD_umr4Mn$EPEyB-_eog^1*P#Ui}dCDH6-GndXgi$XV2SNHe#HHQoU z`2f{kT*~Y-Gtyd}I#v=*PbShJzp4hgaK>cr++;2GSGr7^2gA_3H1F;=06B{L4@fTs zD?F!vb_51Hnzb3BJlYiI4qZ5fDt|CaKX-N&2aP_DVX`bH*FN93cV*3fPvociz|dFF zDI@_;;4`*j9yW7pmnXjEwqe@BEQw*5Kcl$=zJxCo$}$5>0aU8*UXir zlo6vuHSn81M=rz-M|tYukSa7I2M$#Q-7`8&2-+UvW25@8gOf1VSR}3RdVFr|-&}4T zky0u`XuQc%0#b=LJWu5hm&cbB$Zk2FeYD~v-Cc92u|%sIUh-65dJR zZ3)g?oGWe-H6(Dl5E)k2)Hal?$9R73FM9`l`qB^<^f4kuce&|T)yCo{^=_a`TY*c$ zRRh_284jJjLoW$Wjv_@n$8LbXuW0pZw;g`-3$XUHD0Me!pbdD8z$3+L^KKYOabFdl zZW8&J8yRWfjLh?e7QJEkgl<&QwDnZ2^WwgBH0{AjxI^@Q)51nlGRVgj8j^jL0%{L5 zg~N&QybX0(ldaaot?}x4%vuVeTbZ96fpg*k(_p?a+IFGn!YUuS;~_Z0CLyGFeQ=ow zhS}^5R4dLfu9Q@MFw7c5_Tg`%mq$XF81YXSFD~rt=E6o|lVBQmHpMG(*<)M(E(4f* zifS(;Yjenr?~y*l>F20zQ%mciliU45f-wznJZdw(tS7t6>004*2#X3Ej3pco3fi`a z?|gM_ckVQxZ*D!nTeU+|gbdPEj(!rKUXu)| zkLqUGanZqn25Ek?PHa9%4W|%Ad_2AJ^C4ZsK(9AW?d?fe_y54j#ceCX7%ZMmS`{x=_0fcCjb0L>U_D>5f4kNy zHQQg5@4aYV)6gpTnv`z06M5a}w7=9Zxp`bcn&i(EOAPWj!?Z(2O?^DESnGfRDGcs1 z?IvJ*{LKonl7#robcFc@OJ<~_Nrt1&v@ePe#wEFKMxfTA!AwJm2~n9HG8Q3?YR-Yz z9Qm3kx|c48;)6Kyoo?<`!|@@xwp~u#ofuQm>ip4bLvO_8W)9{2phqI7{WR9NLgJ5S zHO8hXtJ(CY)mUG&o(gGo!3Qk!=#XUS13O&o{vweBJ4o1y<~#&5^$s69ECV9xM}=+2 z3!NJW8%Q`f_Ja)nexErX5!VB@V=TLVghSEjRt5vdJ8zuRg0R+Y>(Wb*7ED)es#R7< zyyj>az=m}1XQ+E7Z@KG=Cs|{!+EejQ_B-7_Z_Y;kETxVVJOayFzr&scDu#RzsdT7?ZD( zjt$GiPqMQDN##jNA(UuHMgjopqE;pkUTep+3YhG2G!BnK?~X#v(Hh{G+w3pu5aBF+5$)Hq);#9CbG zsE7UhKwvg;w*V(0K7kvgnm5CXt2oMK#y!&dqW6^CO`o-9h;rpe8sX@M7vdNHrSI)y z9KlvS+@+-`CzlS3h}P)VbJn)MN&1rZJDgsR=F2FHZMpd&S1VRKi;7W;=|X`v`iwr; z6={w%x(Bj(^(a<%?7PB*S%}>sft}U!!qdscsQgT@3X5WihmLBxuS7?1$@SvvJ3<<| zt}Y%yqH_W&6!_(na-jr#Zv7W*Cu#c6Hqr$o{eMTHmIWfcuI+rsXc1x$ibc)|lxs`| z^lhQp&^b^BTL(xEI!6k8bxom-D8C}+6_a%`?CYjSuFcEh5J1&Y`Z-6Dj-I`%()n$9 zg*b<&Zs^xdC{p2ab~}fxiuobr7XT7pIefDq+B0S-e*#Ncv}xLJi{{yPWu)?Esyu0; z1qsK_FAEg-C+$p0cp*xgs1s4btkM&3lqqeQRpD2eomd(OP0Q@*e&Xas38amh5^boC zOw$(pnvN$4MdoQ_u*a%EGU#34!L8h;hCq2qu>vma`dr@6OJ$uR*Uy0|v+9(q#{vUE z-6#WJn9K=D1b|=3z9t2tlyis<332BeH7r+zY@~b=^WA5yuvSMiyU=H97SQ7PJ=xDq8^5h@!5s)7NwIC(^9c}UqFKh>XnFPu|+L@P;S z3sSA!`G>+GcF}A^nfl|n_2P=oi#0>A$BphJo^niV$39q>jBn7=yG3jodFC|0-)C$R z@AvsPawzRcdI+N@#+XCUhE-bV6R(fb0#L8<{kZo-bBF0d_eb2=Oq%CRy|M%BGBmTi z*(vF=mDqfB)Ffbr1WObL5rtaXXn7h$vMIMyd!!E!)5Fe{yHa{ZKHpGwQ9J-@cQ$OX z8Bux&6WJ%|zF+jJZ&(g-&u~QV-Y_~q?DJ>#3~9WiBeIU_uh)eb{b{VUn_K9kFfYXL z#W?5L8z;XrA?Kc&ua35Hi_uhWghl9)h*)J}%wG+Xnnp2ZOl*YtK3VQxUMfBM+z>E2 zeI`!tBDijjXYxlLEZu7t_T<~!mR0{o>6W*Ejr z6v8z^G$W!dDq*^y$WbyhI)x}-s>tdk0{-;A z91U?k6Rg*%T*U)Uv_PP_}4jhJ6|~ z)$B}m4(d`YtCBcrVbz?cQGo|NhMK(@OnGsU7OAKgUBJLh?E@OO@sfUG8M``oQbcDgDKEy^t6!AhE@HqgSG<3Q{ND7tH!G1 zQFCZgl=Ykxr~0pdq)`n2y3~Y0cvkO5i!CLTAc68-9cOMi2c29BTcg!W5=XzHR68tT zH%o4w$B?>YF0Aq0w*Q@DIf|UyjajcxO2`!Av{p;s2#z_Xfp*{$2fM>65~br|rCyhX zcrN@r4!w~3imlj-eew7qq8d&vtYnSAT9&|&Y&=~}zF5=-5at@Gr1s6~`eBk{nJh+@ z#(=xEI>c6xXU(ucS*a_!ww@WYvo?~@3dBjqAUH~h9mW5q!R#);8l%8+oJnb+-ydqv)LHQJSgY=p%{@~Fk(V6=o{<5fV>)fPWOyXSo|G?G=*~> z?z><)(Ss@lE|vU-2vhORxCM>@LEx4O{!kmzI5 zFUOuOX^BHASj%#FATqS(FnqPTp^|Sq;eg3wKvIzUJ%FNpoCY`^OPv(^>&j{V#RFzE z@3Y)bA(4m_iaS`J&gG(v^)Jth;W$iESCeCBA1#B(N63V{dggoJ%RQn}c>a@^%gazJ zI$Shg5yVpcpnJOOWY^dBUI=3iC>#a1p2NQs|b zgZHukR9HwV8Sgp{#+jN7ZB3DI6~hIHv@&% z=$?K2gzM;xC?K<9N0|-BMSk4bLI)uB*!ugfY0qP3R%y5O?&{Xfzojfbw?zj^P+_;e zRVm>&GsN)=HBH+0BHxJo&ckuL8w0=_w~q6R{ghxeMmsDh;9@n%VFE`Zx%pQglC=A4 zmJFxIgNwqP)8^b#RwBGP+eI;wi}{^pYMTtQ4h21k5DL#G?TZ4VCjrqHlXx z5GWyy1)M+9Im*H1Nb!*p1miCdMHEs>^!0KnPX60;FztLJwN}7vh;E>|7i^aSKwZPp zbmc@;Z{n(|)caxrl1Z94YDTS$mif`TC>B#m4S#$l?uReS>1@v!TRjv$vg^osFiop z3Ec1yBx|_DM8|$B+gdt2+Wo8>VSiOZMk{KxbsETEqXrMe43bz3J;k2|bk1|VfW}}N ziBRxsE0VSSOf}i%^gY0FFMldwBHt78EjW?Hs`TiH)s0WX#E(VMU>!x(pRNEl0?(%d z(09!|c3J9g+xi&)MKNr%Lz~VacC(%gKWoY@ID6_>a>(E=mVmuqrKtH5d$d}xX&NeD z5RiuBXo9`O{xL>+V-49mRc(3kT+>qNP814Xc&F=6k?M%@t6NOb@@_X`d3htI>|zGN z&z3d$7^TV;cV+eyHCzB+pyNz1atbYX3gZfiSjHB<0Ehv&M)7xxzlJu32@Iosx5?qd z-7Ka#WS9+1pr}6b%d2z-ZT+Fzpf`63fy)jTb-|y39hX-WFKTi7kn^+4(;QJI%l!pK ze2L!7r+ad0PfD2bsar6XgD>XWJxwwoHCORf9r0VEIM_qM zCzw=0@8aB8TV{tjzE5zvR&0MR>so`xq~rHSLBuI)mS!Dh1{CI~)~Nb^?^R@Gb*0A1 z=&MnM%PG*qmrKBjp8ZIYS@DFDNwe5Ww=2e65vs{7e0?Ou*xB{?A9P$i{y zM|4xJ3)%!G%8d{u-AC5&>)0?3EeMgln4Yut1`I~s-Cl*~G*Ri1k>5}JY295;&pq@- z#Lm^4Hp$Vz)X?2y^sW@;*ClyG-%gBU|LBB2+bG$zX%YcrI$cSa$$Sdz2EBDDiX$!I z{_-)%I3e)hC3KOBqNUpTOsPtReVV3GD|?sDzlEY;lsV>UYEWf_58h)t*RN0JkrGu0p9p8L{s_RPwvTR zXR9)eJN*RNMO^RZbZOXGNdieWgVSs&xvqTIv}1x>vCDtEk6_WWAVXu?Nu7sREv!;U zh%KMgdA}u72`Xz6{1nx8ud@3we5$9_>x#f2Ci}@h{1$Fh&}3CiF{d z+}gjEHbU-5+06vi&lbqcVU4dKyM_2lgko*2LU$@58M9ER0>@8%8{Q`H zM^pmfKp*!)YkLi|P(GT%H`-^=EmrEUhQ4I?ux{(gb8Cfs3Y;=$r!4-O%2yn10(6sR zU6xmo^&_$SnfCEbTemLPST3#%z3J!5Y}po{ihZicg?6_ADfUcz?o1} zmJxCzhnNT~o!=vhmRTEXGQ4OT$Zvhr5{5Midj2y-p}oGVqRFwQiNxp#2-*sjF6fsF zV6XhhsSL>wR!QmL`QcBPeEpof>)1LNkZE`AL+G5)@6qC>qR! z8+){akxki?kaFfX6i}pXp_`Xlck94~S-?9*q=QqL2z=I4B@Zvi@4?yJho3QIdNI8l z#4QKGd<)2;6Vy;X#e*x_gP*hHWyFFgqukOJH7ndQUKry!7s+}S>|FP?VT3DlK1qQQ zk=oA%rP%@u3Q)BH2;)Li&oL3#M*r$!{Ih zASM=(#VCobo1BhR#*@dO*~PX)#gN9<0l;rNRKG4|p!^Nocw@Iy>-~ZJ?0T#CqSxD+ zevj?m@H}89TT2L<6HsC#BB(?}DykVK9k*1%F~}N9y4KadeB)RvJq;@3pmQntjRuyp zd+bH2w#~~?gnNl>cBMwx5@vUCsl~4k*^~r4aR!EORAjW02r1eGW<}-vIl3BCwVUEw zh(xbpj>h?!;M4gDxV}8^il-Ur;r34S_`LeD#vXa-JKk@`B;%!=m}ILfo6GCRP-vnwGMvS1TCwL(fwPc-To}O1cyV3K?4x z{_{-2*jZ}zOd{hm(Z%1afi9LPcXUtDSf?C9Eh3I80lt-6uc=&~q`FuW) zKHDvFXfegSj8LcxD#zUuFPYuggI{ZvI5 zj|TJPpX&$cTSpufZ23uYl>m#4Uva-%N<10wTI1Mav~)-=p+fo(j6RRxz{*!Z9U-)C z9>Fg)gf&-?LrVVy@(_wx>%nb~#fWvMjZ~3snIE4PjYc%6*#^HD>*h`@M=No(8gEO?tGG;DGL! zIknN6VVIpLepd7%^9kPQ=@m~$#G`d&22uBd7N`xiP7nd~8%zL8zY7$6HJXuC?e(YU zo|ZhfFlXWkh}8`aNOTEuicNS}80_)bI`FU)e}Gw)H(>SGZcAB2IjJ%f(xjS0D3g$f zpKWvE6C}I95gE5ucsGJw!I(^u@Qq2m!}b62JC2|pO%)yPHM(i^a4hL6s!^uhSYDQ( zs6-SU+3-3w$KoVN{lR=H^hVSP#EnRfCNooS9%oP_bri+sHqLwpN!J;gB#HbCT*wP$kPMWfp>3s$!F>BG0nI}(tOBcS z`;|a~gZLF43#h#S#h9K-xNW62tdPsD6m#K0iM?V&GbYaL+Tv1R7X)gj~#SmUb78qLnlqoP^ zSe`gkIP@zojM0&GO=h@|U1Brj_A5+?CK^Vl?qgjE)=Mo|Man|gckYv`pkbSNoKK!l zI{10#kbR9{p%uRJ4wx<2MtMI>or0N#cP<&(WR_(NRzrNObQ6E4VtUzc?fH?Q`SmTe ze9vOyJ~XZ1o3+9UPw0YlgJEIwL%gBxaQO=tjEqDxu@8q>P<_RrX#GyAh7*w=e!%zM zvmm+X4>-{%3kZ>L>`>A9e(Oe^W8*8imEKjvrX~B9Z?mF4pdgAW0GcqQ8K?PWbOtli z6v1wXRcjUM?UkNSiRv~-lG&n=6 z$-Xti>!AZ`H4B7vrP6?>0{7UrywB2v>KcE_pW4LIO&E1X8z-=JL#R3C|YNnMkc!*60bMHvnH<`ilEG%{J&Fe*%+ zjTZG$y6;1$L>`qR_sp}wV!83lNr^{s08V1fY$}RtDBk_ zY{PKqIRP(E+njlJ>;-Ne9DTE9Yc-7W#!7e7F3YVtOg2yK#&M<)w#4K*c(bn^FnHGi zOO53p1ce|18`isRiPy2)Cp&cXWCMewS7U(<3?fr$6<2fP(VAkoOk?Mn;n6cy6eoEN zcTNR*-IloNR3v5#qTkK~&Q92!hff@mt5?U>fQ)(sn9?kZ zoELH=@&o-m=!`QtVP*4!Zq3MI*C)c*169O@A6{Sw1BrU77bX<7)o+B=OKOT3M_qUu z)G%1v*Dw$3!{WTWe}2o~d*W7}{itvohqK!zI4HNk!NALAmrWckmSUmNsWC3}z589I z?(Ph?T0sx*T5P5eOv%MYbRzUJ)6Kn!@@StdaavA^up>Bu#v(VH%nlM5iNgY!YUrMi ze_F{-tA~K?Z+>D_Z`ea`+x(I5S4rc!$&2G#xZi5!P+od8TU36$-U+2lUz(G)^M=`)XHCub}p+?s<^N%UM4vVLX!W z3!0^;2XT5crok6h1={vUZ6hmQ4N20z`>5mfN}W4i2ah$KgcnPPpEs_(#;Q{)27f<( z*y2iflq`qB-OJXu(8w@R=)->-a6|4bNxNMnft?20HkuCy$6$L09kd)G)W4O=9BM|{ z0njynOnyNaTVrFARb&?Wz)KO0c=aeIrmJGdj2T21U*d{=r&%WGB_fB}!Crdq%$!h6 zTYHZU91PZ_u6~E*gTy3XA#JV7W1QF6sjN;@hLE{nCX07QHTpvH15PaG$-!bfNO#d# zLz-yQ&tSY!D@K{1sPCqy(XopWKKD^Su(X0yAdtrAPbwvb;0KzwfBiTWK|Q z=@~d0^<3M_hSR&Ce?AW}16N8iRRYrnJD8B8G!k~7@GQoI<#32mT-zRtY2CpF2f(XA zMU6CkH@0EN1UN@jBxhBao0Y7;t{jc1e4a+0fB6N7b2yPo(8A@@2haBnasAf%nJCjH zql`!qJ9zbokA$A+Li$D^=r%*k928%W0a#oK{oyi-%i#({q!i0)WJ1(aFJgY*$gn{8I=(Ww04qI1{H zye0i*Mr`~uq|h*1yj(Kb6ltw^K@0am&(EmI`#hR*0ct8#{B~3BSz88+3Bzg4k81*^8%KE#*02QR*UK z2M-^JFu#z+ux)Gj9-Ypn7I{$oQ)oL1`l&|nToNk4Tamb^hRS)nuoZIEjHOtFqfhay zZUTan1jXVWhNrTYA$UlLl2*5w4DdkB`Zffs@;~cY=26uyjz?2T9bVi&2sRpcJQEc} zswq*+P- zDN^CmeDw%s_1+%}Im49+!#OjZ;j(Q*hfk#Bm}vcixtLUk-l>q@`BV7ppOrG2W#Z%& zW()~2c*wbgWlG&}uVkUND;LEy@?#C{}77N~WYzz)?Az@B@SyxF&QfwgRVOOn%0aye75&&}>S zzXc$D2{D5sKzp?kZ^aDn`*nF+3|f|e(o$M#yR)s_4THwu&3vi*JPwOBR)%9|cQ^)g z4XHCFEsKY{w1K@z=AIAvPKl3~tb_^UIhBwmBDl`00~fq=Sz&xh<>PA2hJCH!hGwUW zSgtprf2*L$jmE;I<{4F(Ggnc%YAXfr=SqhudnSKgbgU~un2Z{YIR{ZU&6?3OUcSLAaY@eW`eEgpt7 zlUlHem*R=;T?P@87+ei=K*i)c(`M7rgYp~;1v3UAroT0zo2b1J>$(E72e7wJRJ^j+ zfwa{lP}teWV2Cat(t`GRp|FvPh+q_fqDrDbm_Mgv ze11tcDh~Zxw+#nx2(x{He?+>B8}7!V`sarmVDe6{$$s5`AD)NF!*)Lkxhe86X@8YJ zUKj5XynC5Tkh`933miE2XeIrq#2DMX^k7QLZ zL|1DDSCs` zP~b8wgEc_AKuOkS68=kJJcC!LEhv(jc*PJc+JDJEZntc9XnDeon^R1KS8VypEKVS=!F?4_G(KTNE3yww1& z<<4Fsm#(W&-EE|$ep#8R2{KX@^9n+)nbR_CuKu2`y-?j&_Et#qL+_J4;tN=2WAJ?_ z>GAwa1Ld2`rz_J{-N+hUE`7D?$vACB{U+#Df4rK7HY2#|H7ad3`gquCdhAM5`64&^ zml&N+{;t8*A@sURFNd(28=x_y`ZPiZmZ*JTwE@14fXfD|h6GL5)jmGBn&D0L=Vf@m zCfsvhVa?!2*QXbkyXRHMlvIPVI=myUYfFf`Kvx;HNNg+~nfLnniq{U32A~2`%1Vz|wmTEs2e$)WSRz z)ul1TY;;WAQl)z-Kdg2cN`8In{^lIY0O)kQ^I2SoQWf~F>*MJp!pVm!TB9y-tC8z^ zo;bCQ?{j%6p6`I;Hk8t!SYr(BA&>}DrGxg2UYggV|Zk#`Og7%@FQAPviijGoxn3uBn010T08 zQ!nFZtP~|hjSMd!(1+p*Ez!^!t-}`5!O{-R&*GB$6p41JkhO#U#f{uNj#66xGL$#dz~=tSkpT%4i1 zgjkQKiEant8(H)O7-+8ZSoA)7^JvjbKP-NF5#si838FETR9 z{>F}aEty|AxCF?_9K2a!PCD&{mLIaLn~rY9PkVlT{$&jW-^9L(DZPjb!3!(?6gP

        !oRptb@n+ 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 literal 0 HcmV?d00001 diff --git a/public/assets/fonts/glyphicons-halflings-regular.svg b/public/assets/fonts/glyphicons-halflings-regular.svg new file mode 100755 index 00000000..e3e2dc73 --- /dev/null +++ b/public/assets/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/fonts/glyphicons-halflings-regular.ttf b/public/assets/fonts/glyphicons-halflings-regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..67fa00bf83801d2fa568546b982c80d27f6ef74e GIT binary patch literal 41280 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

        PBK;&Wcg|NX{>QR@W3{K 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 literal 0 HcmV?d00001 diff --git a/public/assets/fonts/glyphicons-halflings-regular.woff b/public/assets/fonts/glyphicons-halflings-regular.woff new file mode 100755 index 0000000000000000000000000000000000000000..8c54182aa5d4d1ab3c9171976b615c1dcb1dc187 GIT binary patch literal 23320 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 mX4Rtsthis.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .accordion-group > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find("[data-toggle=collapse][data-parent="+i+"]").not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(window.jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&a('

        ').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown")}return e.focus(),!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i').appendTo(document.body),this.$element.on("click",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("bs.modal"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.modal",e=new b(this,f)),"string"==typeof c?e[c]():f.show&&e.show()})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f).one("hide",function(){c.is(":visible")&&c.focus()})});var d=a(document.body).on("shown.bs.modal",".modal",function(){d.addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){d.removeClass("modal-open")})}(window.jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
        ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.enter=function(b){var c=this.getDefaults(),d={};this._options&&a.each(this._options,function(a,b){c[a]!=b&&(d[a]=b)});var e=b instanceof this.constructor?b:a(b.currentTarget)[this.type](d).data("bs."+this.type);return clearTimeout(e.timeout),e.options.delay&&e.options.delay.show?(e.hoverState="in",e.timeout=setTimeout(function(){"in"==e.hoverState&&e.show()},e.options.delay.show),void 0):e.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this._options).data("bs."+this.type);return clearTimeout(c.timeout),c.options.delay&&c.options.delay.hide?(c.hoverState="out",c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h

        '}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title:empty").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(window.jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery); \ No newline at end of file +/*! + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + ++function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed.bs.alert").remove()}var c=a(this),d=c.attr("data-target");d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));var e=a(d);b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close.bs.alert"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.one(a.support.transition.end,f).emulateTransitionEnd(150):f()};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){b=="loadingText"?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");c.prop("type")=="radio"&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f=typeof c=="object"&&c;e||d.data("bs.button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();if(b>this.$items.length-1||b<0)return;return this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){if(this.sliding)return;return this.slide("next")},b.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});this.$element.trigger(j);if(j.isDefaultPrevented())return;return this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(d.css("transition-duration").slice(0,-1)*1e3)):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),c.data()),g=c.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=c.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){function e(d){a(b).remove(),a(c).each(function(){var b=f(a(this)),c={relatedTarget:this};if(!b.hasClass("open"))return;b.trigger(d=a.Event("hide.bs.dropdown",c));if(d.isDefaultPrevented())return;b.removeClass("open").trigger("hidden.bs.dropdown",c)})}function f(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}"use strict";var b=".dropdown-backdrop",c="[data-toggle=dropdown]",d=function(b){a(b).on("click.bs.dropdown",this.toggle)};d.prototype.toggle=function(b){var c=a(this);if(c.is(".disabled, :disabled"))return;var d=f(c),g=d.hasClass("open");e();if(!g){"ontouchstart"in document.documentElement&&!d.closest(".navbar-nav").length&&a('
        ').insertAfter(a(this)).on("click",e);var h={relatedTarget:this};d.trigger(b=a.Event("show.bs.dropdown",h));if(b.isDefaultPrevented())return;d.toggleClass("open").trigger("shown.bs.dropdown",h),c.focus()}return!1},d.prototype.keydown=function(b){if(!/(38|40|27)/.test(b.keyCode))return;var d=a(this);b.preventDefault(),b.stopPropagation();if(d.is(".disabled, :disabled"))return;var e=f(d),g=e.hasClass("open");if(!g||g&&b.keyCode==27)return b.which==27&&e.find(c).focus(),d.click();var h=" li:not(.divider):visible a",i=e.find("[role=menu]"+h+", [role=listbox]"+h);if(!i.length)return;var j=i.index(i.filter(":focus"));b.keyCode==38&&j>0&&j--,b.keyCode==40&&j').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){if(a.target!==a.currentTarget)return;this.options.backdrop=="static"?this.$element[0].focus.call(this.$element[0]):this.hide.call(this)},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),typeof c=="object"&&c);f||e.data("bs.modal",f=new b(this,g)),typeof c=="string"?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
        ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);var e=this.options.trigger.split(" ");for(var f=e.length;f--;){var g=e[f];if(g=="click")this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if(g!="manual"){var h=g=="hover"?"mouseenter":"focusin",i=g=="hover"?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="in";if(!c.options.delay||!c.options.delay.show)return c.show();c.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="out";if(!c.options.delay||!c.options.delay.hide)return c.hide();c.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e=typeof this.options.placement=="function"?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n=this.options.container=="body"?window.innerWidth:k.outerWidth(),o=this.options.container=="body"?window.innerHeight:k.outerHeight(),p=this.options.container=="body"?0:k.offset().left;e=e=="bottom"&&h.top+h.height+j-m>o?"top":e=="top"&&h.top-m-j<0?"bottom":e=="right"&&h.right+i>n?"left":e=="left"&&h.left-i

        '}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?typeof c=="string"?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||(typeof b.content=="function"?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f=typeof c=="object"&&c;if(!e&&c=="destroy")return;e||d.data("bs.popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});b.trigger(f);if(f.isDefaultPrevented())return;var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})},b.prototype.activate=function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g).emulateTransitionEnd(150):g(),e.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var b=a.Event("show.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])},b.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var b=a.Event("hide.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};if(!a.support.transition)return d.call(this);this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350)},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c);!e&&f.toggle&&c=="show"&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":c.data(),i=c.attr("data-parent"),j=i&&a(i);if(!g||!g.transitioning)j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(c).addClass("collapsed"),c[f.hasClass("in")?"addClass":"removeClass"]("collapsed");f.collapse(h)})}(jQuery),+function(a){function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(a.style[c]!==undefined)return{end:b[c]};return!1}"use strict",a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery) \ No newline at end of file diff --git a/public/assets/js/build-plugins/phpcs.js b/public/assets/js/build-plugins/phpcs.js new file mode 100644 index 00000000..aaac3ec9 --- /dev/null +++ b/public/assets/js/build-plugins/phpcs.js @@ -0,0 +1,72 @@ +var phpcsPlugin = PHPCI.UiPlugin.extend({ + id: 'build-phpcs', + css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', + title: 'PHP Code Sniffer', + lastData: null, + displayOnUpdate: false, + box: true, + + register: function() { + var self = this; + var query = PHPCI.registerQuery('phpcs-data', -1, {key: 'phpcs-data'}) + + $(window).on('phpcs-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function(data) { + if (data.queryData.status > 1) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('
    ' + + '' + + '' + + ' ' + + ' ' + + ' ' + + '' + + '
    FileLineMessage
    '); + }, + + onUpdate: function(e) { + if (this.lastData && this.lastData[0]) { + return; + } + + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#phpcs-data tbody'); + tbody.empty(); + + for (var i in errors) { + var file = errors[i].file; + + if (PHPCI.fileLinkTemplate) { + var fileLink = PHPCI.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line_start); + + file = '' + file + ''; + } + + var row = $('' + + ''+file+'' + + ''+errors[i].line+'' + + ''+errors[i].message+''); + + if (errors[i].type == 'ERROR') { + row.addClass('danger'); + } + + tbody.append(row); + } + } +}); + +PHPCI.registerPlugin(new phpcsPlugin()); diff --git a/public/assets/js/build-plugins/phpmd.js b/public/assets/js/build-plugins/phpmd.js index 56e8e995..abf90f4c 100644 --- a/public/assets/js/build-plugins/phpmd.js +++ b/public/assets/js/build-plugins/phpmd.js @@ -4,6 +4,7 @@ var phpmdPlugin = PHPCI.UiPlugin.extend({ title: 'PHP Mess Detector', lastData: null, displayOnUpdate: false, + box: true, register: function() { var self = this; diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index e4c29791..05d4c3cb 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -391,16 +391,20 @@ var PHPCIObject = Class.extend({ }, renderPlugin: function(plugin) { - var output = $('
    ').addClass('panel-body').append(plugin.render()); + var output = plugin.render(); + + if (!plugin.box) { + output = $('
    ').append(output); + } + var container = $('
    ').addClass('ui-plugin ' + plugin.css); var content = $('
    ').attr('id', plugin.id).append(output); - content.addClass('panel'); + content.addClass('panel panel-default'); if (plugin.title) { content.prepend('

    '+plugin.title+'

    '); } - content.append(output); container.append(content); $('#plugins').append(container); @@ -409,7 +413,7 @@ var PHPCIObject = Class.extend({ UiPlugin: Class.extend({ id: null, css: 'col-lg-4 col-md-6 col-sm-12 col-xs-12', - box: true, + box: false, init: function(){ }, From 36f2bdff2073c9d46ac539e8576f69cb7e66a492 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:14:23 +0100 Subject: [PATCH 075/119] Making the public key a property that we store for projects, and displaying it for later use. --- PHPCI/Controller/ProjectController.php | 3 + PHPCI/Model/Base/BuildBase.php | 514 +++++++++++++----------- PHPCI/Model/Base/BuildMetaBase.php | 260 ++++++------ PHPCI/Model/Base/ProjectBase.php | 418 +++++++++++-------- PHPCI/Model/Base/UserBase.php | 231 ++++++----- PHPCI/Store/Base/BuildMetaStoreBase.php | 15 +- PHPCI/Store/Base/BuildStoreBase.php | 19 +- PHPCI/Store/Base/ProjectStoreBase.php | 15 +- PHPCI/Store/Base/UserStoreBase.php | 14 +- 9 files changed, 825 insertions(+), 664 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 2ecc177b..fa279eaf 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -212,6 +212,7 @@ class ProjectController extends \PHPCI\Controller } $values['git_key'] = $values['key']; + $values['public_key'] = $values['pubkey']; $project = new Project(); $project->setValues($values); @@ -242,6 +243,7 @@ class ProjectController extends \PHPCI\Controller } else { $values = $project->getDataArray(); $values['key'] = $values['git_key']; + $values['pubkey'] = $values['public_key']; if ($values['type'] == "gitlab") { $accessInfo = $project->getAccessInformation(); @@ -265,6 +267,7 @@ class ProjectController extends \PHPCI\Controller $values = $form->getValues(); $values['git_key'] = $values['key']; + $values['public_key'] = $values['pubkey']; if ($values['type'] == "gitlab") { preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches); diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 02dd6280..59e4c21e 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/PHPCI/Model/Base/BuildBase.php @@ -3,6 +3,7 @@ /** * Build base model for table: build */ + namespace PHPCI\Model\Base; use PHPCI\Model; @@ -14,323 +15,336 @@ use b8\Store\Factory; class BuildBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'build'; /** - * @var string - */ + * @var string + */ protected $modelName = 'Build'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, - 'project_id' => null, - 'commit_id' => null, - 'status' => null, - 'log' => null, - 'branch' => null, - 'created' => null, - 'started' => null, - 'finished' => null, - 'plugins' => null, + 'id' => null, + 'project_id' => null, + 'commit_id' => null, + 'status' => null, + 'log' => null, + 'branch' => null, + 'created' => null, + 'started' => null, + 'finished' => null, + 'plugins' => null, 'committer_email' => null, - 'commit_message' => null, + 'commit_message' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'project_id' => 'getProjectId', - 'commit_id' => 'getCommitId', - 'status' => 'getStatus', - 'log' => 'getLog', - 'branch' => 'getBranch', - 'created' => 'getCreated', - 'started' => 'getStarted', - 'finished' => 'getFinished', - 'plugins' => 'getPlugins', + 'id' => 'getId', + 'project_id' => 'getProjectId', + 'commit_id' => 'getCommitId', + 'status' => 'getStatus', + 'log' => 'getLog', + 'branch' => 'getBranch', + 'created' => 'getCreated', + 'started' => 'getStarted', + 'finished' => 'getFinished', + 'plugins' => 'getPlugins', 'committer_email' => 'getCommitterEmail', - 'commit_message' => 'getCommitMessage', + 'commit_message' => 'getCommitMessage', + // Foreign key getters: - 'Project' => 'getProject', + 'Project' => 'getProject', ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'project_id' => 'setProjectId', - 'commit_id' => 'setCommitId', - 'status' => 'setStatus', - 'log' => 'setLog', - 'branch' => 'setBranch', - 'created' => 'setCreated', - 'started' => 'setStarted', - 'finished' => 'setFinished', - 'plugins' => 'setPlugins', + 'id' => 'setId', + 'project_id' => 'setProjectId', + 'commit_id' => 'setCommitId', + 'status' => 'setStatus', + 'log' => 'setLog', + 'branch' => 'setBranch', + 'created' => 'setCreated', + 'started' => 'setStarted', + 'finished' => 'setFinished', + 'plugins' => 'setPlugins', 'committer_email' => 'setCommitterEmail', - 'commit_message' => 'setCommitMessage', + 'commit_message' => 'setCommitMessage', + // Foreign key setters: - 'Project' => 'setProject', + 'Project' => 'setProject', ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, - 'default' => null, - ), - 'project_id' => array( - 'type' => 'int', - 'length' => 11, 'default' => null, ), - 'commit_id' => array( - 'type' => 'varchar', - 'length' => 50, - 'nullable' => true, - 'default' => null, - ), - 'status' => array( - 'type' => 'tinyint', - 'length' => 4, + 'project_id' => array( + 'type' => 'int', + 'length' => 11, 'default' => null, ), - 'log' => array( - 'type' => 'longtext', + 'commit_id' => array( + 'type' => 'varchar', + 'length' => 50, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'branch' => array( - 'type' => 'varchar', - 'length' => 50, + 'status' => array( + 'type' => 'tinyint', + 'length' => 4, + 'default' => null, + ), + 'log' => array( + 'type' => 'longtext', + 'nullable' => true, + 'default' => null, + ), + 'branch' => array( + 'type' => 'varchar', + 'length' => 50, 'default' => 'master', ), - 'created' => array( - 'type' => 'datetime', + 'created' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'started' => array( - 'type' => 'datetime', + 'started' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'finished' => array( - 'type' => 'datetime', + 'finished' => array( + 'type' => 'datetime', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'plugins' => array( - 'type' => 'text', + 'plugins' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), 'committer_email' => array( - 'type' => 'varchar', - 'length' => 512, + 'type' => 'varchar', + 'length' => 512, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'commit_message' => array( - 'type' => 'text', + 'commit_message' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'project_id' => array('columns' => 'project_id'), - 'idx_status' => array('columns' => 'status'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'project_id' => array('columns' => 'project_id'), + 'idx_status' => array('columns' => 'status'), ); /** - * @var array - */ + * @var array + */ public $foreignKeys = array( - 'build_ibfk_1' => array( - 'local_col' => 'project_id', - 'update' => 'CASCADE', - 'delete' => 'CASCADE', - 'table' => 'project', - 'col' => 'id' - ), + 'build_ibfk_1' => array( + 'local_col' => 'project_id', + 'update' => 'CASCADE', + 'delete' => 'CASCADE', + 'table' => 'project', + 'col' => 'id' + ), ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; + $rtn = $this->data['id']; + return $rtn; } /** - * Get the value of ProjectId / project_id. - * - * @return int - */ + * Get the value of ProjectId / project_id. + * + * @return int + */ public function getProjectId() { - $rtn = $this->data['project_id']; + $rtn = $this->data['project_id']; + return $rtn; } /** - * Get the value of CommitId / commit_id. - * - * @return string - */ + * Get the value of CommitId / commit_id. + * + * @return string + */ public function getCommitId() { - $rtn = $this->data['commit_id']; + $rtn = $this->data['commit_id']; + return $rtn; } /** - * Get the value of Status / status. - * - * @return int - */ + * Get the value of Status / status. + * + * @return int + */ public function getStatus() { - $rtn = $this->data['status']; + $rtn = $this->data['status']; + return $rtn; } /** - * Get the value of Log / log. - * - * @return string - */ + * Get the value of Log / log. + * + * @return string + */ public function getLog() { - $rtn = $this->data['log']; + $rtn = $this->data['log']; + return $rtn; } /** - * Get the value of Branch / branch. - * - * @return string - */ + * Get the value of Branch / branch. + * + * @return string + */ public function getBranch() { - $rtn = $this->data['branch']; + $rtn = $this->data['branch']; + return $rtn; } /** - * Get the value of Created / created. - * - * @return \DateTime - */ + * Get the value of Created / created. + * + * @return \DateTime + */ public function getCreated() { - $rtn = $this->data['created']; + $rtn = $this->data['created']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } + return $rtn; } /** - * Get the value of Started / started. - * - * @return \DateTime - */ + * Get the value of Started / started. + * + * @return \DateTime + */ public function getStarted() { - $rtn = $this->data['started']; + $rtn = $this->data['started']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } + return $rtn; } /** - * Get the value of Finished / finished. - * - * @return \DateTime - */ + * Get the value of Finished / finished. + * + * @return \DateTime + */ public function getFinished() { - $rtn = $this->data['finished']; + $rtn = $this->data['finished']; if (!empty($rtn)) { - $rtn = new \DateTime($rtn); + $rtn = new \DateTime($rtn); } + return $rtn; } /** - * Get the value of Plugins / plugins. - * - * @return string - */ + * Get the value of Plugins / plugins. + * + * @return string + */ public function getPlugins() { - $rtn = $this->data['plugins']; + $rtn = $this->data['plugins']; + return $rtn; } /** - * Get the value of CommitterEmail / committer_email. - * - * @return string - */ + * Get the value of CommitterEmail / committer_email. + * + * @return string + */ public function getCommitterEmail() { - $rtn = $this->data['committer_email']; + $rtn = $this->data['committer_email']; + return $rtn; } /** - * Get the value of CommitMessage / commit_message. - * - * @return string - */ + * Get the value of CommitMessage / commit_message. + * + * @return string + */ public function getCommitMessage() { - $rtn = $this->data['commit_message']; + $rtn = $this->data['commit_message']; + return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -339,17 +353,18 @@ class BuildBase extends Model if ($this->data['id'] === $value) { return; } + $this->data['id'] = $value; + $this->_setModified('id'); } /** - * Set the value of ProjectId / project_id. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of ProjectId / project_id. + * + * Must not be null. + * @param $value int + */ public function setProjectId($value) { $this->_validateNotNull('ProjectId', $value); @@ -358,15 +373,17 @@ class BuildBase extends Model if ($this->data['project_id'] === $value) { return; } + $this->data['project_id'] = $value; + $this->_setModified('project_id'); } /** - * Set the value of CommitId / commit_id. - * - * @param $value string - */ + * Set the value of CommitId / commit_id. + * + * @param $value string + */ public function setCommitId($value) { $this->_validateString('CommitId', $value); @@ -374,17 +391,18 @@ class BuildBase extends Model if ($this->data['commit_id'] === $value) { return; } + $this->data['commit_id'] = $value; + $this->_setModified('commit_id'); } /** - * Set the value of Status / status. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of Status / status. + * + * Must not be null. + * @param $value int + */ public function setStatus($value) { $this->_validateNotNull('Status', $value); @@ -393,15 +411,17 @@ class BuildBase extends Model if ($this->data['status'] === $value) { return; } + $this->data['status'] = $value; + $this->_setModified('status'); } /** - * Set the value of Log / log. - * - * @param $value string - */ + * Set the value of Log / log. + * + * @param $value string + */ public function setLog($value) { $this->_validateString('Log', $value); @@ -409,17 +429,18 @@ class BuildBase extends Model if ($this->data['log'] === $value) { return; } + $this->data['log'] = $value; + $this->_setModified('log'); } /** - * Set the value of Branch / branch. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of Branch / branch. + * + * Must not be null. + * @param $value string + */ public function setBranch($value) { $this->_validateNotNull('Branch', $value); @@ -428,15 +449,17 @@ class BuildBase extends Model if ($this->data['branch'] === $value) { return; } + $this->data['branch'] = $value; + $this->_setModified('branch'); } /** - * Set the value of Created / created. - * - * @param $value \DateTime - */ + * Set the value of Created / created. + * + * @param $value \DateTime + */ public function setCreated($value) { $this->_validateDate('Created', $value); @@ -444,15 +467,17 @@ class BuildBase extends Model if ($this->data['created'] === $value) { return; } + $this->data['created'] = $value; + $this->_setModified('created'); } /** - * Set the value of Started / started. - * - * @param $value \DateTime - */ + * Set the value of Started / started. + * + * @param $value \DateTime + */ public function setStarted($value) { $this->_validateDate('Started', $value); @@ -460,15 +485,17 @@ class BuildBase extends Model if ($this->data['started'] === $value) { return; } + $this->data['started'] = $value; + $this->_setModified('started'); } /** - * Set the value of Finished / finished. - * - * @param $value \DateTime - */ + * Set the value of Finished / finished. + * + * @param $value \DateTime + */ public function setFinished($value) { $this->_validateDate('Finished', $value); @@ -476,15 +503,17 @@ class BuildBase extends Model if ($this->data['finished'] === $value) { return; } + $this->data['finished'] = $value; + $this->_setModified('finished'); } /** - * Set the value of Plugins / plugins. - * - * @param $value string - */ + * Set the value of Plugins / plugins. + * + * @param $value string + */ public function setPlugins($value) { $this->_validateString('Plugins', $value); @@ -492,15 +521,17 @@ class BuildBase extends Model if ($this->data['plugins'] === $value) { return; } + $this->data['plugins'] = $value; + $this->_setModified('plugins'); } /** - * Set the value of CommitterEmail / committer_email. - * - * @param $value string - */ + * Set the value of CommitterEmail / committer_email. + * + * @param $value string + */ public function setCommitterEmail($value) { $this->_validateString('CommitterEmail', $value); @@ -508,15 +539,17 @@ class BuildBase extends Model if ($this->data['committer_email'] === $value) { return; } + $this->data['committer_email'] = $value; + $this->_setModified('committer_email'); } /** - * Set the value of CommitMessage / commit_message. - * - * @param $value string - */ + * Set the value of CommitMessage / commit_message. + * + * @param $value string + */ public function setCommitMessage($value) { $this->_validateString('CommitMessage', $value); @@ -524,7 +557,9 @@ class BuildBase extends Model if ($this->data['commit_message'] === $value) { return; } + $this->data['commit_message'] = $value; + $this->_setModified('commit_message'); } @@ -543,21 +578,22 @@ class BuildBase extends Model return null; } - $cacheKey = 'Cache.Project.' . $key; - $rtn = $this->cache->get($cacheKey, null); + $cacheKey = 'Cache.Project.' . $key; + $rtn = $this->cache->get($cacheKey, null); if (empty($rtn)) { - $rtn = Factory::getStore('Project', 'PHPCI')->getById($key); + $rtn = Factory::getStore('Project', 'PHPCI')->getById($key); $this->cache->set($cacheKey, $rtn); } + return $rtn; } /** - * Set Project - Accepts an ID, an array representing a Project or a Project model. - * - * @param $value mixed - */ + * Set Project - Accepts an ID, an array representing a Project or a Project model. + * + * @param $value mixed + */ public function setProject($value) { // Is this an instance of Project? @@ -575,16 +611,15 @@ class BuildBase extends Model } /** - * Set Project - Accepts a Project model. - * - * @param $value \PHPCI\Model\Project - */ + * Set Project - Accepts a Project model. + * + * @param $value \PHPCI\Model\Project + */ public function setProjectObject(\PHPCI\Model\Project $value) { return $this->setProjectId($value->getId()); } - /** * Get BuildMeta models by BuildId for this Build. * @@ -597,11 +632,15 @@ class BuildBase extends Model return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($this->getId()); } + + + public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('Build', 'PHPCI')->getByPrimaryKey($value, $useConnection); } + public static function getById($value, $useConnection = 'read') { return Factory::getStore('Build', 'PHPCI')->getById($value, $useConnection); @@ -616,4 +655,7 @@ class BuildBase extends Model { return Factory::getStore('Build', 'PHPCI')->getByStatus($value, $limit, $useConnection); } + + + } diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index 7c360075..83333102 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -15,176 +15,182 @@ use b8\Store\Factory; class BuildMetaBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'build_meta'; /** - * @var string - */ + * @var string + */ protected $modelName = 'BuildMeta'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, + 'id' => null, 'project_id' => null, - 'build_id' => null, - 'meta_key' => null, + 'build_id' => null, + 'meta_key' => null, 'meta_value' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', + 'id' => 'getId', 'project_id' => 'getProjectId', - 'build_id' => 'getBuildId', - 'meta_key' => 'getMetaKey', + 'build_id' => 'getBuildId', + 'meta_key' => 'getMetaKey', 'meta_value' => 'getMetaValue', + // Foreign key getters: - 'Build' => 'getBuild', + 'Build' => 'getBuild', ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', + 'id' => 'setId', 'project_id' => 'setProjectId', - 'build_id' => 'setBuildId', - 'meta_key' => 'setMetaKey', + 'build_id' => 'setBuildId', + 'meta_key' => 'setMetaKey', 'meta_value' => 'setMetaValue', + // Foreign key setters: - 'Build' => 'setBuild', + 'Build' => 'setBuild', ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 10, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 10, + 'primary_key' => true, 'auto_increment' => true, - 'default' => null, - ), - 'project_id' => array( - 'type' => 'int', - 'length' => 11, 'default' => null, ), - 'build_id' => array( - 'type' => 'int', - 'length' => 11, - 'nullable' => true, - 'default' => null, + 'project_id' => array( + 'type' => 'int', + 'length' => 11, + 'default' => null, ), - 'meta_key' => array( - 'type' => 'varchar', - 'length' => 255, + 'build_id' => array( + 'type' => 'int', + 'length' => 11, + 'nullable' => true, + 'default' => null, + ), + 'meta_key' => array( + 'type' => 'varchar', + 'length' => 255, 'default' => null, ), 'meta_value' => array( - 'type' => 'text', + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_meta_id' => array('unique' => true, 'columns' => 'build_id, meta_key'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_meta_id' => array('unique' => true, 'columns' => 'build_id, meta_key'), ); /** - * @var array - */ + * @var array + */ public $foreignKeys = array( - 'fk_meta_build_id' => array( - 'local_col' => 'build_id', - 'update' => 'CASCADE', - 'delete' => 'CASCADE', - 'table' => 'build', - 'col' => 'id' - ), + 'fk_meta_build_id' => array( + 'local_col' => 'build_id', + 'update' => 'CASCADE', + 'delete' => 'CASCADE', + 'table' => 'build', + 'col' => 'id' + ), ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; + $rtn = $this->data['id']; + return $rtn; } /** - * Get the value of ProjectId / project_id. - * - * @return int - */ + * Get the value of ProjectId / project_id. + * + * @return int + */ public function getProjectId() { - $rtn = $this->data['project_id']; + $rtn = $this->data['project_id']; + return $rtn; } /** - * Get the value of BuildId / build_id. - * - * @return int - */ + * Get the value of BuildId / build_id. + * + * @return int + */ public function getBuildId() { - $rtn = $this->data['build_id']; + $rtn = $this->data['build_id']; + return $rtn; } /** - * Get the value of MetaKey / meta_key. - * - * @return string - */ + * Get the value of MetaKey / meta_key. + * + * @return string + */ public function getMetaKey() { - $rtn = $this->data['meta_key']; + $rtn = $this->data['meta_key']; + return $rtn; } /** - * Get the value of MetaValue / meta_value. - * - * @return string - */ + * Get the value of MetaValue / meta_value. + * + * @return string + */ public function getMetaValue() { - $rtn = $this->data['meta_value']; + $rtn = $this->data['meta_value']; + return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -193,17 +199,18 @@ class BuildMetaBase extends Model if ($this->data['id'] === $value) { return; } + $this->data['id'] = $value; + $this->_setModified('id'); } /** - * Set the value of ProjectId / project_id. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of ProjectId / project_id. + * + * Must not be null. + * @param $value int + */ public function setProjectId($value) { $this->_validateNotNull('ProjectId', $value); @@ -212,15 +219,17 @@ class BuildMetaBase extends Model if ($this->data['project_id'] === $value) { return; } + $this->data['project_id'] = $value; + $this->_setModified('project_id'); } /** - * Set the value of BuildId / build_id. - * - * @param $value int - */ + * Set the value of BuildId / build_id. + * + * @param $value int + */ public function setBuildId($value) { $this->_validateInt('BuildId', $value); @@ -228,17 +237,18 @@ class BuildMetaBase extends Model if ($this->data['build_id'] === $value) { return; } + $this->data['build_id'] = $value; + $this->_setModified('build_id'); } /** - * Set the value of MetaKey / meta_key. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of MetaKey / meta_key. + * + * Must not be null. + * @param $value string + */ public function setMetaKey($value) { $this->_validateNotNull('MetaKey', $value); @@ -247,15 +257,17 @@ class BuildMetaBase extends Model if ($this->data['meta_key'] === $value) { return; } + $this->data['meta_key'] = $value; + $this->_setModified('meta_key'); } /** - * Set the value of MetaValue / meta_value. - * - * @param $value string - */ + * Set the value of MetaValue / meta_value. + * + * @param $value string + */ public function setMetaValue($value) { $this->_validateString('MetaValue', $value); @@ -263,7 +275,9 @@ class BuildMetaBase extends Model if ($this->data['meta_value'] === $value) { return; } + $this->data['meta_value'] = $value; + $this->_setModified('meta_value'); } @@ -282,21 +296,22 @@ class BuildMetaBase extends Model return null; } - $cacheKey = 'Cache.Build.' . $key; - $rtn = $this->cache->get($cacheKey, null); + $cacheKey = 'Cache.Build.' . $key; + $rtn = $this->cache->get($cacheKey, null); if (empty($rtn)) { - $rtn = Factory::getStore('Build', 'PHPCI')->getById($key); + $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 - */ + * 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? @@ -314,20 +329,24 @@ class BuildMetaBase extends Model } /** - * Set Build - Accepts a Build model. - * - * @param $value \PHPCI\Model\Build - */ + * Set Build - Accepts a Build model. + * + * @param $value \PHPCI\Model\Build + */ public function setBuildObject(\PHPCI\Model\Build $value) { return $this->setBuildId($value->getId()); } + + + public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('BuildMeta', 'PHPCI')->getByPrimaryKey($value, $useConnection); } + public static function getById($value, $useConnection = 'read') { return Factory::getStore('BuildMeta', 'PHPCI')->getById($value, $useConnection); @@ -337,4 +356,7 @@ class BuildMetaBase extends Model { return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($value, $limit, $useConnection); } + + + } diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index b208bfff..c58f2016 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -15,244 +15,275 @@ use b8\Store\Factory; class ProjectBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'project'; /** - * @var string - */ + * @var string + */ protected $modelName = 'Project'; /** - * @var array - */ + * @var array + */ protected $data = array( - 'id' => null, - 'title' => null, - 'reference' => null, - 'git_key' => null, - 'build_config' => null, - 'type' => null, - 'token' => null, + 'id' => null, + 'title' => null, + 'reference' => null, + 'git_key' => null, + 'public_key' => null, + 'type' => null, + 'token' => null, 'access_information' => null, - 'last_commit' => null, + 'last_commit' => null, + 'build_config' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'title' => 'getTitle', - 'reference' => 'getReference', - 'git_key' => 'getGitKey', - 'build_config' => 'getBuildConfig', - 'type' => 'getType', - 'token' => 'getToken', + 'id' => 'getId', + 'title' => 'getTitle', + 'reference' => 'getReference', + 'git_key' => 'getGitKey', + 'public_key' => 'getPublicKey', + 'type' => 'getType', + 'token' => 'getToken', 'access_information' => 'getAccessInformation', - 'last_commit' => 'getLastCommit', + 'last_commit' => 'getLastCommit', + 'build_config' => 'getBuildConfig', + // Foreign key getters: ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'title' => 'setTitle', - 'reference' => 'setReference', - 'git_key' => 'setGitKey', - 'build_config' => 'setBuildConfig', - 'type' => 'setType', - 'token' => 'setToken', + 'id' => 'setId', + 'title' => 'setTitle', + 'reference' => 'setReference', + 'git_key' => 'setGitKey', + 'public_key' => 'setPublicKey', + 'type' => 'setType', + 'token' => 'setToken', 'access_information' => 'setAccessInformation', - 'last_commit' => 'setLastCommit', + 'last_commit' => 'setLastCommit', + 'build_config' => 'setBuildConfig', + // Foreign key setters: ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, - 'default' => null, - ), - 'title' => array( - 'type' => 'varchar', - 'length' => 250, 'default' => null, ), - 'reference' => array( - 'type' => 'varchar', - 'length' => 250, + 'title' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), - 'git_key' => array( - 'type' => 'text', - 'nullable' => true, - 'default' => null, + 'reference' => array( + 'type' => 'varchar', + 'length' => 250, + 'default' => null, ), - 'build_config' => array( - 'type' => 'text', + 'git_key' => array( + 'type' => 'text', 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'type' => array( - 'type' => 'varchar', - 'length' => 50, + 'public_key' => array( + 'type' => 'text', + 'nullable' => true, + 'default' => null, + ), + 'type' => array( + 'type' => 'varchar', + 'length' => 50, 'default' => 1, ), - 'token' => array( - 'type' => 'varchar', - 'length' => 50, + 'token' => array( + 'type' => 'varchar', + 'length' => 50, 'nullable' => true, - 'default' => null, + 'default' => null, ), 'access_information' => array( - 'type' => 'varchar', - 'length' => 250, + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, ), - 'last_commit' => array( - 'type' => 'varchar', - 'length' => 250, + 'last_commit' => array( + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, + ), + 'build_config' => array( + 'type' => 'text', + 'nullable' => true, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_project_title' => array('columns' => 'title'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_project_title' => array('columns' => 'title'), ); /** - * @var array - */ - public $foreignKeys = array(); + * @var array + */ + public $foreignKeys = array( + ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; + $rtn = $this->data['id']; + return $rtn; } /** - * Get the value of Title / title. - * - * @return string - */ + * Get the value of Title / title. + * + * @return string + */ public function getTitle() { - $rtn = $this->data['title']; + $rtn = $this->data['title']; + return $rtn; } /** - * Get the value of Reference / reference. - * - * @return string - */ + * Get the value of Reference / reference. + * + * @return string + */ public function getReference() { - $rtn = $this->data['reference']; + $rtn = $this->data['reference']; + return $rtn; } /** - * Get the value of GitKey / git_key. - * - * @return string - */ + * Get the value of GitKey / git_key. + * + * @return string + */ public function getGitKey() { - $rtn = $this->data['git_key']; + $rtn = $this->data['git_key']; + return $rtn; } /** - * Get the value of BuildConfig / build_config. - * - * @return string - */ - public function getBuildConfig() + * Get the value of PublicKey / public_key. + * + * @return string + */ + public function getPublicKey() { - $rtn = $this->data['build_config']; + $rtn = $this->data['public_key']; + return $rtn; } /** - * Get the value of Type / type. - * - * @return string - */ + * Get the value of Type / type. + * + * @return string + */ public function getType() { - $rtn = $this->data['type']; + $rtn = $this->data['type']; + return $rtn; } /** - * Get the value of Token / token. - * - * @return string - */ + * Get the value of Token / token. + * + * @return string + */ public function getToken() { - $rtn = $this->data['token']; + $rtn = $this->data['token']; + return $rtn; } /** - * Get the value of AccessInformation / access_information. - * - * @return string - */ + * Get the value of AccessInformation / access_information. + * + * @return string + */ public function getAccessInformation() { - $rtn = $this->data['access_information']; + $rtn = $this->data['access_information']; + return $rtn; } /** - * Get the value of LastCommit / last_commit. - * - * @return string - */ + * Get the value of LastCommit / last_commit. + * + * @return string + */ public function getLastCommit() { - $rtn = $this->data['last_commit']; + $rtn = $this->data['last_commit']; + return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * - * @param $value int - */ + * Get the value of BuildConfig / build_config. + * + * @return string + */ + public function getBuildConfig() + { + $rtn = $this->data['build_config']; + + return $rtn; + } + + /** + * Set the value of Id / id. + * + * Must not be null. + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -261,17 +292,18 @@ class ProjectBase extends Model 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 - */ + * Set the value of Title / title. + * + * Must not be null. + * @param $value string + */ public function setTitle($value) { $this->_validateNotNull('Title', $value); @@ -280,17 +312,18 @@ class ProjectBase extends Model if ($this->data['title'] === $value) { return; } + $this->data['title'] = $value; + $this->_setModified('title'); } /** - * Set the value of Reference / reference. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of Reference / reference. + * + * Must not be null. + * @param $value string + */ public function setReference($value) { $this->_validateNotNull('Reference', $value); @@ -299,15 +332,17 @@ class ProjectBase extends Model if ($this->data['reference'] === $value) { return; } + $this->data['reference'] = $value; + $this->_setModified('reference'); } /** - * Set the value of GitKey / git_key. - * - * @param $value string - */ + * Set the value of GitKey / git_key. + * + * @param $value string + */ public function setGitKey($value) { $this->_validateString('GitKey', $value); @@ -315,33 +350,36 @@ class ProjectBase extends Model if ($this->data['git_key'] === $value) { return; } + $this->data['git_key'] = $value; + $this->_setModified('git_key'); } /** - * Set the value of BuildConfig / build_config. - * - * @param $value string - */ - public function setBuildConfig($value) + * Set the value of PublicKey / public_key. + * + * @param $value string + */ + public function setPublicKey($value) { - $this->_validateString('BuildConfig', $value); + $this->_validateString('PublicKey', $value); - if ($this->data['build_config'] === $value) { + if ($this->data['public_key'] === $value) { return; } - $this->data['build_config'] = $value; - $this->_setModified('build_config'); + + $this->data['public_key'] = $value; + + $this->_setModified('public_key'); } /** - * Set the value of Type / type. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of Type / type. + * + * Must not be null. + * @param $value string + */ public function setType($value) { $this->_validateNotNull('Type', $value); @@ -350,16 +388,17 @@ class ProjectBase extends Model if ($this->data['type'] === $value) { return; } + $this->data['type'] = $value; + $this->_setModified('type'); } - /** - * Set the value of Token / token. - * - * @param $value string - */ + * Set the value of Token / token. + * + * @param $value string + */ public function setToken($value) { $this->_validateString('Token', $value); @@ -367,15 +406,17 @@ class ProjectBase extends Model if ($this->data['token'] === $value) { return; } + $this->data['token'] = $value; + $this->_setModified('token'); } /** - * Set the value of AccessInformation / access_information. - * - * @param $value string - */ + * Set the value of AccessInformation / access_information. + * + * @param $value string + */ public function setAccessInformation($value) { $this->_validateString('AccessInformation', $value); @@ -383,15 +424,17 @@ class ProjectBase extends Model if ($this->data['access_information'] === $value) { return; } + $this->data['access_information'] = $value; + $this->_setModified('access_information'); } /** - * Set the value of LastCommit / last_commit. - * - * @param $value string - */ + * Set the value of LastCommit / last_commit. + * + * @param $value string + */ public function setLastCommit($value) { $this->_validateString('LastCommit', $value); @@ -399,10 +442,30 @@ class ProjectBase extends Model if ($this->data['last_commit'] === $value) { return; } + $this->data['last_commit'] = $value; + $this->_setModified('last_commit'); } + /** + * Set the value of BuildConfig / build_config. + * + * @param $value string + */ + public function setBuildConfig($value) + { + $this->_validateString('BuildConfig', $value); + + if ($this->data['build_config'] === $value) { + return; + } + + $this->data['build_config'] = $value; + + $this->_setModified('build_config'); + } + /** * Get Build models by ProjectId for this Project. * @@ -415,11 +478,15 @@ class ProjectBase extends Model return Factory::getStore('Build', 'PHPCI')->getByProjectId($this->getId()); } + + + public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('Project', 'PHPCI')->getByPrimaryKey($value, $useConnection); } + public static function getById($value, $useConnection = 'read') { return Factory::getStore('Project', 'PHPCI')->getById($value, $useConnection); @@ -429,4 +496,7 @@ class ProjectBase extends Model { return Factory::getStore('Project', 'PHPCI')->getByTitle($value, $limit, $useConnection); } + + + } diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php index 055eacce..f0b0e393 100644 --- a/PHPCI/Model/Base/UserBase.php +++ b/PHPCI/Model/Base/UserBase.php @@ -15,168 +15,173 @@ use b8\Store\Factory; class UserBase extends Model { /** - * @var array - */ + * @var array + */ public static $sleepable = array(); /** - * @var string - */ + * @var string + */ protected $tableName = 'user'; /** - * @var string - */ + * @var string + */ protected $modelName = 'User'; /** - * @var array - */ + * @var array + */ protected $data = array( - - 'id' => null, - 'email' => null, - 'hash' => null, + 'id' => null, + 'email' => null, + 'hash' => null, 'is_admin' => null, - 'name' => null, - + 'name' => null, ); /** - * @var array - */ + * @var array + */ protected $getters = array( // Direct property getters: - 'id' => 'getId', - 'email' => 'getEmail', - 'hash' => 'getHash', + 'id' => 'getId', + 'email' => 'getEmail', + 'hash' => 'getHash', 'is_admin' => 'getIsAdmin', - 'name' => 'getName', + 'name' => 'getName', + // Foreign key getters: ); /** - * @var array - */ + * @var array + */ protected $setters = array( // Direct property setters: - 'id' => 'setId', - 'email' => 'setEmail', - 'hash' => 'setHash', + 'id' => 'setId', + 'email' => 'setEmail', + 'hash' => 'setHash', 'is_admin' => 'setIsAdmin', - 'name' => 'setName', + 'name' => 'setName', + // Foreign key setters: ); /** - * @var array - */ + * @var array + */ public $columns = array( - 'id' => array( - 'type' => 'int', - 'length' => 11, - 'primary_key' => true, + 'id' => array( + 'type' => 'int', + 'length' => 11, + 'primary_key' => true, 'auto_increment' => true, - 'default' => null, - ), - 'email' => array( - 'type' => 'varchar', - 'length' => 250, 'default' => null, ), - 'hash' => array( - 'type' => 'varchar', - 'length' => 250, + 'email' => array( + 'type' => 'varchar', + 'length' => 250, + 'default' => null, + ), + 'hash' => array( + 'type' => 'varchar', + 'length' => 250, 'default' => null, ), 'is_admin' => array( - 'type' => 'tinyint', - 'length' => 1, + 'type' => 'tinyint', + 'length' => 1, 'default' => null, ), - 'name' => array( - 'type' => 'varchar', - 'length' => 250, + 'name' => array( + 'type' => 'varchar', + 'length' => 250, 'nullable' => true, - 'default' => null, + 'default' => null, ), ); /** - * @var array - */ + * @var array + */ public $indexes = array( - 'PRIMARY' => array('unique' => true, 'columns' => 'id'), - 'idx_email' => array('unique' => true, 'columns' => 'email'), + 'PRIMARY' => array('unique' => true, 'columns' => 'id'), + 'idx_email' => array('unique' => true, 'columns' => 'email'), ); /** - * @var array - */ - public $foreignKeys = array(); + * @var array + */ + public $foreignKeys = array( + ); /** - * Get the value of Id / id. - * - * @return int - */ + * Get the value of Id / id. + * + * @return int + */ public function getId() { - $rtn = $this->data['id']; + $rtn = $this->data['id']; + return $rtn; } /** - * Get the value of Email / email. - * - * @return string - */ + * Get the value of Email / email. + * + * @return string + */ public function getEmail() { - $rtn = $this->data['email']; + $rtn = $this->data['email']; + return $rtn; } /** - * Get the value of Hash / hash. - * - * @return string - */ + * Get the value of Hash / hash. + * + * @return string + */ public function getHash() { - $rtn = $this->data['hash']; + $rtn = $this->data['hash']; + return $rtn; } /** - * Get the value of IsAdmin / is_admin. - * - * @return int - */ + * Get the value of IsAdmin / is_admin. + * + * @return int + */ public function getIsAdmin() { - $rtn = $this->data['is_admin']; + $rtn = $this->data['is_admin']; + return $rtn; } /** - * Get the value of Name / name. - * - * @return string - */ + * Get the value of Name / name. + * + * @return string + */ public function getName() { - $rtn = $this->data['name']; + $rtn = $this->data['name']; + return $rtn; } /** - * Set the value of Id / id. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of Id / id. + * + * Must not be null. + * @param $value int + */ public function setId($value) { $this->_validateNotNull('Id', $value); @@ -185,17 +190,18 @@ class UserBase extends Model if ($this->data['id'] === $value) { return; } + $this->data['id'] = $value; + $this->_setModified('id'); } /** - * Set the value of Email / email. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of Email / email. + * + * Must not be null. + * @param $value string + */ public function setEmail($value) { $this->_validateNotNull('Email', $value); @@ -204,17 +210,18 @@ class UserBase extends Model if ($this->data['email'] === $value) { return; } + $this->data['email'] = $value; + $this->_setModified('email'); } /** - * Set the value of Hash / hash. - * - * Must not be null. - * - * @param $value string - */ + * Set the value of Hash / hash. + * + * Must not be null. + * @param $value string + */ public function setHash($value) { $this->_validateNotNull('Hash', $value); @@ -223,17 +230,18 @@ class UserBase extends Model if ($this->data['hash'] === $value) { return; } + $this->data['hash'] = $value; + $this->_setModified('hash'); } /** - * Set the value of IsAdmin / is_admin. - * - * Must not be null. - * - * @param $value int - */ + * Set the value of IsAdmin / is_admin. + * + * Must not be null. + * @param $value int + */ public function setIsAdmin($value) { $this->_validateNotNull('IsAdmin', $value); @@ -242,15 +250,17 @@ class UserBase extends Model if ($this->data['is_admin'] === $value) { return; } + $this->data['is_admin'] = $value; + $this->_setModified('is_admin'); } /** - * Set the value of Name / name. - * - * @param $value string - */ + * Set the value of Name / name. + * + * @param $value string + */ public function setName($value) { $this->_validateString('Name', $value); @@ -258,15 +268,21 @@ class UserBase extends Model if ($this->data['name'] === $value) { return; } + $this->data['name'] = $value; + $this->_setModified('name'); } + + + public static function getByPrimaryKey($value, $useConnection = 'read') { return Factory::getStore('User', 'PHPCI')->getByPrimaryKey($value, $useConnection); } + public static function getById($value, $useConnection = 'read') { return Factory::getStore('User', 'PHPCI')->getById($value, $useConnection); @@ -276,4 +292,7 @@ class UserBase extends Model { return Factory::getStore('User', 'PHPCI')->getByEmail($value, $useConnection); } + + + } diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 1be8292a..4abd97a3 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -16,11 +16,9 @@ use PHPCI\Model\BuildMeta; */ class BuildMetaStoreBase extends Store { - protected $tableName = 'build_meta'; - - protected $modelName = '\PHPCI\Model\BuildMeta'; - - protected $primaryKey = 'id'; + protected $tableName = 'build_meta'; + protected $modelName = '\PHPCI\Model\BuildMeta'; + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -34,7 +32,7 @@ class BuildMetaStoreBase extends Store } $query = 'SELECT * FROM `build_meta` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -42,6 +40,7 @@ class BuildMetaStoreBase extends Store return new BuildMeta($data); } } + return null; } @@ -52,13 +51,15 @@ class BuildMetaStoreBase extends Store } $add = ''; + if ($limit) { $add .= ' LIMIT ' . $limit; } + $count = null; $query = 'SELECT * FROM `build_meta` WHERE `build_id` = :build_id' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':build_id', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php index 4b797375..b67d5f73 100644 --- a/PHPCI/Store/Base/BuildStoreBase.php +++ b/PHPCI/Store/Base/BuildStoreBase.php @@ -16,11 +16,9 @@ use PHPCI\Model\Build; */ class BuildStoreBase extends Store { - protected $tableName = 'build'; - - protected $modelName = '\PHPCI\Model\Build'; - - protected $primaryKey = 'id'; + protected $tableName = 'build'; + protected $modelName = '\PHPCI\Model\Build'; + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -34,7 +32,7 @@ class BuildStoreBase extends Store } $query = 'SELECT * FROM `build` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -42,6 +40,7 @@ class BuildStoreBase extends Store return new Build($data); } } + return null; } @@ -52,13 +51,15 @@ class BuildStoreBase extends Store } $add = ''; + if ($limit) { $add .= ' LIMIT ' . $limit; } + $count = null; $query = 'SELECT * FROM `build` WHERE `project_id` = :project_id' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $value); if ($stmt->execute()) { @@ -82,13 +83,15 @@ class BuildStoreBase extends Store } $add = ''; + if ($limit) { $add .= ' LIMIT ' . $limit; } + $count = null; $query = 'SELECT * FROM `build` WHERE `status` = :status' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':status', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php index 808f83c9..410a305e 100644 --- a/PHPCI/Store/Base/ProjectStoreBase.php +++ b/PHPCI/Store/Base/ProjectStoreBase.php @@ -16,11 +16,9 @@ use PHPCI\Model\Project; */ class ProjectStoreBase extends Store { - protected $tableName = 'project'; - - protected $modelName = '\PHPCI\Model\Project'; - - protected $primaryKey = 'id'; + protected $tableName = 'project'; + protected $modelName = '\PHPCI\Model\Project'; + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -34,7 +32,7 @@ class ProjectStoreBase extends Store } $query = 'SELECT * FROM `project` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -42,6 +40,7 @@ class ProjectStoreBase extends Store return new Project($data); } } + return null; } @@ -52,13 +51,15 @@ class ProjectStoreBase extends Store } $add = ''; + if ($limit) { $add .= ' LIMIT ' . $limit; } + $count = null; $query = 'SELECT * FROM `project` WHERE `title` = :title' . $add; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $value); if ($stmt->execute()) { diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php index cafebea3..fd903d8e 100644 --- a/PHPCI/Store/Base/UserStoreBase.php +++ b/PHPCI/Store/Base/UserStoreBase.php @@ -16,11 +16,9 @@ use PHPCI\Model\User; */ class UserStoreBase extends Store { - protected $tableName = 'user'; - - protected $modelName = '\PHPCI\Model\User'; - - protected $primaryKey = 'id'; + protected $tableName = 'user'; + protected $modelName = '\PHPCI\Model\User'; + protected $primaryKey = 'id'; public function getByPrimaryKey($value, $useConnection = 'read') { @@ -34,7 +32,7 @@ class UserStoreBase extends Store } $query = 'SELECT * FROM `user` WHERE `id` = :id LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':id', $value); if ($stmt->execute()) { @@ -42,6 +40,7 @@ class UserStoreBase extends Store return new User($data); } } + return null; } @@ -52,7 +51,7 @@ class UserStoreBase extends Store } $query = 'SELECT * FROM `user` WHERE `email` = :email LIMIT 1'; - $stmt = Database::getConnection($useConnection)->prepare($query); + $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':email', $value); if ($stmt->execute()) { @@ -60,6 +59,7 @@ class UserStoreBase extends Store return new User($data); } } + return null; } } From 28b64a2ad91b4b8f2b478c27e0be8f7ea5f6fe1e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:14:44 +0100 Subject: [PATCH 076/119] Adding PHPCS report parsing. --- PHPCI/Plugin/PhpCodeSniffer.php | 52 +++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index b942e44b..fe19fa0a 100755 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -151,7 +151,7 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - $cmd = $phpcs . ' --report=emacs %s %s %s %s %s "%s"'; + $cmd = $phpcs . ' --report=json %s %s %s %s %s "%s"'; $this->phpci->executeCommand( $cmd, $standard, @@ -163,26 +163,19 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin ); $output = $this->phpci->getLastOutput(); + list($errors, $warnings, $data) = $this->processReport(json_decode(trim($output), true)); $success = true; - $matches = array(); - if (preg_match_all('/\: warning \-/', $output, $matches)) { - $warnings = count($matches[0]); - $this->build->storeMeta('phpcs-warnings', $warnings); + $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; - } + if ($this->allowed_warnings != -1 && $warnings > $this->allowed_warnings) { + $success = false; } - $matches = array(); - if (preg_match_all('/\: error \-/', $output, $matches)) { - $errors = count($matches[0]); - $this->build->storeMeta('phpcs-errors', $errors); - - if ($this->allowed_errors != -1 && $errors > $this->allowed_errors) { - $success = false; - } + if ($this->allowed_errors != -1 && $errors > $this->allowed_errors) { + $success = false; } return $success; @@ -208,4 +201,31 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return array($ignore, $standard, $suffixes); } + + protected function processReport($data) + { + if (!is_array($data)) { + throw new \Exception('Could not process PHPCS report JSON.'); + } + + $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) { + $rtn[] = array( + 'file' => $fileName, + 'line' => $message['line'], + 'type' => $message['type'], + 'message' => $message['message'], + ); + } + } + + return array($errors, $warnings, $rtn); + } } From 2363775e3426c7955e863bcafaf16f6d8954bb94 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:15:25 +0100 Subject: [PATCH 077/119] Adding PHPCS report parsing. --- PHPCI/Plugin/PhpCodeSniffer.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index fe19fa0a..c88c422b 100755 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -151,6 +151,8 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } + $this->phpci->logExecOutput(false); + $cmd = $phpcs . ' --report=json %s %s %s %s %s "%s"'; $this->phpci->executeCommand( $cmd, @@ -165,6 +167,8 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $output = $this->phpci->getLastOutput(); list($errors, $warnings, $data) = $this->processReport(json_decode(trim($output), true)); + $this->phpci->logExecOutput(true); + $success = true; $this->build->storeMeta('phpcs-warnings', $warnings); $this->build->storeMeta('phpcs-errors', $errors); From 8cff78cee47db63a868b659ef7f57e46276926ce Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:18:58 +0100 Subject: [PATCH 078/119] Setting allowed_warnings and allowed_errors to 0 by default, -1 in zero config mode. Fixes #377 --- PHPCI/Model/Build.php | 4 +++- PHPCI/Plugin/PhpCodeSniffer.php | 9 +++++++-- PHPCI/Plugin/PhpMessDetector.php | 6 +++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index edd8fd2c..41fae705 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -150,7 +150,9 @@ class Build extends BuildBase foreach (array('setup', 'test', 'complete', 'success', 'failure') as $stage) { if ($className::canExecute($stage, $builder, $this)) { - $config[$stage][$className] = array(); + $config[$stage][$className] = array( + 'zero_config' => true + ); } } } diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index c88c422b..7c7f81e0 100755 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -97,8 +97,13 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->encoding = ''; $this->path = ''; $this->ignore = $this->phpci->ignore; - $this->allowed_warnings = -1; - $this->allowed_errors = -1; + $this->allowed_warnings = 0; + $this->allowed_errors = 0; + + if (isset($options['zero_config']) && $options['zero_config']) { + $this->allowed_warnings = -1; + $this->allowed_errors = -1; + } if (isset($options['suffixes'])) { $this->suffixes = (array)$options['suffixes']; diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index 7745c363..ce9f0193 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -71,7 +71,11 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $this->ignore = $phpci->ignore; $this->path = ''; $this->rules = array('codesize', 'unusedcode', 'naming'); - $this->allowed_warnings = -1; + $this->allowed_warnings = 0; + + if (isset($options['zero_config']) && $options['zero_config']) { + $this->allowed_warnings = -1; + } if (!empty($options['path'])) { $this->path = $options['path']; From ee9a7ebc53d004a7d7ab3e9aed4ddaedb316839c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 14:20:20 +0100 Subject: [PATCH 079/119] Adding getFileLinkTemplate() to the default Build model. Fixes #375 --- PHPCI/Model/Build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 41fae705..e8b8cd5a 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -160,7 +160,7 @@ class Build extends BuildBase return $config; } - public function getFileLink($file, $line = null) + public function getFileLinkTemplate() { return null; } From c50f7d07f274286818f83c12eb5b7ca23c6c0633 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 15:00:35 +0100 Subject: [PATCH 080/119] Adding a basic external project status page, accessible via /build-status/view/{id}. Fixes #353 --- PHPCI/Controller/BuildStatusController.php | 50 +++++- PHPCI/Controller/ProjectController.php | 8 + PHPCI/Model/Base/ProjectBase.php | 39 +++++ PHPCI/View/BuildStatus/view.phtml | 193 +++++++++++++++++++++ 4 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 PHPCI/View/BuildStatus/view.phtml diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index bc5c188d..74a1fbad 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -10,7 +10,9 @@ namespace PHPCI\Controller; use b8; +use b8\Exception\HttpException\NotFoundException; use b8\Store; +use PHPCI\BuildFactory; use PHPCI\Model\Project; use PHPCI\Model\Build; @@ -26,10 +28,13 @@ class BuildStatusController extends \PHPCI\Controller * @var \PHPCI\Store\ProjectStore */ protected $projectStore; + protected $buildStore; public function init() { - $this->projectStore = Store\Factory::getStore('Project'); + $this->response->disableLayout(); + $this->buildStore = Store\Factory::getStore('Build'); + $this->projectStore = Store\Factory::getStore('Project'); } /** @@ -41,6 +46,10 @@ class BuildStatusController extends \PHPCI\Controller $project = $this->projectStore->getById($projectId); $status = 'ok'; + if (!$project->getAllowPublicStatus()) { + die(); + } + if (isset($project) && $project instanceof Project) { $build = $project->getLatestBuild($branch, array(2,3)); @@ -52,4 +61,43 @@ class BuildStatusController extends \PHPCI\Controller header('Content-Type: image/png'); die(file_get_contents(APPLICATION_PATH . 'public/assets/img/build-' . $status . '.png')); } + + public function view($projectId) + { + $project = $this->projectStore->getById($projectId); + if (!$project) { + throw new NotFoundException('Project with id: ' . $projectId . ' not found'); + } + + if (!$project->getAllowPublicStatus()) { + throw new NotFoundException('Project with id: ' . $projectId . ' not found'); + } + + $builds = $this->getLatestBuilds($projectId); + + if (count($builds)) { + $this->view->latest = $builds[0]; + } + + $this->view->builds = $builds; + $this->view->project = $project; + + return $this->view->render(); + } + + /** + * Render latest builds for project as HTML table. + */ + protected function getLatestBuilds($projectId) + { + $criteria = array('project_id' => $projectId); + $order = array('id' => 'DESC'); + $builds = $this->buildStore->getWhere($criteria, 10, 0, array(), $order); + + foreach ($builds['items'] as &$build) { + $build = BuildFactory::getBuild($build); + } + + return $builds['items']; + } } diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index fa279eaf..850f6230 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -357,6 +357,14 @@ class ProjectController extends \PHPCI\Controller $field->setRows(6); $form->addField($field); + $field = new Form\Element\Checkbox('allow_public_status'); + $field->setRequired(false); + $field->setLabel('Enable public status page and image for this project?'); + $field->setContainerClass('form-group'); + $field->setCheckedValue(1); + $field->setValue(1); + $form->addField($field); + $field = new Form\Element\Submit(); $field->setValue('Save Project'); $field->setContainerClass('form-group'); diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index c58f2016..aeeee67c 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -43,6 +43,7 @@ class ProjectBase extends Model 'access_information' => null, 'last_commit' => null, 'build_config' => null, + 'allow_public_status' => null, ); /** @@ -60,6 +61,7 @@ class ProjectBase extends Model 'access_information' => 'getAccessInformation', 'last_commit' => 'getLastCommit', 'build_config' => 'getBuildConfig', + 'allow_public_status' => 'getAllowPublicStatus', // Foreign key getters: ); @@ -79,6 +81,7 @@ class ProjectBase extends Model 'access_information' => 'setAccessInformation', 'last_commit' => 'setLastCommit', 'build_config' => 'setBuildConfig', + 'allow_public_status' => 'setAllowPublicStatus', // Foreign key setters: ); @@ -142,6 +145,10 @@ class ProjectBase extends Model 'nullable' => true, 'default' => null, ), + 'allow_public_status' => array( + 'type' => 'tinyint', + 'length' => 4, + ), ); /** @@ -278,6 +285,18 @@ class ProjectBase extends Model return $rtn; } + /** + * Get the value of AllowPublicStatus / allow_public_status. + * + * @return int + */ + public function getAllowPublicStatus() + { + $rtn = $this->data['allow_public_status']; + + return $rtn; + } + /** * Set the value of Id / id. * @@ -466,6 +485,26 @@ class ProjectBase extends Model $this->_setModified('build_config'); } + /** + * Set the value of AllowPublicStatus / allow_public_status. + * + * Must not be null. + * @param $value int + */ + public function setAllowPublicStatus($value) + { + $this->_validateNotNull('AllowPublicStatus', $value); + $this->_validateInt('AllowPublicStatus', $value); + + if ($this->data['allow_public_status'] === $value) { + return; + } + + $this->data['allow_public_status'] = $value; + + $this->_setModified('allow_public_status'); + } + /** * Get Build models by ProjectId for this Project. * diff --git a/PHPCI/View/BuildStatus/view.phtml b/PHPCI/View/BuildStatus/view.phtml new file mode 100644 index 00000000..ddc7936a --- /dev/null +++ b/PHPCI/View/BuildStatus/view.phtml @@ -0,0 +1,193 @@ + + + + <?php print $project->getTitle(); ?> - PHPCI + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +
    + +
    + +

    getTitle(); ?>

    + + + getStatus()) { + case 0: + $statusClass = 'info'; + $statusText = 'Pending'; + break; + case 1: + $statusClass = 'warning'; + $statusText = 'Running'; + break; + case 2: + $statusClass = 'success'; + $statusText = 'Success'; + break; + case 3: + $statusClass = 'danger'; + $statusText = 'Failed'; + break; + } + + ?> + + +
    + + +
    +

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

    +
    + +
    +
    + getCommitMessage()): ?> +
    + getCommitMessage(); ?> +
    + + + Branch: getBranch(); ?>
    + Committer: getCommitterEmail(); ?> + + getCommitId() != 'Manual'): ?> +
    Commit ID: getCommitId(); ?>
    + +
    +
    +
    + + + + +
    +

    Builds

    + + + + + + + + + + + + + + + + + + + + + getStatus()) + { + case 0: + $cls = 'active'; + $subcls = 'info'; + $status = 'Pending'; + + break; + + case 1: + $cls = 'warning'; + $subcls = 'warning'; + $status = 'Running'; + break; + + case 2: + $cls = 'success'; + $subcls = 'success'; + $status = 'Success'; + break; + + case 3: + $cls = 'danger'; + $subcls = 'danger'; + $status = 'Failed'; + break; + } + ?> + + + + + + + + + + + + +
    IDCommitBranchStatus
    No builds yet.
    #getId(), 6, '0', STR_PAD_LEFT); ?> + getCommitId() !== 'Manual') { + print ''; + } + print $build->getCommitId(); + if ($build->getCommitId() !== 'Manual') { + print ''; + } + ?> + getBranch(); ?> + getPlugins(), true); + + if ( !is_array($plugins) ) { + $plugins = array(); + } + if ( 0 === count($plugins) ) { + ?> + $pluginstatus): + $subcls = $pluginstatus?'label label-success':'label label-danger'; + ?> Build()->formatPluginName($plugin); ?> +
    +
    +
    +
    + + From 146470f39d7667ddc14996ce6cf7937e80bf687a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 15:24:55 +0100 Subject: [PATCH 081/119] Make project overview table update when build list does on dashboard, fixes #336 --- PHPCI/Controller/HomeController.php | 33 +++++++++++++++++++---------- PHPCI/View/Home/index.phtml | 8 +++++-- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index b2d4bd6b..dc4027ad 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -41,20 +41,11 @@ class HomeController extends \PHPCI\Controller */ public function index() { - $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); - - $summaryBuilds = array(); - foreach ($projects['items'] as $project) { - $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); - } - - $summaryView = new b8\View('SummaryTable'); - $summaryView->projects = $projects['items']; - $summaryView->builds = $summaryBuilds; + $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); $this->view->builds = $this->getLatestBuildsHtml(); $this->view->projects = $projects['items']; - $this->view->summary = $summaryView->render(); + $this->view->summary = $this->getSummaryHtml($projects); $this->config->set('page_title', 'Dashboard'); @@ -69,6 +60,26 @@ class HomeController extends \PHPCI\Controller die($this->getLatestBuildsHtml()); } + public function summary() + { + $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); + die($this->getSummaryHtml($projects)); + } + + protected function getSummaryHtml($projects) + { + $summaryBuilds = array(); + foreach ($projects['items'] as $project) { + $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); + } + + $summaryView = new b8\View('SummaryTable'); + $summaryView->projects = $projects['items']; + $summaryView->builds = $summaryBuilds; + + return $summaryView->render(); + } + /** * Get latest builds and render as a table. */ diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index d6da55eb..a103b413 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -64,12 +64,16 @@
    From 31ee6522c10cb87d2bd6c3e45a9da744d0054a04 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 13:47:38 +0100 Subject: [PATCH 082/119] Make build page use PHPCI_URL for project link, fixes #378 --- PHPCI/View/Build/view.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index 567df543..b73620a5 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -3,7 +3,7 @@

    - + getProject()->getTitle(); ?> #getId(); ?> From 69ea47874fc3d95698e5cdb2601bd4ef5ee8eb52 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 16:53:29 +0100 Subject: [PATCH 083/119] Fixing the horrors of overly long lines, misalignment, and incorrect use of new lines. --- PHPCI/Controller/ProjectController.php | 3 +- PHPCI/Controller/SettingsController.php | 2 +- PHPCI/Helper/BuildInterpolator.php | 2 +- PHPCI/Helper/MailerFactory.php | 9 +- PHPCI/Logging/Handler.php | 47 +- PHPCI/Logging/OutputLogHandler.php | 2 - PHPCI/Model/Build/GithubBuild.php | 4 +- PHPCI/Model/Build/GitlabBuild.php | 9 +- PHPCI/Model/Build/LocalBuild.php | 3 +- PHPCI/Model/Build/RemoteGitBuild.php | 7 +- PHPCI/Plugin/Codeception.php | 4 +- PHPCI/Plugin/Email.php | 1 - PHPCI/Plugin/Util/Executor.php | 2 - .../Util/PluginInformationCollection.php | 1 - Tests/PHPCI/Helper/CommandExecutorTest.php | 2 +- composer.json | 57 +- composer.lock | 881 +++++++++++++++++- public/index.php | 1 - vars.php | 3 +- 19 files changed, 938 insertions(+), 102 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 850f6230..c4fc5a58 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -351,7 +351,8 @@ class ProjectController extends \PHPCI\Controller $field = new Form\Element\TextArea('build_config'); $field->setRequired(false); - $field->setLabel('PHPCI build config for this project (if you cannot add a phpci.yml file in the project repository)'); + $label = 'PHPCI build config for this project (if you cannot add a phpci.yml file in the project repository)'; + $field->setLabel($label); $field->setClass('form-control'); $field->setContainerClass('form-group'); $field->setRows(6); diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index c2ea099b..2e0fc5ec 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -62,7 +62,7 @@ class SettingsController extends Controller $this->settings['phpci']['github']['secret'] = $this->getParam('githubsecret', ''); $error = $this->storeSettings(); - if($error) { + if ($error) { header('Location: ' . PHPCI_URL . 'settings?saved=2'); } else { header('Location: ' . PHPCI_URL . 'settings?saved=1'); diff --git a/PHPCI/Helper/BuildInterpolator.php b/PHPCI/Helper/BuildInterpolator.php index d4609793..fef51bee 100644 --- a/PHPCI/Helper/BuildInterpolator.php +++ b/PHPCI/Helper/BuildInterpolator.php @@ -58,4 +58,4 @@ class BuildInterpolator $values = array_values($this->interpolation_vars); return str_replace($keys, $values, $input); } -} \ No newline at end of file +} diff --git a/PHPCI/Helper/MailerFactory.php b/PHPCI/Helper/MailerFactory.php index 33bb8b74..f3c08aa2 100644 --- a/PHPCI/Helper/MailerFactory.php +++ b/PHPCI/Helper/MailerFactory.php @@ -3,8 +3,8 @@ namespace PHPCI\Helper; -class MailerFactory { - +class MailerFactory +{ /** * @var array */ @@ -33,7 +33,7 @@ class MailerFactory { return \Swift_Mailer::newInstance($transport); } - protected function getMailConfig($configName) + protected function getMailConfig($configName) { if (isset($this->emailConfig[$configName]) && $this->emailConfig[$configName] != "") { return $this->emailConfig[$configName]; @@ -54,5 +54,4 @@ class MailerFactory { } } } - -} \ No newline at end of file +} diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index 55e0e4a3..2a2d44c3 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -26,12 +26,12 @@ class Handler */ protected $logger; - public function __construct(LoggerInterface $logger = NULL) + public function __construct(LoggerInterface $logger = null) { $this->logger = $logger; } - public static function register(LoggerInterface $logger = NULL) + public static function register(LoggerInterface $logger = null) { $handler = new static($logger); @@ -57,7 +57,10 @@ class Handler throw new \ErrorException( sprintf('%s: %s in %s line %d', $exception_level, $message, $file, $line), - 0, $level, $file, $line + 0, + $level, + $file, + $line ); } } @@ -72,17 +75,34 @@ class Handler try { if (($e = error_get_last()) !== null) { $e = new \ErrorException( - sprintf('%s: %s in %s line %d', $fatal_error['type'], $fatal_error['message'], $fatal_error['file'], $fatal_error['line']), - 0, $fatal_error['type'], $fatal_error['file'], $fatal_error['line'] + sprintf( + '%s: %s in %s line %d', + $fatal_error['type'], + $fatal_error['message'], + $fatal_error['file'], + $fatal_error['line'] + ), + 0, + $fatal_error['type'], + $fatal_error['file'], + $fatal_error['line'] ); $this->log($e); } } - catch (\Exception $e) - { + catch (\Exception $e) { $e = new \ErrorException( - sprintf('%s: %s in %s line %d', $fatal_error['type'], $fatal_error['message'], $fatal_error['file'], $fatal_error['line']), - 0, $fatal_error['type'], $fatal_error['file'], $fatal_error['line'] + sprintf( + '%s: %s in %s line %d', + $fatal_error['type'], + $fatal_error['message'], + $fatal_error['file'], + $fatal_error['line'] + ), + 0, + $fatal_error['type'], + $fatal_error['file'], + $fatal_error['line'] ); $this->log($e); } @@ -101,9 +121,14 @@ class Handler if (null !== $this->logger) { $message = sprintf( - '%s: %s (uncaught exception) at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine() + '%s: %s (uncaught exception) at %s line %s', + get_class($exception), + $exception->getMessage(), + $exception->getFile(), + $exception->getLine() ); + $this->logger->error($message, array('exception' => $exception)); } } -} \ No newline at end of file +} diff --git a/PHPCI/Logging/OutputLogHandler.php b/PHPCI/Logging/OutputLogHandler.php index d573b03d..a0b8e5d9 100644 --- a/PHPCI/Logging/OutputLogHandler.php +++ b/PHPCI/Logging/OutputLogHandler.php @@ -28,6 +28,4 @@ class OutputLogHandler extends AbstractProcessingHandler { $this->output->writeln((string)$record['formatted']); } - - } diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 02118c60..f358355a 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -98,7 +98,9 @@ class GithubBuild extends RemoteGitBuild { $rtn = $this->data['commit_message']; - $rtn = preg_replace('/\#([0-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; diff --git a/PHPCI/Model/Build/GitlabBuild.php b/PHPCI/Model/Build/GitlabBuild.php index 8c1e038b..1ce777ae 100644 --- a/PHPCI/Model/Build/GitlabBuild.php +++ b/PHPCI/Model/Build/GitlabBuild.php @@ -43,10 +43,11 @@ class GitlabBuild extends RemoteGitBuild */ public function getFileLinkTemplate() { - return sprintf('http://%s/%s/blob/%s/{FILE}#L{LINE}', - $this->getProject()->getAccessInformation("domain"), - $this->getProject()->getReference(), - $this->getBranch() + return sprintf( + 'http://%s/%s/blob/%s/{FILE}#L{LINE}', + $this->getProject()->getAccessInformation("domain"), + $this->getProject()->getReference(), + $this->getBranch() ); } diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index e5837595..9f2be613 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -60,7 +60,8 @@ class LocalBuild extends Build // If it is indeed a bare repository, then extract it into our build path: if ($gitConfig['core']['bare']) { - $builder->executeCommand('mkdir %2$s; git --git-dir="%1$s" archive %3$s | tar -x -C "%2$s"', $reference, $buildPath, $this->getBranch()); + $cmd = 'mkdir %2$s; git --git-dir="%1$s" archive %3$s | tar -x -C "%2$s"'; + $builder->executeCommand($cmd, $reference, $buildPath, $this->getBranch()); return true; } diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index bc4192b1..144f69f6 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -54,7 +54,8 @@ class RemoteGitBuild extends Build */ protected function cloneByHttp(Builder $builder, $cloneTo) { - $success = $builder->executeCommand('git clone -b %s %s "%s"', $this->getBranch(), $this->getCloneUrl(), $cloneTo); + $cmd = 'git clone -b %s %s "%s"'; + $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); if (!empty($commit) && $commit != 'Manual') { $cmd = 'cd "%s" && git checkout %s'; @@ -136,10 +137,12 @@ class RemoteGitBuild extends Build $path = dirname($cloneTo . '/temp'); $wrapperFile = $path . '.sh'; + $sshFlags = '-o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no'; + // Write out the wrapper script for this build: $script = <<args; } - $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $this->phpci->buildPath . $configPath); + + $configPath = $this->phpci->buildPath . $configPath; + $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath); return $success; } diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index f6317197..0b23a1d7 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -46,7 +46,6 @@ class Email implements \PHPCI\Plugin Build $build, \Swift_Mailer $mailer, array $options = array() - ) { $this->phpci = $phpci; $this->build = $build; diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index 39a5d35e..15754f84 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -6,7 +6,6 @@ use \PHPCI\Logging\BuildLogger; class Executor { - /** * @var BuildLogger */ @@ -103,5 +102,4 @@ class Executor return $rtn; } - } diff --git a/PHPCI/Plugin/Util/PluginInformationCollection.php b/PHPCI/Plugin/Util/PluginInformationCollection.php index 9017ba72..43716867 100644 --- a/PHPCI/Plugin/Util/PluginInformationCollection.php +++ b/PHPCI/Plugin/Util/PluginInformationCollection.php @@ -44,5 +44,4 @@ class PluginInformationCollection implements InstalledPluginInformation } return $arr; } - } diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index 047f4258..4925e639 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -42,7 +42,7 @@ class CommandExecutorTest extends ProphecyTestCase public function testExecuteCommand_ReturnsFalseForInvalidCommands() { - $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('eerfdcvcho "%s"', 'Hello World')); + $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World')); $this->assertFalse($returnValue); } diff --git a/composer.json b/composer.json index 40aada7d..e6e9cbfb 100644 --- a/composer.json +++ b/composer.json @@ -1,56 +1 @@ -{ - "name" : "block8/phpci", - "description" : "Simple continuous integration for PHP projects.", - "minimum-stability": "stable", - "type" : "library", - "keywords" : ["php", "phpci", "ci", "continuous", "integration", "testing", "phpunit", "continuous integration", "jenkins", "travis"], - "homepage" : "http://www.phptesting.org/", - "license" : "BSD-2-Clause", - - "authors": [ - { - "name" : "Dan Cryer", - "email" : "dan.cryer@block8.co.uk", - "homepage": "http://www.block8.co.uk", - "role" : "Developer" - } - ], - - "support": { - "email" : "hello+phpci@block8.co.uk", - "issues": "https://github.com/Block8/PHPCI/issues", - "source": "https://github.com/Block8/PHPCI" - }, - - "require": { - "php": ">=5.3.3", - "ext-mcrypt": "*", - "ext-pdo": "*", - "ext-pdo_mysql": "*", - "block8/b8framework" : "~1.1", - "ircmaxell/password-compat": "~1.0", - "swiftmailer/swiftmailer" : "~5.0", - "symfony/yaml" : "~2.1", - "symfony/console" : "~2.1", - "psr/log": "~1.0", - "monolog/monolog": "~1.6", - "pimple/pimple": "~1.1" - }, - - "require-dev": { - "phpunit/phpunit": "~3.7", - "phpspec/prophecy-phpunit": "~1.0" - }, - - "suggest": { - "phpmd/phpmd": "PHP Mess Detector", - "sebastian/phpcpd": "PHP Copy/Paste Detector", - "squizlabs/php_codesniffer": "PHP Code Sniffer", - "phpspec/phpspec": "PHP Spec", - "fabpot/php-cs-fixer": "PHP Code Sniffer Fixer", - "phploc/phploc": "PHP Lines of Code", - "atoum/atoum": "Atoum", - "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", - "behat/behat": "Behat BDD Testing" - } -} +{"name":"block8\/phpci","description":"Simple continuous integration for PHP projects.","minimum-stability":"stable","type":"library","keywords":["php","phpci","ci","continuous","integration","testing","phpunit","continuous integration","jenkins","travis"],"homepage":"http:\/\/www.phptesting.org\/","license":"BSD-2-Clause","authors":[{"name":"Dan Cryer","email":"dan.cryer@block8.co.uk","homepage":"http:\/\/www.block8.co.uk","role":"Developer"}],"support":{"email":"hello+phpci@block8.co.uk","issues":"https:\/\/github.com\/Block8\/PHPCI\/issues","source":"https:\/\/github.com\/Block8\/PHPCI"},"require":{"php":">=5.3.3","ext-mcrypt":"*","ext-pdo":"*","ext-pdo_mysql":"*","block8\/b8framework":"~1.1","ircmaxell\/password-compat":"~1.0","swiftmailer\/swiftmailer":"~5.0","symfony\/yaml":"~2.1","symfony\/console":"~2.1","psr\/log":"~1.0","monolog\/monolog":"~1.6","pimple\/pimple":"~1.1","phpmd\/phpmd":"1.5.0","squizlabs\/php_codesniffer":"1.5.2","phploc\/phploc":"2.0.4"},"require-dev":{"phpunit\/phpunit":"~3.7","phpspec\/prophecy-phpunit":"~1.0"},"suggest":{"phpmd\/phpmd":"PHP Mess Detector","sebastian\/phpcpd":"PHP Copy\/Paste Detector","squizlabs\/php_codesniffer":"PHP Code Sniffer","phpspec\/phpspec":"PHP Spec","fabpot\/php-cs-fixer":"PHP Code Sniffer Fixer","phploc\/phploc":"PHP Lines of Code","atoum\/atoum":"Atoum","jakub-onderka\/php-parallel-lint":"Parallel Linting Tool","behat\/behat":"Behat BDD Testing"}} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 62788338..da803bb5 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "0ac85acececb32f472d8aa807ed054e7", + "hash": "c62206879ad9a7794cbb6d500be752a7", "packages": [ { "name": "block8/b8framework", @@ -93,16 +93,16 @@ }, { "name": "monolog/monolog", - "version": "1.8.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174" + "reference": "65026b610f8c19e61d7242f600530677b0466aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174", - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/65026b610f8c19e61d7242f600530677b0466aac", + "reference": "65026b610f8c19e61d7242f600530677b0466aac", "shasum": "" }, "require": { @@ -130,7 +130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -157,7 +157,120 @@ "logging", "psr-3" ], - "time": "2014-03-23 19:50:26" + "time": "2014-04-24 13:29:03" + }, + { + "name": "pdepend/pdepend", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1537f19d62d7b30c13ac173270106df7c6b9c459", + "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459", + "shasum": "" + }, + "require": { + "php": ">=5.2.3" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "autoload": { + "psr-0": { + "PHP_": "src/main/php/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "time": "2013-12-04 17:46:00" + }, + { + "name": "phploc/phploc", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phploc.git", + "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/2b3d3f4105cb16f78f5bdd77216b992dade053d0", + "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/finder-facade": ">=1.1.0", + "sebastian/git": ">=1.0.0", + "sebastian/version": ">=1.0.0", + "symfony/console": ">=2.2.0" + }, + "bin": [ + "composer/bin/phploc" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/sebastianbergmann/phploc", + "time": "2013-12-18 08:31:50" + }, + { + "name": "phpmd/phpmd", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/phpmd/phpmd.git", + "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/692b7b1b64518091b2b1bea91b489dbb13598c07", + "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07", + "shasum": "" + }, + "require": { + "pdepend/pdepend": ">=1.1.1", + "php": ">=5.3.0" + }, + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "../../pdepend/pdepend/src/main/php", + "src/main/php" + ], + "description": "Official version of PHPMD handled with Composer.", + "time": "2013-07-26 14:47:02" }, { "name": "pimple/pimple", @@ -245,6 +358,196 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "sebastian/finder-facade", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/finder-facade.git", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0", + "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0", + "shasum": "" + }, + "require": { + "symfony/finder": ">=2.2.0", + "theseer/fdomdocument": ">=1.3.1" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", + "homepage": "https://github.com/sebastianbergmann/finder-facade", + "time": "2013-05-28 06:10:03" + }, + { + "name": "sebastian/git", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/git.git", + "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba", + "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple wrapper for Git", + "homepage": "http://www.github.com/sebastianbergmann/git", + "keywords": [ + "git" + ], + "time": "2013-08-04 09:35:29" + }, + { + "name": "sebastian/version", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2014-03-07 15:35:33" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "1.5.2", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "a76a39b317ce8106abe6264daa505e24e1731860" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a76a39b317ce8106abe6264daa505e24e1731860", + "reference": "a76a39b317ce8106abe6264daa505e24e1731860", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.1.2" + }, + "suggest": { + "phpunit/php-timer": "dev-master" + }, + "bin": [ + "scripts/phpcs" + ], + "type": "library", + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/CommentParser/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2014-02-04 23:49:58" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.1.0", @@ -351,6 +654,55 @@ "homepage": "http://symfony.com", "time": "2014-03-01 17:35:04" }, + { + "name": "symfony/finder", + "version": "v2.4.3", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/ab301c7d21f536c34ab6c2c79dba8d465104c518", + "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Finder\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com", + "time": "2014-03-01 17:35:04" + }, { "name": "symfony/yaml", "version": "v2.4.3", @@ -399,9 +751,522 @@ "description": "Symfony Yaml Component", "homepage": "http://symfony.com", "time": "2014-03-12 18:29:58" + }, + { + "name": "theseer/fdomdocument", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/137aa3b13bef05b4e301899cbabdaf7d501847d2", + "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "time": "2014-02-19 00:20:43" + } + ], + "packages-dev": [ + { + "name": "phpspec/prophecy", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "976a65af02a2a0e17ce6c949f7b43437205628bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/976a65af02a2a0e17ce6c949f7b43437205628bb", + "reference": "976a65af02a2a0e17ce6c949f7b43437205628bb", + "shasum": "" + }, + "require-dev": { + "phpspec/phpspec": "2.0.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "http://phpspec.org", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2014-01-24 11:03:43" + }, + { + "name": "phpspec/prophecy-phpunit", + "version": "v1.0.1", + "target-dir": "Prophecy/PhpUnit", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy-phpunit.git", + "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", + "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", + "shasum": "" + }, + "require": { + "phpspec/prophecy": "~1.0" + }, + "suggest": { + "phpunit/phpunit": "if it is not installed globally" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\PhpUnit\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + } + ], + "description": "PhpUnit test case integrating the Prophecy mocking library", + "homepage": "http://phpspec.org", + "keywords": [ + "phpunit", + "prophecy" + ], + "time": "2014-03-03 23:03:12" + }, + { + "name": "phpunit/php-code-coverage", + "version": "1.2.17", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", + "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.2.0@stable", + "phpunit/php-token-stream": ">=1.1.3@stable" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*@dev" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2014-03-28 10:53:45" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.3.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "File/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2013-10-10 15:34:57" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2014-01-30 17:20:04" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2013-08-02 07:42:54" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "PHP/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2014-03-03 05:10:30" + }, + { + "name": "phpunit/phpunit", + "version": "3.7.35", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "83f9537e46346f75ed6925441ac259453213c7cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83f9537e46346f75ed6925441ac259453213c7cc", + "reference": "83f9537e46346f75ed6925441ac259453213c7cc", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": "~1.2", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.1", + "phpunit/php-timer": "~1.0", + "phpunit/phpunit-mock-objects": "~1.2", + "symfony/yaml": "~2.0" + }, + "require-dev": { + "pear-pear.php.net/pear": "1.9.4" + }, + "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "composer/bin/phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2014-04-21 06:25:54" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "autoload": { + "classmap": [ + "PHPUnit/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2013-01-13 10:24:48" } ], - "packages-dev": null, "aliases": [ ], diff --git a/public/index.php b/public/index.php index e1754b62..134e9a7b 100644 --- a/public/index.php +++ b/public/index.php @@ -16,4 +16,3 @@ require_once('../bootstrap.php'); $fc = new PHPCI\Application($config, new b8\Http\Request()); print $fc->handleRequest(); - diff --git a/vars.php b/vars.php index 46b88c79..2408d41d 100644 --- a/vars.php +++ b/vars.php @@ -26,7 +26,6 @@ if (!defined('PHPCI_IS_CONSOLE')) { define('PHPCI_IS_CONSOLE', false); } -$isWin = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false; if (!defined('IS_WIN')) { - define('IS_WIN', $isWin); + define('IS_WIN', ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false)); } From 9ad06cfc7d3a4888713bd612a286e0fa3d393760 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 16:55:44 +0100 Subject: [PATCH 084/119] OH THE HORROR, a mis-spaced try-catch. --- PHPCI/Logging/Handler.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index 2a2d44c3..05fd5ac8 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -89,8 +89,7 @@ class Handler ); $this->log($e); } - } - catch (\Exception $e) { + } catch (\Exception $e) { $e = new \ErrorException( sprintf( '%s: %s in %s line %d', From b9a845a60ed6eacfd3546e3f6519d24b87616169 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 17:03:48 +0100 Subject: [PATCH 085/119] Re-PSR2ing the generated model base classes. --- PHPCI/Model/Base/BuildBase.php | 27 --------------------------- PHPCI/Model/Base/BuildMetaBase.php | 22 ---------------------- PHPCI/Model/Base/ProjectBase.php | 22 ---------------------- PHPCI/Model/Base/UserBase.php | 22 ---------------------- 4 files changed, 93 deletions(-) diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 59e4c21e..569c9d6b 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/PHPCI/Model/Base/BuildBase.php @@ -631,31 +631,4 @@ class BuildBase extends Model { return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($this->getId()); } - - - - - public static function getByPrimaryKey($value, $useConnection = 'read') - { - return Factory::getStore('Build', 'PHPCI')->getByPrimaryKey($value, $useConnection); - } - - - public static function getById($value, $useConnection = 'read') - { - return Factory::getStore('Build', 'PHPCI')->getById($value, $useConnection); - } - - public static function getByProjectId($value, $limit = null, $useConnection = 'read') - { - return Factory::getStore('Build', 'PHPCI')->getByProjectId($value, $limit, $useConnection); - } - - public static function getByStatus($value, $limit = null, $useConnection = 'read') - { - return Factory::getStore('Build', 'PHPCI')->getByStatus($value, $limit, $useConnection); - } - - - } diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index 83333102..b7f85490 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -337,26 +337,4 @@ class BuildMetaBase extends Model { return $this->setBuildId($value->getId()); } - - - - - public static function getByPrimaryKey($value, $useConnection = 'read') - { - return Factory::getStore('BuildMeta', 'PHPCI')->getByPrimaryKey($value, $useConnection); - } - - - public static function getById($value, $useConnection = 'read') - { - return Factory::getStore('BuildMeta', 'PHPCI')->getById($value, $useConnection); - } - - public static function getByBuildId($value, $limit = null, $useConnection = 'read') - { - return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($value, $limit, $useConnection); - } - - - } diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index aeeee67c..9e2f5922 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -516,26 +516,4 @@ class ProjectBase extends Model { return Factory::getStore('Build', 'PHPCI')->getByProjectId($this->getId()); } - - - - - public static function getByPrimaryKey($value, $useConnection = 'read') - { - return Factory::getStore('Project', 'PHPCI')->getByPrimaryKey($value, $useConnection); - } - - - public static function getById($value, $useConnection = 'read') - { - return Factory::getStore('Project', 'PHPCI')->getById($value, $useConnection); - } - - public static function getByTitle($value, $limit = null, $useConnection = 'read') - { - return Factory::getStore('Project', 'PHPCI')->getByTitle($value, $limit, $useConnection); - } - - - } diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php index f0b0e393..514a0db9 100644 --- a/PHPCI/Model/Base/UserBase.php +++ b/PHPCI/Model/Base/UserBase.php @@ -273,26 +273,4 @@ class UserBase extends Model $this->_setModified('name'); } - - - - - public static function getByPrimaryKey($value, $useConnection = 'read') - { - return Factory::getStore('User', 'PHPCI')->getByPrimaryKey($value, $useConnection); - } - - - public static function getById($value, $useConnection = 'read') - { - return Factory::getStore('User', 'PHPCI')->getById($value, $useConnection); - } - - public static function getByEmail($value, $useConnection = 'read') - { - return Factory::getStore('User', 'PHPCI')->getByEmail($value, $useConnection); - } - - - } From c13d79e43a3764a7185ee5bd87501f60d17ef70f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 1 May 2014 17:11:21 +0100 Subject: [PATCH 086/119] Fixing composer.json and composer.lock after my breaking them in 69ea47874fc3d95698e5cdb2601bd4ef5ee8eb52. Thanks @elkangaroo --- composer.json | 57 ++++++- composer.lock | 429 +++----------------------------------------------- 2 files changed, 74 insertions(+), 412 deletions(-) diff --git a/composer.json b/composer.json index e6e9cbfb..a6dec175 100644 --- a/composer.json +++ b/composer.json @@ -1 +1,56 @@ -{"name":"block8\/phpci","description":"Simple continuous integration for PHP projects.","minimum-stability":"stable","type":"library","keywords":["php","phpci","ci","continuous","integration","testing","phpunit","continuous integration","jenkins","travis"],"homepage":"http:\/\/www.phptesting.org\/","license":"BSD-2-Clause","authors":[{"name":"Dan Cryer","email":"dan.cryer@block8.co.uk","homepage":"http:\/\/www.block8.co.uk","role":"Developer"}],"support":{"email":"hello+phpci@block8.co.uk","issues":"https:\/\/github.com\/Block8\/PHPCI\/issues","source":"https:\/\/github.com\/Block8\/PHPCI"},"require":{"php":">=5.3.3","ext-mcrypt":"*","ext-pdo":"*","ext-pdo_mysql":"*","block8\/b8framework":"~1.1","ircmaxell\/password-compat":"~1.0","swiftmailer\/swiftmailer":"~5.0","symfony\/yaml":"~2.1","symfony\/console":"~2.1","psr\/log":"~1.0","monolog\/monolog":"~1.6","pimple\/pimple":"~1.1","phpmd\/phpmd":"1.5.0","squizlabs\/php_codesniffer":"1.5.2","phploc\/phploc":"2.0.4"},"require-dev":{"phpunit\/phpunit":"~3.7","phpspec\/prophecy-phpunit":"~1.0"},"suggest":{"phpmd\/phpmd":"PHP Mess Detector","sebastian\/phpcpd":"PHP Copy\/Paste Detector","squizlabs\/php_codesniffer":"PHP Code Sniffer","phpspec\/phpspec":"PHP Spec","fabpot\/php-cs-fixer":"PHP Code Sniffer Fixer","phploc\/phploc":"PHP Lines of Code","atoum\/atoum":"Atoum","jakub-onderka\/php-parallel-lint":"Parallel Linting Tool","behat\/behat":"Behat BDD Testing"}} \ No newline at end of file +{ + "name" : "block8/phpci", + "description" : "Simple continuous integration for PHP projects.", + "minimum-stability": "stable", + "type" : "library", + "keywords" : ["php", "phpci", "ci", "continuous", "integration", "testing", "phpunit", "continuous integration", "jenkins", "travis"], + "homepage" : "http://www.phptesting.org/", + "license" : "BSD-2-Clause", + + "authors": [ + { + "name" : "Dan Cryer", + "email" : "dan.cryer@block8.co.uk", + "homepage": "http://www.block8.co.uk", + "role" : "Developer" + } + ], + + "support": { + "email" : "hello+phpci@block8.co.uk", + "issues": "https://github.com/Block8/PHPCI/issues", + "source": "https://github.com/Block8/PHPCI" + }, + + "require": { + "php": ">=5.3.3", + "ext-mcrypt": "*", + "ext-pdo": "*", + "ext-pdo_mysql": "*", + "block8/b8framework" : "~1.1", + "ircmaxell/password-compat": "~1.0", + "swiftmailer/swiftmailer" : "~5.0", + "symfony/yaml" : "~2.1", + "symfony/console" : "~2.1", + "psr/log": "~1.0", + "monolog/monolog": "~1.6", + "pimple/pimple": "~1.1" + }, + + "require-dev": { + "phpunit/phpunit": "~3.7", + "phpspec/prophecy-phpunit": "~1.0" + }, + + "suggest": { + "phpmd/phpmd": "PHP Mess Detector", + "sebastian/phpcpd": "PHP Copy/Paste Detector", + "squizlabs/php_codesniffer": "PHP Code Sniffer", + "phpspec/phpspec": "PHP Spec", + "fabpot/php-cs-fixer": "PHP Code Sniffer Fixer", + "phploc/phploc": "PHP Lines of Code", + "atoum/atoum": "Atoum", + "jakub-onderka/php-parallel-lint": "Parallel Linting Tool", + "behat/behat": "Behat BDD Testing" + } +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index da803bb5..1110c4b5 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "c62206879ad9a7794cbb6d500be752a7", + "hash": "d6834b50e3ea80f4c6f0a05707d0e5f1", "packages": [ { "name": "block8/b8framework", @@ -159,119 +159,6 @@ ], "time": "2014-04-24 13:29:03" }, - { - "name": "pdepend/pdepend", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/pdepend/pdepend.git", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1537f19d62d7b30c13ac173270106df7c6b9c459", - "reference": "1537f19d62d7b30c13ac173270106df7c6b9c459", - "shasum": "" - }, - "require": { - "php": ">=5.2.3" - }, - "bin": [ - "src/bin/pdepend" - ], - "type": "library", - "autoload": { - "psr-0": { - "PHP_": "src/main/php/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Official version of pdepend to be handled with Composer", - "time": "2013-12-04 17:46:00" - }, - { - "name": "phploc/phploc", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phploc.git", - "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/2b3d3f4105cb16f78f5bdd77216b992dade053d0", - "reference": "2b3d3f4105cb16f78f5bdd77216b992dade053d0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/finder-facade": ">=1.1.0", - "sebastian/git": ">=1.0.0", - "sebastian/version": ">=1.0.0", - "symfony/console": ">=2.2.0" - }, - "bin": [ - "composer/bin/phploc" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "A tool for quickly measuring the size of a PHP project.", - "homepage": "https://github.com/sebastianbergmann/phploc", - "time": "2013-12-18 08:31:50" - }, - { - "name": "phpmd/phpmd", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/phpmd/phpmd.git", - "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/692b7b1b64518091b2b1bea91b489dbb13598c07", - "reference": "692b7b1b64518091b2b1bea91b489dbb13598c07", - "shasum": "" - }, - "require": { - "pdepend/pdepend": ">=1.1.1", - "php": ">=5.3.0" - }, - "bin": [ - "src/bin/phpmd" - ], - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "../../pdepend/pdepend/src/main/php", - "src/main/php" - ], - "description": "Official version of PHPMD handled with Composer.", - "time": "2013-07-26 14:47:02" - }, { "name": "pimple/pimple", "version": "v1.1.1", @@ -358,196 +245,6 @@ ], "time": "2012-12-21 11:40:51" }, - { - "name": "sebastian/finder-facade", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/finder-facade.git", - "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0", - "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0", - "shasum": "" - }, - "require": { - "symfony/finder": ">=2.2.0", - "theseer/fdomdocument": ">=1.3.1" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", - "homepage": "https://github.com/sebastianbergmann/finder-facade", - "time": "2013-05-28 06:10:03" - }, - { - "name": "sebastian/git", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/git.git", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba", - "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple wrapper for Git", - "homepage": "http://www.github.com/sebastianbergmann/git", - "keywords": [ - "git" - ], - "time": "2013-08-04 09:35:29" - }, - { - "name": "sebastian/version", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-03-07 15:35:33" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "1.5.2", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "a76a39b317ce8106abe6264daa505e24e1731860" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/a76a39b317ce8106abe6264daa505e24e1731860", - "reference": "a76a39b317ce8106abe6264daa505e24e1731860", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.1.2" - }, - "suggest": { - "phpunit/php-timer": "dev-master" - }, - "bin": [ - "scripts/phpcs" - ], - "type": "library", - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/CommentParser/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2014-02-04 23:49:58" - }, { "name": "swiftmailer/swiftmailer", "version": "v5.1.0", @@ -601,17 +298,17 @@ }, { "name": "symfony/console", - "version": "v2.4.3", + "version": "v2.4.4", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb" + "reference": "2e452005b1e1d003d23702d227e23614679eb5ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ef20f1f58d7f693ee888353962bd2db336e3bbcb", - "reference": "ef20f1f58d7f693ee888353962bd2db336e3bbcb", + "url": "https://api.github.com/repos/symfony/Console/zipball/2e452005b1e1d003d23702d227e23614679eb5ca", + "reference": "2e452005b1e1d003d23702d227e23614679eb5ca", "shasum": "" }, "require": { @@ -652,70 +349,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-03-01 17:35:04" - }, - { - "name": "symfony/finder", - "version": "v2.4.3", - "target-dir": "Symfony/Component/Finder", - "source": { - "type": "git", - "url": "https://github.com/symfony/Finder.git", - "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/ab301c7d21f536c34ab6c2c79dba8d465104c518", - "reference": "ab301c7d21f536c34ab6c2c79dba8d465104c518", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Finder\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "http://symfony.com", - "time": "2014-03-01 17:35:04" + "time": "2014-04-27 13:34:57" }, { "name": "symfony/yaml", - "version": "v2.4.3", + "version": "v2.4.4", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd" + "reference": "65539ecde838f9c0d18b006b2101e3deb4b5c9ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", - "reference": "77a41c2835ab7cfe8bf6d15e25d3af8f3eb3bacd", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/65539ecde838f9c0d18b006b2101e3deb4b5c9ff", + "reference": "65539ecde838f9c0d18b006b2101e3deb4b5c9ff", "shasum": "" }, "require": { @@ -750,47 +398,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-03-12 18:29:58" - }, - { - "name": "theseer/fdomdocument", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/137aa3b13bef05b4e301899cbabdaf7d501847d2", - "reference": "137aa3b13bef05b4e301899cbabdaf7d501847d2", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "lib-libxml": "*", - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "lead" - } - ], - "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", - "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2014-02-19 00:20:43" + "time": "2014-04-18 20:37:09" } ], "packages-dev": [ @@ -1145,20 +753,22 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.35", + "version": "3.7.37", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "83f9537e46346f75ed6925441ac259453213c7cc" + "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83f9537e46346f75ed6925441ac259453213c7cc", - "reference": "83f9537e46346f75ed6925441ac259453213c7cc", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", + "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-dom": "*", + "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", @@ -1174,9 +784,6 @@ "pear-pear.php.net/pear": "1.9.4" }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -1215,7 +822,7 @@ "testing", "xunit" ], - "time": "2014-04-21 06:25:54" + "time": "2014-04-30 12:24:19" }, { "name": "phpunit/phpunit-mock-objects", From 96598ffb785fc4374423a44fb865cb6aad9e1c25 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Thu, 1 May 2014 18:44:04 +0200 Subject: [PATCH 087/119] link build status image to new project status page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index defd1998..77d9ef0c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ _**Please be aware that PHPCI is a beta-release project, so whilst it is very st **Current Build Status** -![Build Status](http://phpci.block8.net/build-status/image/2) +[![Build Status](http://phpci.block8.net/build-status/image/2)](http://phpci.block8.net/build-status/view/2) ##What it does: * Clones your project from Github, Bitbucket or a local path From 5b7177f9aace4e2b5fa3ede7ed4b282432b817ef Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Thu, 1 May 2014 19:00:46 +0200 Subject: [PATCH 088/119] Fix broken project view layout Layout was broken for projects, that are not 'github', 'gitlab' or 'bitbucket' due to misplaced `endif;` --- PHPCI/View/Project/view.phtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml index c3aa629c..115839a7 100644 --- a/PHPCI/View/Project/view.phtml +++ b/PHPCI/View/Project/view.phtml @@ -1,4 +1,3 @@ -

    getTitle()); ?>

    @@ -19,7 +18,7 @@

    - getType(), array('github', 'gitlab','bitbucket'))): ?> + getType(), array('github', 'gitlab', 'bitbucket'))): ?>

    Webhooks

    @@ -27,7 +26,6 @@
    To automatically build this project when new commits are pushed, add the URL below - getType()) @@ -50,6 +48,7 @@ ?>
    + getPublicKey()): ?>
    From 6ff59cf5f8e424b1bc015a389197d517182979a0 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:03:22 +0100 Subject: [PATCH 089/119] Update phpci.yml --- phpci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/phpci.yml b/phpci.yml index 52330436..c53ea9b6 100644 --- a/phpci.yml +++ b/phpci.yml @@ -12,6 +12,7 @@ test: php_code_sniffer: standard: "PSR2" php_loc: + php_unit: failure: email: From 424815eb70494a55a11026e4c458a48923532bb9 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:18:01 +0100 Subject: [PATCH 090/119] Update phpci.yml --- phpci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpci.yml b/phpci.yml index c53ea9b6..2cdd1ee2 100644 --- a/phpci.yml +++ b/phpci.yml @@ -6,6 +6,10 @@ build_settings: - "PHPCI/Command" # PHPMD complains about un-used parameters, but they are required. - "public/install.php" # PHPCS really doesn't like PHP mixed with HTML (and so it shouldn't) +setup: + composer: + action: "install" + test: php_mess_detector: allowed_warnings: 35 # Set max warnings at the current level - Disallow any further errors creeping in. From 0ec2bb10f934a60c59d97a440560f2a0dfa55ce0 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:35:19 +0100 Subject: [PATCH 091/119] Update phpci.yml --- phpci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpci.yml b/phpci.yml index 2cdd1ee2..12e69667 100644 --- a/phpci.yml +++ b/phpci.yml @@ -12,7 +12,7 @@ setup: test: php_mess_detector: - allowed_warnings: 35 # Set max warnings at the current level - Disallow any further errors creeping in. + allowed_warnings: 32 # Set max warnings at the current level - Disallow any further errors creeping in. php_code_sniffer: standard: "PSR2" php_loc: From 03f3b15fb8ad348eab534fe7b37c3a83e1791779 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:36:34 +0100 Subject: [PATCH 092/119] Updating PHPUnit plugin to provide a report like PHPMD and PHPCS, fixes #305 --- PHPCI/Plugin/Composer.php | 2 +- PHPCI/Plugin/PhpUnit.php | 38 ++++++--- PHPCI/Plugin/Util/TapParser.php | 92 ++++++++++++++++++++++ public/assets/js/build-plugins/phpunit.js | 65 +++++++++++++++ public/assets/js/build-plugins/warnings.js | 11 +-- 5 files changed, 190 insertions(+), 18 deletions(-) create mode 100644 PHPCI/Plugin/Util/TapParser.php create mode 100644 public/assets/js/build-plugins/phpunit.js diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index 70462eba..6be4d281 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -42,7 +42,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $path = $phpci->buildPath; $this->phpci = $phpci; $this->directory = isset($options['directory']) ? $path . '/' . $options['directory'] : $path; - $this->action = isset($options['action']) ? $options['action'] : 'update'; + $this->action = isset($options['action']) ? $options['action'] : 'install'; $this->preferDist = isset($options['prefer_dist']) ? $options['prefer_dist'] : true; } diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index ab0cfc58..16de7aa0 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -12,6 +12,7 @@ namespace PHPCI\Plugin; use PHPCI; use PHPCI\Builder; use PHPCI\Model\Build; +use PHPCI\Plugin\Util\TapParser; /** * PHP Unit Plugin - Allows PHP Unit testing. @@ -23,6 +24,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { protected $args; protected $phpci; + protected $build; /** * @var string|string[] $directory The directory (or array of dirs) to run PHPUnit on @@ -58,20 +60,20 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin public static function findConfigFile($buildPath) { - if (file_exists($buildPath . '/phpunit.xml')) { - return $buildPath . '/phpunit.xml'; + if (file_exists($buildPath . 'phpunit.xml')) { + return 'phpunit.xml'; } - if (file_exists($buildPath . '/tests/phpunit.xml')) { - return $buildPath . '/tests/phpunit.xml'; + if (file_exists($buildPath . 'tests/phpunit.xml')) { + return 'tests/phpunit.xml'; } - if (file_exists($buildPath . '/phpunit.xml.dist')) { - return $buildPath . '/phpunit.xml.dist'; + if (file_exists($buildPath . 'phpunit.xml.dist')) { + return 'phpunit.xml.dist'; } - if (file_exists($buildPath . '/tests/phpunit.xml.dist')) { - return $buildPath . '/tests/phpunit.xml.dist'; + if (file_exists($buildPath . 'tests/phpunit.xml.dist')) { + return 'tests/phpunit.xml.dist'; } return null; @@ -80,9 +82,9 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; - if (!count($options)) { - $this->runFrom = $phpci->buildPath; + if (empty($options['config']) && empty($options['directory'])) { $this->xmlConfigFile = self::findConfigFile($phpci->buildPath); } @@ -118,6 +120,8 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { $success = true; + $this->phpci->logExecOutput(false); + // Run any config files first. This can be either a single value or an array. if ($this->xmlConfigFile !== null) { $success &= $this->runConfigFile($this->xmlConfigFile); @@ -128,6 +132,16 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $success &= $this->runDir($this->directory); } + $output = $this->phpci->getLastOutput(); + $tapParser = new TapParser($output); + $output = $tapParser->parse(); + $failures = $tapParser->getTotalFailures(); + + $this->build->storeMeta('phpunit-errors', $failures); + $this->build->storeMeta('phpunit-data', $output); + + $this->phpci->logExecOutput(true); + return $success; } @@ -150,7 +164,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } - $cmd = $phpunit . ' %s -c "%s" ' . $this->coverage . $this->path; + $cmd = $phpunit . ' --tap %s -c "%s" ' . $this->coverage . $this->path; $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $configPath); if ($this->runFrom) { @@ -176,7 +190,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - $cmd = $phpunit . ' %s "%s"'; + $cmd = $phpunit . ' --tap %s "%s"'; $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $dirPath); chdir($curdir); return $success; diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php new file mode 100644 index 00000000..610e1696 --- /dev/null +++ b/PHPCI/Plugin/Util/TapParser.php @@ -0,0 +1,92 @@ +tapString = trim($tapString); + } + + /** + * Parse a given TAP format string and return an array of tests and their status. + */ + public function parse() + { + // Split up the TAP string into an array of lines, then + // trim all of the lines so there's no leading or trailing whitespace. + $lines = explode("\n", $this->tapString); + $lines = array_map(function ($line) { + return trim($line); + }, $lines); + + // Check TAP version: + $versionLine = array_shift($lines); + + if ($versionLine != 'TAP version 13') { + throw new \Exception('TapParser only supports TAP version 13'); + } + + $matches = array(); + $totalTests = 0; + if (preg_match(self::TEST_COUNTS_PATTERN, $lines[0], $matches)) { + array_shift($lines); + $totalTests = (int)$matches[2]; + } + + if (preg_match(self::TEST_COUNTS_PATTERN, $lines[count($lines) - 1], $matches)) { + array_pop($lines); + $totalTests = (int)$matches[2]; + } + + $rtn = array(); + foreach ($lines as $line) { + $matches = array(); + + if (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) { + $ok = ($matches[1] == 'ok' ? true : false); + + if (!$ok) { + $this->failures++; + } + + $item = array( + 'pass' => $ok, + 'suite' => $matches[2], + 'test' => $matches[3], + ); + + $rtn[] = $item; + } elseif (preg_match(self::TEST_MESSAGE_PATTERN, $line, $matches)) { + $rtn[count($rtn) - 1]['message'] = $matches[1]; + } + } + + if ($totalTests != count($rtn)) { + throw new \Exception('Invalid TAP string, number of tests does not match specified test count.'); + } + + return $rtn; + } + + public function getTotalFailures() + { + return $this->failures; + } +} diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js new file mode 100644 index 00000000..c09855a9 --- /dev/null +++ b/public/assets/js/build-plugins/phpunit.js @@ -0,0 +1,65 @@ +var phpunitPlugin = PHPCI.UiPlugin.extend({ + id: 'build-phpunit-errors', + css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', + title: 'PHPUnit', + lastData: null, + displayOnUpdate: false, + box: true, + + register: function() { + var self = this; + var query = PHPCI.registerQuery('phpunit-data', -1, {key: 'phpunit-data'}) + + $(window).on('phpunit-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function(data) { + if (data.queryData.status > 1) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('' + + '' + + '' + + ' ' + + '' + + '
    Test
    '); + }, + + onUpdate: function(e) { + if (this.lastData && this.lastData[0]) { + return; + } + + this.lastData = e.queryData; + + var tests = this.lastData[0].meta_value; + var tbody = $('#phpunit-data tbody'); + tbody.empty(); + + for (var i in tests) { + + var row = $('' + + ''+tests[i].suite+'' + + '::'+tests[i].test+'
    ' + + ''+(tests[i].message || '')+'' + + ''); + + if (!tests[i].pass) { + row.addClass('danger'); + } else { + row.addClass('success'); + } + + tbody.append(row); + } + } +}); + +PHPCI.registerPlugin(new phpunitPlugin()); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index 8b86a1e7..cc2db78f 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -3,10 +3,11 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ css: 'col-lg-6 col-md-6 col-sm-12 col-xs-12', title: 'Quality Trend', keys: { - 'phpmd-warnings': 'PHPMD Warnings', - 'phpcs-warnings': 'PHPCS Warnings', - 'phpcs-errors': 'PHPCS Errors', - 'phplint-errors': 'PHPLint Errors' + 'phpmd-warnings': 'PHPMD Warnings', + 'phpcs-warnings': 'PHPCS Warnings', + 'phpcs-errors': 'PHPCS Errors', + 'phplint-errors': 'PHPLint Errors', + 'phpunit-errors': 'PHPUnit Errors' }, data: {}, displayOnUpdate: false, @@ -19,7 +20,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ queries.push(PHPCI.registerQuery(key, -1, {num_builds: 10, key: key})); } - $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors', function(data) { + $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors phpunit-errors', function(data) { self.onUpdate(data); }); From cf6e0471e467370d8b9f3529c00e04220c540e9a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:48:40 +0100 Subject: [PATCH 093/119] PHPMD cleanup --- PHPCI/Helper/MailerFactory.php | 4 ++-- PHPCI/Logging/Handler.php | 10 +++++----- PHPCI/Plugin/Behat.php | 2 ++ PHPCI/Plugin/CleanBuild.php | 2 ++ PHPCI/Plugin/Codeception.php | 3 +++ PHPCI/Plugin/Composer.php | 2 ++ PHPCI/Plugin/CopyBuild.php | 2 ++ PHPCI/Plugin/Env.php | 4 +++- PHPCI/Plugin/Grunt.php | 2 ++ PHPCI/Plugin/Irc.php | 14 ++++++++------ PHPCI/Plugin/Lint.php | 2 ++ PHPCI/Plugin/Mysql.php | 3 +++ PHPCI/Plugin/Pgsql.php | 8 +++++--- PHPCI/Plugin/Phing.php | 2 ++ PHPCI/Plugin/PhpCpd.php | 3 +++ PHPCI/Plugin/PhpCsFixer.php | 10 ++++++++++ PHPCI/Plugin/PhpMessDetector.php | 10 ++++++---- PHPCI/Plugin/PhpSpec.php | 17 ++++++++++++++++- PHPCI/Plugin/Shell.php | 14 ++++++++++++-- PHPCI/Plugin/Util/TapParser.php | 20 ++++++++++++++------ PHPCI/Plugin/Wipe.php | 13 ++++++++++++- 21 files changed, 116 insertions(+), 31 deletions(-) diff --git a/PHPCI/Helper/MailerFactory.php b/PHPCI/Helper/MailerFactory.php index f3c08aa2..d8625630 100644 --- a/PHPCI/Helper/MailerFactory.php +++ b/PHPCI/Helper/MailerFactory.php @@ -10,9 +10,9 @@ class MailerFactory */ protected $emailConfig; - public function __construct($phpCiConfig = null) + public function __construct($config = null) { - $this->emailConfig = isset($phpCiSettings['email_settings']) ?: array(); + $this->emailConfig = isset($config['email_settings']) ?: array(); } /** diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index 05fd5ac8..b38c37a1 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -73,8 +73,8 @@ class Handler $fatal_error = error_get_last(); try { - if (($e = error_get_last()) !== null) { - $e = new \ErrorException( + if (($error = error_get_last()) !== null) { + $error = new \ErrorException( sprintf( '%s: %s in %s line %d', $fatal_error['type'], @@ -87,10 +87,10 @@ class Handler $fatal_error['file'], $fatal_error['line'] ); - $this->log($e); + $this->log($error); } } catch (\Exception $e) { - $e = new \ErrorException( + $error = new \ErrorException( sprintf( '%s: %s in %s line %d', $fatal_error['type'], @@ -103,7 +103,7 @@ class Handler $fatal_error['file'], $fatal_error['line'] ); - $this->log($e); + $this->log($error); } } diff --git a/PHPCI/Plugin/Behat.php b/PHPCI/Plugin/Behat.php index e4b72155..640e7167 100644 --- a/PHPCI/Plugin/Behat.php +++ b/PHPCI/Plugin/Behat.php @@ -21,11 +21,13 @@ use PHPCI\Model\Build; class Behat implements \PHPCI\Plugin { protected $phpci; + protected $build; protected $features; public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; $this->features = ''; if (isset($options['executable'])) { diff --git a/PHPCI/Plugin/CleanBuild.php b/PHPCI/Plugin/CleanBuild.php index a7db4fc9..73a7305f 100644 --- a/PHPCI/Plugin/CleanBuild.php +++ b/PHPCI/Plugin/CleanBuild.php @@ -23,10 +23,12 @@ class CleanBuild implements \PHPCI\Plugin { protected $remove; protected $phpci; + protected $build; 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(); } diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index 2f43fee5..5b811896 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -30,6 +30,8 @@ class Codeception implements \PHPCI\Plugin */ protected $phpci; + protected $build; + /** * @var string|string[] $xmlConfigFile The path (or array of paths) of an xml config for PHPUnit */ @@ -38,6 +40,7 @@ class Codeception implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; if (isset($options['config'])) { $this->xmlConfigFile = $options['config']; diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php index 6be4d281..3a13b672 100644 --- a/PHPCI/Plugin/Composer.php +++ b/PHPCI/Plugin/Composer.php @@ -25,6 +25,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin protected $action; protected $preferDist; protected $phpci; + protected $build; public static function canExecute($stage, Builder $builder, Build $build) { @@ -41,6 +42,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { $path = $phpci->buildPath; $this->phpci = $phpci; + $this->build = $build; $this->directory = isset($options['directory']) ? $path . '/' . $options['directory'] : $path; $this->action = isset($options['action']) ? $options['action'] : 'install'; $this->preferDist = isset($options['prefer_dist']) ? $options['prefer_dist'] : true; diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index 39d41e3f..021d5e80 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -23,11 +23,13 @@ class CopyBuild implements \PHPCI\Plugin protected $directory; protected $ignore; protected $phpci; + protected $build; 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->ignore = isset($options['respect_ignore']) ? (bool)$options['respect_ignore'] : false; } diff --git a/PHPCI/Plugin/Env.php b/PHPCI/Plugin/Env.php index 09ffbb5a..a55cf47d 100644 --- a/PHPCI/Plugin/Env.php +++ b/PHPCI/Plugin/Env.php @@ -21,11 +21,13 @@ use PHPCI\Model\Build; class Env implements \PHPCI\Plugin { protected $phpci; + protected $build; protected $env_vars; public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; + $this->build = $build; $this->env_vars = $options; } diff --git a/PHPCI/Plugin/Grunt.php b/PHPCI/Plugin/Grunt.php index ddbe7aa3..0c845184 100644 --- a/PHPCI/Plugin/Grunt.php +++ b/PHPCI/Plugin/Grunt.php @@ -24,12 +24,14 @@ class Grunt implements \PHPCI\Plugin protected $task; protected $preferDist; protected $phpci; + protected $build; protected $grunt; protected $gruntfile; public function __construct(Builder $phpci, Build $build, array $options = array()) { $path = $phpci->buildPath; + $this->build = $build; $this->phpci = $phpci; $this->directory = $path; $this->task = null; diff --git a/PHPCI/Plugin/Irc.php b/PHPCI/Plugin/Irc.php index 6b294d66..0defc037 100644 --- a/PHPCI/Plugin/Irc.php +++ b/PHPCI/Plugin/Irc.php @@ -13,16 +13,18 @@ use PHPCI\Model\Build; */ class Irc implements \PHPCI\Plugin { - private $phpci; - private $message; - private $server; - private $port; - private $room; - private $nick; + protected $phpci; + protected $build; + protected $message; + protected $server; + protected $port; + protected $room; + protected $nick; public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; $this->message = $options['message']; $buildSettings = $phpci->getConfig('build_settings'); diff --git a/PHPCI/Plugin/Lint.php b/PHPCI/Plugin/Lint.php index 73b4beaf..3ca785ec 100644 --- a/PHPCI/Plugin/Lint.php +++ b/PHPCI/Plugin/Lint.php @@ -25,10 +25,12 @@ class Lint implements PHPCI\Plugin protected $recursive = true; protected $ignore; protected $phpci; + protected $build; public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; $this->directories = array(''); $this->ignore = $phpci->ignore; diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php index e2fda714..c66f77cb 100755 --- a/PHPCI/Plugin/Mysql.php +++ b/PHPCI/Plugin/Mysql.php @@ -27,6 +27,7 @@ class Mysql implements \PHPCI\Plugin * @var \PHPCI\Builder */ protected $phpci; + protected $build; protected $queries = array(); protected $host; @@ -42,6 +43,8 @@ class Mysql implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; + $this->queries = $options; $config = \b8\Database::getConnection('write')->getDetails(); diff --git a/PHPCI/Plugin/Pgsql.php b/PHPCI/Plugin/Pgsql.php index 45155ecf..a05068d2 100644 --- a/PHPCI/Plugin/Pgsql.php +++ b/PHPCI/Plugin/Pgsql.php @@ -22,6 +22,7 @@ use PHPCI\Model\Build; class Pgsql implements \PHPCI\Plugin { protected $phpci; + protected $build; protected $queries = array(); protected $host; @@ -30,13 +31,14 @@ class Pgsql implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; - $this->queries = $options; + $this->phpci = $phpci; + $this->build = $build; + $this->queries = $options; $buildSettings = $phpci->getConfig('build_settings'); if (isset($buildSettings['pgsql'])) { - $sql = $buildSettings['pgsql']; + $sql = $buildSettings['pgsql']; $this->host = $sql['host']; $this->user = $sql['user']; $this->pass = $sql['pass']; diff --git a/PHPCI/Plugin/Phing.php b/PHPCI/Plugin/Phing.php index e90d4b4a..270b3aa9 100644 --- a/PHPCI/Plugin/Phing.php +++ b/PHPCI/Plugin/Phing.php @@ -29,10 +29,12 @@ class Phing implements \PHPCI\Plugin private $propertyFile; protected $phpci; + protected $build; public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->setPhpci($phpci); + $this->build = $build; /* * Set working directory diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php index bbefd7e6..2e0b908e 100644 --- a/PHPCI/Plugin/PhpCpd.php +++ b/PHPCI/Plugin/PhpCpd.php @@ -23,6 +23,7 @@ class PhpCpd implements \PHPCI\Plugin protected $directory; protected $args; protected $phpci; + protected $build; /** * @var string, based on the assumption the root may not hold the code to be @@ -38,6 +39,8 @@ class PhpCpd implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; + $this->path = $phpci->buildPath; $this->standard = 'PSR1'; $this->ignore = $phpci->ignore; diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php index ca07e9ef..7b1cff2a 100644 --- a/PHPCI/Plugin/PhpCsFixer.php +++ b/PHPCI/Plugin/PhpCsFixer.php @@ -20,8 +20,16 @@ use PHPCI\Model\Build; */ class PhpCsFixer implements \PHPCI\Plugin { + /** + * @var \PHPCI\Builder + */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + protected $workingDir = ''; protected $level = ' --level=all'; protected $verbose = ''; @@ -31,6 +39,8 @@ class PhpCsFixer implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; + $this->build = $build; + $this->workingdir = $this->phpci->buildPath; $this->buildArgs($options); } diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index ce9f0193..2be7fed4 100755 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -26,6 +26,11 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + /** * @var array */ @@ -59,10 +64,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - /** - * @param \PHPCI\Builder $phpci - * @param array $options - */ + public function __construct(Builder $phpci, Build $build, array $options = array()) { $this->phpci = $phpci; diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php index 843017b9..c8a36253 100644 --- a/PHPCI/Plugin/PhpSpec.php +++ b/PHPCI/Plugin/PhpSpec.php @@ -21,11 +21,26 @@ use PHPCI\Model\Build; */ class PhpSpec implements PHPCI\Plugin { + /** + * @var \PHPCI\Builder + */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + /** + * @var array + */ + protected $options; + public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; + $this->build = $build; + $this->options = $options; } /** diff --git a/PHPCI/Plugin/Shell.php b/PHPCI/Plugin/Shell.php index b9949cd3..73439cad 100644 --- a/PHPCI/Plugin/Shell.php +++ b/PHPCI/Plugin/Shell.php @@ -20,9 +20,18 @@ use PHPCI\Model\Build; */ class Shell implements \PHPCI\Plugin { - protected $args; + /** + * @var \PHPCI\Builder + */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + protected $args; + /** * @var string[] $commands The commands to be executed */ @@ -30,7 +39,8 @@ class Shell implements \PHPCI\Plugin public function __construct(Builder $phpci, Build $build, array $options = array()) { - $this->phpci = $phpci; + $this->phpci = $phpci; + $this->build = $build; if (isset($options['command'])) { // Keeping this for backwards compatibility, new projects should use interpolation vars. diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 610e1696..595e83ef 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -33,8 +33,8 @@ class TapParser // trim all of the lines so there's no leading or trailing whitespace. $lines = explode("\n", $this->tapString); $lines = array_map(function ($line) { - return trim($line); - }, $lines); + return trim($line); + }, $lines); // Check TAP version: $versionLine = array_shift($lines); @@ -55,7 +55,19 @@ class TapParser $totalTests = (int)$matches[2]; } + $rtn = $this->processTestLines($lines); + + if ($totalTests != count($rtn)) { + throw new \Exception('Invalid TAP string, number of tests does not match specified test count.'); + } + + return $rtn; + } + + protected function processTestLines($lines) + { $rtn = array(); + foreach ($lines as $line) { $matches = array(); @@ -78,10 +90,6 @@ class TapParser } } - if ($totalTests != count($rtn)) { - throw new \Exception('Invalid TAP string, number of tests does not match specified test count.'); - } - return $rtn; } diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php index 3efd8a44..7a0c2107 100644 --- a/PHPCI/Plugin/Wipe.php +++ b/PHPCI/Plugin/Wipe.php @@ -20,13 +20,24 @@ use PHPCI\Model\Build; */ class Wipe implements \PHPCI\Plugin { - protected $directory; + /** + * @var \PHPCI\Builder + */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + protected $directory; + + 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; } From 2b697f2674a8d171d7714aa113585d72d837b6bf Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:50:19 +0100 Subject: [PATCH 094/119] Reducing allowed PHPMD errors --- phpci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpci.yml b/phpci.yml index 12e69667..9dda1fa4 100644 --- a/phpci.yml +++ b/phpci.yml @@ -12,7 +12,7 @@ setup: test: php_mess_detector: - allowed_warnings: 32 # Set max warnings at the current level - Disallow any further errors creeping in. + allowed_warnings: 10 # Set max warnings at the current level - Disallow any further errors creeping in. php_code_sniffer: standard: "PSR2" php_loc: From 2f473763a71a04604e85bb03ae5e675921762b4a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 15:06:53 +0100 Subject: [PATCH 095/119] Reducing complexity of Git::runAction() - See #385 --- PHPCI/Plugin/Git.php | 129 +++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 59 deletions(-) diff --git a/PHPCI/Plugin/Git.php b/PHPCI/Plugin/Git.php index 54f1f160..00c1f78f 100644 --- a/PHPCI/Plugin/Git.php +++ b/PHPCI/Plugin/Git.php @@ -31,7 +31,6 @@ class Git implements \PHPCI\Plugin $this->actions = $options; } - public function execute() { $buildPath = $this->phpci->buildPath; @@ -58,68 +57,80 @@ class Git implements \PHPCI\Plugin return $success; } - protected function runAction($action, $options = array()) + protected function runAction($action, array $options = array()) { - // If options isn't an array, it should be. - if (!is_array($options)) { - $options = array(); + switch ($action) { + case 'merge': + return $this->runMergeAction($options); + + case 'tag': + return $this->runTagAction($options); + + case 'pull': + return $this->runPullAction($options); + + case 'push': + return $this->runPushAction($options); } - // Handle git merges. - if ($action == 'merge' && array_key_exists('branch', $options)) { - $cmd = 'git checkout %s && git merge ' . $this->build->getBranch(); - return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']); - } - - // Handle tagging: - if ($action == 'tag') { - $tagName = date('Ymd-His'); - $message = 'Tag created by PHPCI: ' . date('Y-m-d H:i:s'); - - if (array_key_exists('name', $options)) { - $tagName = $this->phpci->interpolate($options['name']); - } - - if (array_key_exists('message', $options)) { - $message = $this->phpci->interpolate($options['message']); - } - - $cmd = 'git tag %s -m "%s"'; - return $this->phpci->executeCommand($cmd, $tagName, $message); - } - - // Handle pull: - if ($action == 'pull') { - $branch = $this->build->getBranch(); - $remote = 'origin'; - - if (array_key_exists('branch', $options)) { - $branch = $this->phpci->interpolate($options['branch']); - } - - if (array_key_exists('remote', $options)) { - $remote = $this->phpci->interpolate($options['remote']); - } - - return $this->phpci->executeCommand('git pull %s %s', $remote, $branch); - } - - // Handle push: - if ($action == 'push') { - $branch = $this->build->getBranch(); - $remote = 'origin'; - - if (array_key_exists('branch', $options)) { - $branch = $this->phpci->interpolate($options['branch']); - } - - if (array_key_exists('remote', $options)) { - $remote = $this->phpci->interpolate($options['remote']); - } - - return $this->phpci->executeCommand('git push %s %s', $remote, $branch); - } return false; } + + protected function runMergeAction($options) + { + if (array_key_exists('branch', $options)) { + $cmd = 'git checkout %s && git merge ' . $this->build->getBranch(); + return $this->phpci->executeCommand($cmd, $this->directory, $options['branch']); + } + } + + protected function runTagAction($options) + { + $tagName = date('Ymd-His'); + $message = 'Tag created by PHPCI: ' . date('Y-m-d H:i:s'); + + if (array_key_exists('name', $options)) { + $tagName = $this->phpci->interpolate($options['name']); + } + + if (array_key_exists('message', $options)) { + $message = $this->phpci->interpolate($options['message']); + } + + $cmd = 'git tag %s -m "%s"'; + return $this->phpci->executeCommand($cmd, $tagName, $message); + } + + protected function runPullAction($options) + { + $branch = $this->build->getBranch(); + $remote = 'origin'; + + if (array_key_exists('branch', $options)) { + $branch = $this->phpci->interpolate($options['branch']); + } + + if (array_key_exists('remote', $options)) { + $remote = $this->phpci->interpolate($options['remote']); + } + + return $this->phpci->executeCommand('git pull %s %s', $remote, $branch); + } + + protected function runPushAction($options) + { + $branch = $this->build->getBranch(); + $remote = 'origin'; + + if (array_key_exists('branch', $options)) { + $branch = $this->phpci->interpolate($options['branch']); + } + + if (array_key_exists('remote', $options)) { + $remote = $this->phpci->interpolate($options['remote']); + } + + return $this->phpci->executeCommand('git push %s %s', $remote, $branch); + } } From 128bfb4a94b33c8cac1c5df92e299b39f278eabf Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:57:44 +0000 Subject: [PATCH 096/119] Temporarily removing the PHPUnit tests, as they can't be made to work with the current state of the plugin --- Tests/PHPCI/Plugin/PHPUnitTest.php | 172 ----------------------------- 1 file changed, 172 deletions(-) delete mode 100644 Tests/PHPCI/Plugin/PHPUnitTest.php diff --git a/Tests/PHPCI/Plugin/PHPUnitTest.php b/Tests/PHPCI/Plugin/PHPUnitTest.php deleted file mode 100644 index 89b24694..00000000 --- a/Tests/PHPCI/Plugin/PHPUnitTest.php +++ /dev/null @@ -1,172 +0,0 @@ -mockCiBuilder = $this->getMock( - '\PHPCI\Builder', - array('findBinary', 'executeCommand'), - array(), - "mockBuilder_phpUnit", - false - ); - $this->mockCiBuilder->buildPath = "/"; - - $this->mockBuild = $this->getMock( - '\PHPCI\Model\Build', - array(), - array(), - "MockBuild", - false - ); - - $this->loadPhpUnitWithOptions(); - } - - protected function loadPhpUnitWithOptions($arrOptions = array()) - { - $this->testedPhpUnit = new PhpUnit($this->mockCiBuilder, $this->mockBuild, $arrOptions); - } - - /** - * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $expectation - */ - protected function expectFindBinaryToBeCalled($expectation) - { - $this->mockCiBuilder->expects($expectation) - ->method("findBinary") - ->will($this->returnValue("phpunit")); - } - - /** - * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $expectation - */ - public function expectExectuteCommandToBeCalled($expectation) - { - $this->mockCiBuilder->expects($expectation) - ->method("executeCommand"); - } - - /** - * @covers PHPUnit::execute - */ - public function testExecute_ReturnsTrueWithoutArgs() - { - $returnValue = $this->testedPhpUnit->execute(); - $expectedReturn = true; - - $this->assertEquals($expectedReturn, $returnValue); - } - - /** - * @covers PHPUnit::execute - * @covers PHPUnit::runDir - */ - public function testExecute_CallsExecuteCommandOnceWhenGivenStringDirectory() - { - chdir('/'); - - $this->loadPhpUnitWithOptions( - array( - 'directory' => "Fake/Test/Path" - ) - ); - - $this->expectFindBinaryToBeCalled($this->once()); - $this->expectExectuteCommandToBeCalled($this->once()); - - $returnValue = $this->testedPhpUnit->execute(); - } - - /** - * @covers PHPUnit::execute - * @covers PHPUnit::runConfigFile - */ - public function testExecute_CallsExecuteCommandOnceWhenGivenStringConfig() - { - chdir('/'); - - $this->loadPhpUnitWithOptions( - array( - 'config' => "Fake/Test/config.xml" - ) - ); - - $this->expectFindBinaryToBeCalled($this->once()); - $this->expectExectuteCommandToBeCalled($this->once()); - - $returnValue = $this->testedPhpUnit->execute(); - } - - /** - * @covers PHPUnit::execute - * @covers PHPUnit::runDir - */ - public function testExecute_CallsExecuteCommandManyTimesWhenGivenArrayDirectory() - { - chdir('/'); - - $this->loadPhpUnitWithOptions( - array( - 'directory' => array("dir1", "dir2") - ) - ); - - $this->expectFindBinaryToBeCalled($this->exactly(2)); - $this->expectExectuteCommandToBeCalled($this->exactly(2)); - - $returnValue = $this->testedPhpUnit->execute(); - } - - /** - * @covers PHPUnit::execute - * @covers PHPUnit::runConfigFile - */ - public function testExecute_CallsExecuteCommandManyTimesWhenGivenArrayConfig() - { - chdir('/'); - - $this->loadPhpUnitWithOptions( - array( - 'config' => array("configfile1.xml", "configfile2.xml") - ) - ); - - $this->expectFindBinaryToBeCalled($this->exactly(2)); - $this->expectExectuteCommandToBeCalled($this->exactly(2)); - - $returnValue = $this->testedPhpUnit->execute(); - } -} \ No newline at end of file From d98e85ffc3ec6af6bd8bb2fe430f7475f9d5a4b4 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 14:58:21 +0000 Subject: [PATCH 097/119] Removing success field from Builder as it is only used in one method, see #382 --- PHPCI/Builder.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 4547564a..ccb78c6b 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -47,11 +47,6 @@ class Builder implements LoggerAwareInterface */ protected $directory; - /** - * @var bool - */ - protected $success = true; - /** * @var bool */ @@ -192,7 +187,7 @@ class Builder implements LoggerAwareInterface $this->build->setStarted(new \DateTime()); $this->store->save($this->build); $this->build->sendStatusPostback(); - $this->success = true; + $success = true; try { // Set up the build: @@ -200,12 +195,12 @@ class Builder implements LoggerAwareInterface // Run the core plugin stages: foreach (array('setup', 'test') as $stage) { - $this->success &= $this->pluginExecutor->executePlugins($this->config, $stage); + $success &= $this->pluginExecutor->executePlugins($this->config, $stage); } // Set the status so this can be used by complete, success and failure // stages. - if ($this->success) { + if ($success) { $this->build->setStatus(Build::STATUS_SUCCESS); } else { $this->build->setStatus(Build::STATUS_FAILED); @@ -214,7 +209,7 @@ class Builder implements LoggerAwareInterface // Complete stage plugins are always run $this->pluginExecutor->executePlugins($this->config, 'complete'); - if ($this->success) { + if ($success) { $this->pluginExecutor->executePlugins($this->config, 'success'); $this->buildLogger->logSuccess('BUILD SUCCESSFUL!'); } else { From 1e44a1531b9e3ae19c1a805499732555cf6dce68 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 17:32:18 +0100 Subject: [PATCH 098/119] Simplifying ProjectController a little, see #384 --- PHPCI/Controller/ProjectController.php | 84 ++++---------------------- PHPCI/Helper/Github.php | 57 +++++++++++++++++ PHPCI/Helper/SshKey.php | 46 ++++++++++++++ 3 files changed, 115 insertions(+), 72 deletions(-) create mode 100644 PHPCI/Helper/Github.php create mode 100644 PHPCI/Helper/SshKey.php diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index c4fc5a58..ebf3df1a 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -10,6 +10,8 @@ namespace PHPCI\Controller; use PHPCI\BuildFactory; +use PHPCI\Helper\Github; +use PHPCI\Helper\SshKey; use PHPCI\Model\Build; use PHPCI\Model\Project; use b8; @@ -145,37 +147,19 @@ class ProjectController extends \PHPCI\Controller $method = $this->request->getMethod(); + $pub = null; + $values = array(); + if ($method == 'POST') { $values = $this->getParams(); $pub = null; } else { - $tempPath = sys_get_temp_dir() . '/'; + $sshKey = new SshKey(); + $key = $sshKey->generate(); - // FastCGI fix for Windows machines, where temp path is not available to - // PHP, and defaults to the unwritable system directory. If the temp - // path is pointing to the system directory, shift to the 'TEMP' - // sub-folder, which should also exist, but actually be writable. - if ($tempPath == getenv("SystemRoot") . '/') { - $tempPath = getenv("SystemRoot") . '/TEMP/'; - } - - $keyFile = $tempPath . md5(microtime(true)); - - if (!is_dir($tempPath)) { - mkdir($tempPath); - } - - if ($this->canGenerateKeys()) { - shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); - - $pub = file_get_contents($keyFile . '.pub'); - $prv = file_get_contents($keyFile); - - $values = array('key' => $prv, 'pubkey' => $pub); - } else { - $pub = null; - $values = array(); - } + $values['key'] = $key['private_key']; + $values['pubkey'] = $key['public_key']; + $pub = $key['public_key']; } $form = $this->projectForm($values); @@ -381,46 +365,8 @@ class ProjectController extends \PHPCI\Controller */ protected function githubRepositories() { - $token = Config::getInstance()->get('phpci.github.token'); - - if (!$token) { - die(json_encode(null)); - } - - $cache = \b8\Cache::getCache(\b8\Cache::TYPE_APC); - $rtn = $cache->get('phpci_github_repos'); - - if (!$rtn) { - $orgs = $this->doGithubApiRequest('/user/orgs', array('access_token' => $token)); - - $params = array('type' => 'all', 'access_token' => $token); - $repos = array(); - $repos['user'] = $this->doGithubApiRequest('/user/repos', $params); - - - foreach ($orgs as $org) { - $repos[$org['login']] = $this->doGithubApiRequest('/orgs/'.$org['login'].'/repos', $params); - } - - $rtn = array(); - foreach ($repos as $repoGroup) { - foreach ($repoGroup as $repo) { - $rtn['repos'][] = $repo['full_name']; - } - } - - $cache->set('phpci_github_repos', $rtn); - } - - die(json_encode($rtn)); - } - - protected function doGithubApiRequest($url, $params) - { - $http = new \b8\HttpClient('https://api.github.com'); - $res = $http->get($url, $params); - - return $res['body']; + $github = new Github(); + die(json_encode($github->getRepositories())); } protected function getReferenceValidator($values) @@ -460,10 +406,4 @@ class ProjectController extends \PHPCI\Controller return true; }; } - - protected function canGenerateKeys() - { - $result = @shell_exec('ssh-keygen'); - return !empty($result); - } } diff --git a/PHPCI/Helper/Github.php b/PHPCI/Helper/Github.php new file mode 100644 index 00000000..4278dd8e --- /dev/null +++ b/PHPCI/Helper/Github.php @@ -0,0 +1,57 @@ +get($url, $params); + + return $res['body']; + } + + /** + * Get an array of repositories from Github's API. + */ + public function getRepositories() + { + $token = Config::getInstance()->get('phpci.github.token'); + + if (!$token) { + die(json_encode(null)); + } + + $cache = Cache::getCache(Cache::TYPE_APC); + $rtn = $cache->get('phpci_github_repos'); + + if (!$rtn) { + $orgs = $this->makeRequest('/user/orgs', array('access_token' => $token)); + + $params = array('type' => 'all', 'access_token' => $token); + $repos = array(); + $repos['user'] = $this->makeRequest('/user/repos', $params); + + + foreach ($orgs as $org) { + $repos[$org['login']] = $this->makeRequest('/orgs/'.$org['login'].'/repos', $params); + } + + $rtn = array(); + foreach ($repos as $repoGroup) { + foreach ($repoGroup as $repo) { + $rtn['repos'][] = $repo['full_name']; + } + } + + $cache->set('phpci_github_repos', $rtn); + } + + return $rtn; + } +} \ No newline at end of file diff --git a/PHPCI/Helper/SshKey.php b/PHPCI/Helper/SshKey.php new file mode 100644 index 00000000..49723188 --- /dev/null +++ b/PHPCI/Helper/SshKey.php @@ -0,0 +1,46 @@ +canGenerateKeys()) { + shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); + + $pub = file_get_contents($keyFile . '.pub'); + $prv = file_get_contents($keyFile); + + $return = array('private_key' => $prv, 'public_key' => $pub); + } + + return $return; + } + + public function canGenerateKeys() + { + $keygen = @shell_exec('ssh-keygen'); + $canGenerateKeys = !empty($keygen); + + return $canGenerateKeys; + } +} \ No newline at end of file From d17ea1bd3869664d69e7ef7d8c36318792064abc Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 2 May 2014 17:38:43 +0100 Subject: [PATCH 099/119] Further cleanup for #384 --- PHPCI/Controller/ProjectController.php | 7 ++----- PHPCI/Helper/Github.php | 2 +- PHPCI/Helper/SshKey.php | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index ebf3df1a..eea5a7a8 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -148,12 +148,9 @@ class ProjectController extends \PHPCI\Controller $method = $this->request->getMethod(); $pub = null; - $values = array(); + $values = $this->getParams(); - if ($method == 'POST') { - $values = $this->getParams(); - $pub = null; - } else { + if ($method != 'POST') { $sshKey = new SshKey(); $key = $sshKey->generate(); diff --git a/PHPCI/Helper/Github.php b/PHPCI/Helper/Github.php index 4278dd8e..6ce2d556 100644 --- a/PHPCI/Helper/Github.php +++ b/PHPCI/Helper/Github.php @@ -54,4 +54,4 @@ class Github return $rtn; } -} \ No newline at end of file +} diff --git a/PHPCI/Helper/SshKey.php b/PHPCI/Helper/SshKey.php index 49723188..7c944e1a 100644 --- a/PHPCI/Helper/SshKey.php +++ b/PHPCI/Helper/SshKey.php @@ -43,4 +43,4 @@ class SshKey return $canGenerateKeys; } -} \ No newline at end of file +} From 5cd2e21e07c0573e6b59a00198699f673def10f4 Mon Sep 17 00:00:00 2001 From: Armen Markossyan Date: Fri, 2 May 2014 23:47:08 +0600 Subject: [PATCH 100/119] Fix #217 --- PHPCI/Plugin/PhpLoc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php index 000b82cc..a00e6668 100644 --- a/PHPCI/Plugin/PhpLoc.php +++ b/PHPCI/Plugin/PhpLoc.php @@ -68,7 +68,7 @@ class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return false; } - $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->phpci->buildPath); + $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->directory); $output = $this->phpci->getLastOutput(); if (preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) { From 067aa858760a1ad2f6ffef7b4c41604c95e5e136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jari=20Ylim=C3=A4inen?= Date: Fri, 2 May 2014 22:58:22 +0300 Subject: [PATCH 101/119] Interpolate PHPUnit arguments --- PHPCI/Plugin/PhpUnit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 16de7aa0..76f321b1 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -101,7 +101,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (isset($options['args'])) { - $this->args = $options['args']; + $this->args = $this->phpci->interpolate($options['args']); } if (isset($options['path'])) { From 9379af87240d5eff4c0abc1a4ba4d6866fc1debe Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 5 May 2014 21:03:44 +0100 Subject: [PATCH 102/119] Implement clone_depth setting in build_settings, to allow shallow clones. Fixes #391 --- PHPCI/Model/Build/RemoteGitBuild.php | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php index 144f69f6..9c7c6a26 100644 --- a/PHPCI/Model/Build/RemoteGitBuild.php +++ b/PHPCI/Model/Build/RemoteGitBuild.php @@ -54,7 +54,15 @@ class RemoteGitBuild extends Build */ protected function cloneByHttp(Builder $builder, $cloneTo) { - $cmd = 'git clone -b %s %s "%s"'; + $cmd = 'git clone '; + + $depth = $builder->getConfig('clone_depth'); + + if (!is_null($depth)) { + $cmd .= ' --depth ' . intval($depth) . ' '; + } + + $cmd .= ' -b %s %s "%s"'; $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); if (!empty($commit) && $commit != 'Manual') { @@ -80,14 +88,20 @@ class RemoteGitBuild extends Build } // Do the git clone: - $cmd = 'git clone -b %s %s "%s"'; + $cmd = 'git clone '; + + $depth = $builder->getConfig('clone_depth'); + + if (!is_null($depth)) { + $cmd .= ' --depth ' . intval($depth) . ' '; + } + + $cmd .= ' -b %s %s "%s"'; if (!IS_WIN) { $cmd = 'export GIT_SSH="'.$gitSshWrapper.'" && ' . $cmd; } - var_dump($cmd); - $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); // Checkout a specific commit if we need to: From 77daef3a5fe6a3438fd2863fb1b67758282ed1fd Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 6 May 2014 16:43:47 +0100 Subject: [PATCH 103/119] Fixing daemonise mode, forcing RunCommand to only get one build at a time when running under daemon mode --- PHPCI/Command/DaemoniseCommand.php | 1 + PHPCI/Command/RunCommand.php | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index f8cbc45b..b4d0295c 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -76,6 +76,7 @@ class DaemoniseCommand extends Command $this->run = true; $this->sleep = 0; $runner = new RunCommand($this->logger); + $runner->setBaxBuilds(1); $emptyInput = new ArgvInput(array()); diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index 318f9247..dc64aef9 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -42,6 +42,11 @@ class RunCommand extends Command */ protected $logger; + /** + * @var int + */ + protected $maxBuilds = null; + /** * @param \Monolog\Logger $logger * @param string $name @@ -52,7 +57,6 @@ class RunCommand extends Command $this->logger = $logger; } - protected function configure() { $this @@ -69,7 +73,7 @@ class RunCommand extends Command // For verbose mode we want to output all informational and above // messages to the symphony output interface. - if ($input->getOption('verbose')) { + if ($input->hasOption('verbose')) { $this->logger->pushHandler( new OutputLogHandler($this->output, Logger::INFO) ); @@ -79,7 +83,7 @@ class RunCommand extends Command $this->logger->addInfo("Finding builds to process"); $store = Factory::getStore('Build'); - $result = $store->getByStatus(0); + $result = $store->getByStatus(0, $this->maxBuilds); $this->logger->addInfo(sprintf("Found %d builds", count($result['items']))); $builds = 0; @@ -113,4 +117,9 @@ class RunCommand extends Command return $builds; } + + public function setBaxBuilds($numBuilds) + { + $this->maxBuilds = (int)$numBuilds; + } } From b9397414c38dbf3e80d7ff8f94f7f743f86a0a61 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 6 May 2014 16:44:23 +0100 Subject: [PATCH 104/119] Enable setting config file path via env rather than assuming PHPCI/config.yml (both work) --- bootstrap.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index ee819c49..02e8c820 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -33,10 +33,24 @@ $autoload = function ($class) { spl_autoload_register($autoload, true, true); -if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { +// If the PHPCI config file is not where we expect it, try looking in +// env for an alternative config path. +$configFile = dirname(__FILE__) . '/PHPCI/config.yml'; + +if (!file_exists($configFile)) { + $configEnv = getenv('phpci_config_file'); + + if (!empty($configEnv)) { + $configFile = $configEnv; + } +} + +// If we don't have a config file at all, fail at this point and tell the user to install: +if (!file_exists($configFile) && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { die('PHPCI has not yet been installed - Please use the command ./console phpci:install to install it.'); } +// If composer has not been run, fail at this point and tell the user to install: if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) { file_put_contents('php://stderr', 'Please install PHPCI with "composer install" before using console'); exit(1); @@ -54,9 +68,7 @@ $conf['b8']['app']['namespace'] = 'PHPCI'; $conf['b8']['app']['default_controller'] = 'Home'; $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/'; -if (file_exists(dirname(__FILE__) . '/PHPCI/config.yml')) { - $config = new b8\Config($conf); - $config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml'); -} +$config = new b8\Config($conf); +$config->loadYaml($configFile); require_once(dirname(__FILE__) . '/vars.php'); From 9eefc7bf8ec4975e3401953a61007f21d957e615 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 7 May 2014 10:20:21 +0100 Subject: [PATCH 105/119] Making phpunit plugin log the TAP string in the event it fails to process it. --- PHPCI/Plugin/PhpUnit.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 16de7aa0..327e41f3 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -132,9 +132,16 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $success &= $this->runDir($this->directory); } - $output = $this->phpci->getLastOutput(); - $tapParser = new TapParser($output); - $output = $tapParser->parse(); + $tapString = $this->phpci->getLastOutput(); + + try { + $tapParser = new TapParser($tapString); + $output = $tapParser->parse(); + } catch (\Exception $ex) { + $this->phpci->logFailure($tapString); + throw $ex; + } + $failures = $tapParser->getTotalFailures(); $this->build->storeMeta('phpunit-errors', $failures); From 033301682858c796924169671f7ded6432c78dee Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 7 May 2014 16:09:56 +0100 Subject: [PATCH 106/119] Converting build meta to use longtext instead of text, for builds with a lot of errors. --- PHPCI/Model/Base/BuildMetaBase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php index b7f85490..fc9183b2 100644 --- a/PHPCI/Model/Base/BuildMetaBase.php +++ b/PHPCI/Model/Base/BuildMetaBase.php @@ -98,7 +98,7 @@ class BuildMetaBase extends Model 'default' => null, ), 'meta_value' => array( - 'type' => 'text', + 'type' => 'longtext', 'nullable' => true, 'default' => null, ), From b1885a07fd3a25c962db4cb1c472d97f550dccd1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 12:16:09 +0000 Subject: [PATCH 107/119] Fixing bootstrap for ./console phpci:install --- bootstrap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 02e8c820..2a271503 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -69,6 +69,9 @@ $conf['b8']['app']['default_controller'] = 'Home'; $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/'; $config = new b8\Config($conf); -$config->loadYaml($configFile); + +if (file_exists($configFile)) { + $config->loadYaml($configFile); +} require_once(dirname(__FILE__) . '/vars.php'); From 43ce5554a60c56f949d92eed4056e0bf3072d39c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:02:24 +0000 Subject: [PATCH 108/119] Adding PHP Docblock Checker plugin --- PHPCI/Plugin/PhpDocblockChecker.php | 138 ++++++++++++++++++ phpci.yml | 2 + public/assets/js/build-plugins/phpdoccheck.js | 78 ++++++++++ public/assets/js/build-plugins/warnings.js | 5 +- 4 files changed, 221 insertions(+), 2 deletions(-) create mode 100755 PHPCI/Plugin/PhpDocblockChecker.php create mode 100644 public/assets/js/build-plugins/phpdoccheck.js diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php new file mode 100755 index 00000000..b41b8434 --- /dev/null +++ b/PHPCI/Plugin/PhpDocblockChecker.php @@ -0,0 +1,138 @@ + +* @package PHPCI +* @subpackage Plugins +*/ +class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin +{ + /** + * @var \PHPCI\Builder + */ + protected $phpci; + + /** + * @var \PHPCI\Model\Build + */ + protected $build; + + /** + * @var string Based on the assumption the root may not hold the code to be + * tested, extends the build path. + */ + protected $path; + + /** + * @var array - paths to ignore + */ + protected $ignore; + + protected $skipClasses = false; + protected $skipMethods = false; + + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + + + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + $this->ignore = $phpci->ignore; + $this->path = ''; + $this->allowed_warnings = 0; + + if (isset($options['zero_config']) && $options['zero_config']) { + $this->allowed_warnings = -1; + } + + if (array_key_exists('skip_classes', $options)) { + $this->skipClasses = true; + } + + if (array_key_exists('skip_methods', $options)) { + $this->skipMethods = true; + } + + if (!empty($options['path'])) { + $this->path = $options['path']; + } + + if (array_key_exists('allowed_warnings', $options)) { + $this->allowed_warnings = (int)$options['allowed_warnings']; + } + } + + /** + * Runs PHP Mess Detector in a specified directory. + */ + public function execute() + { + $ignore = ''; + if (count($this->ignore)) { + $ignore = ' --exclude="' . implode(',', $this->ignore) . '"'; + } + + var_dump($ignore); + + $checker = $this->phpci->findBinary('phpdoccheck'); + + if (!$checker) { + $this->phpci->logFailure('Could not find phpdoccheck.'); + return false; + } + + $path = $this->phpci->buildPath . $this->path; + + $cmd = $checker . ' --json --directory="%s"%s%s%s'; + + // Disable exec output logging, as we don't want the XML report in the log: + $this->phpci->logExecOutput(false); + + // Run checker: + $this->phpci->executeCommand( + $cmd, + $path, + $ignore, + ($this->skipClasses ? ' --skip-classes' : ''), + ($this->skipMethods ? ' --skip-methods' : '') + ); + + // Re-enable exec output logging: + $this->phpci->logExecOutput(true); + + $output = json_decode($this->phpci->getLastOutput()); + $errors = count($output); + $success = true; + + $this->build->storeMeta('phpdoccheck-warnings', $errors); + $this->build->storeMeta('phpdoccheck-data', $output); + + if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { + $success = false; + } + + return $success; + } +} diff --git a/phpci.yml b/phpci.yml index 9dda1fa4..24121476 100644 --- a/phpci.yml +++ b/phpci.yml @@ -17,6 +17,8 @@ test: standard: "PSR2" php_loc: php_unit: + php_docblock_checker: + allowed_warnings: -1 # Allow unlimited warnings for now. failure: email: diff --git a/public/assets/js/build-plugins/phpdoccheck.js b/public/assets/js/build-plugins/phpdoccheck.js new file mode 100644 index 00000000..89d8b449 --- /dev/null +++ b/public/assets/js/build-plugins/phpdoccheck.js @@ -0,0 +1,78 @@ +var phpdoccheckPlugin = PHPCI.UiPlugin.extend({ + id: 'build-phpdoccheck-warnings', + css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', + title: 'PHP Docblock Checker', + lastData: null, + displayOnUpdate: false, + box: true, + + register: function() { + var self = this; + var query = PHPCI.registerQuery('phpdoccheck-data', -1, {key: 'phpdoccheck-data'}) + + $(window).on('phpdoccheck-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function(data) { + if (data.queryData.status > 1) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('' + + '' + + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + '' + + '
    TypeFileLineClassMethod
    '); + }, + + onUpdate: function(e) { + if (this.lastData && this.lastData[0]) { + return; + } + + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#phpdoccheck-data tbody'); + tbody.empty(); + + for (var i in errors) { + var file = errors[i].file; + + if (PHPCI.fileLinkTemplate) { + var fileLink = PHPCI.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line); + + file = '' + file + ''; + } + + var row = $('' + + ''+errors[i].type+'' + + ''+file+'' + + ''+errors[i].line+'' + + ''+errors[i].class+'' + + ''+errors[i].method+''); + + if (errors[i].type == 'method') { + row.addClass('danger'); + } else { + row.addClass('warning'); + } + + tbody.append(row); + } + } +}); + +PHPCI.registerPlugin(new phpdoccheckPlugin()); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index cc2db78f..70d2b4b2 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -7,7 +7,8 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ 'phpcs-warnings': 'PHPCS Warnings', 'phpcs-errors': 'PHPCS Errors', 'phplint-errors': 'PHPLint Errors', - 'phpunit-errors': 'PHPUnit Errors' + 'phpunit-errors': 'PHPUnit Errors', + 'phpdoccheck-warnings': 'PHP Docblock Checker Warnings' }, data: {}, displayOnUpdate: false, @@ -20,7 +21,7 @@ var warningsPlugin = PHPCI.UiPlugin.extend({ queries.push(PHPCI.registerQuery(key, -1, {num_builds: 10, key: key})); } - $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors phpunit-errors', function(data) { + $(window).on('phpmd-warnings phpcs-warnings phpcs-errors phplint-errors phpunit-errors phpdoccheck-errors', function(data) { self.onUpdate(data); }); From e297f60273c4eb43f01b1ba75b5cd49e892ec385 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:02:51 +0000 Subject: [PATCH 109/119] Fixing zero config ignore setting --- PHPCI/Model/Build.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index e8b8cd5a..174126fa 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -122,7 +122,7 @@ class Build extends BuildBase $config = array( 'build_settings' => array( 'ignore' => array( - 'vendor/', + 'vendor', ) ) ); From b381b7864ab86e2776695e2d62b43e6db0c4816e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:03:17 +0000 Subject: [PATCH 110/119] Updating license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 7d8d2f31..60a3727d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013, Block 8 Limited +Copyright (c) 2014, Block 8 Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From b950e4d66215af02f7b5b16c271a195ae2913aa1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:03:29 +0000 Subject: [PATCH 111/119] Updating license year --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 60a3727d..1df52b9c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2014, Block 8 Limited +Copyright (c) 2013-2014, Block 8 Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From efd207377948fe840f5d5e28fe314a17cdb12b6f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 16:04:37 +0000 Subject: [PATCH 112/119] Updating composer.json --- composer.json | 1 + composer.lock | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index a6dec175..6cb24ba1 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ }, "suggest": { + "block8/php-docblock-checker": "PHP Docblock Checker", "phpmd/phpmd": "PHP Mess Detector", "sebastian/phpcpd": "PHP Copy/Paste Detector", "squizlabs/php_codesniffer": "PHP Code Sniffer", diff --git a/composer.lock b/composer.lock index 1110c4b5..d8f78d4c 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "d6834b50e3ea80f4c6f0a05707d0e5f1", + "hash": "0692857385ac27090b3000cbc680ced8", "packages": [ { "name": "block8/b8framework", @@ -247,25 +247,28 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.1.0", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "748c01c1144713ac0118396935d10b6ceec91b68" + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/748c01c1144713ac0118396935d10b6ceec91b68", - "reference": "748c01c1144713ac0118396935d10b6ceec91b68", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/043e336b871f17a117f76ef8e190eddfc04c8d48", + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48", "shasum": "" }, "require": { "php": ">=5.2.4" }, + "require-dev": { + "mockery/mockery": "~0.9.1" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -294,7 +297,7 @@ "mail", "mailer" ], - "time": "2014-03-18 09:03:27" + "time": "2014-05-08 08:11:19" }, { "name": "symfony/console", From 0654bcccee396cc39dc600c48d9a3e7045597f4b Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 17:59:08 +0000 Subject: [PATCH 113/119] Adding edit profile (and change password) option for users. --- PHPCI/Controller/UserController.php | 57 ++++++++++++++++++++++++++++- PHPCI/View/User/profile.phtml | 15 ++++++++ PHPCI/View/layout.phtml | 18 ++++++++- 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 PHPCI/View/User/profile.phtml diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index c8fade0c..817cb5e8 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -29,7 +29,7 @@ class UserController extends Controller public function init() { - $this->userStore = b8\Store\Factory::getStore('User'); + $this->userStore = b8\Store\Factory::getStore('User'); } /** @@ -45,6 +45,61 @@ class UserController extends Controller return $this->view->render(); } + public function profile() + { + $user = $_SESSION['user']; + $values = $user->getDataArray(); + + if ($this->request->getMethod() == 'POST') { + $values = $this->getParams(); + + if (!empty($values['password'])) { + $values['hash'] = password_hash($values['password'], PASSWORD_DEFAULT); + } + + $this->view->updated = true; + + $user->setValues($values); + $_SESSION['user'] = $this->userStore->save($user); + } + + $form = new Form(); + $form->setAction(PHPCI_URL.'user/profile'); + $form->setMethod('POST'); + + $name = new Form\Element\Text('name'); + $name->setClass('form-control'); + $name->setContainerClass('form-group'); + $name->setLabel('Name'); + $name->setRequired(true); + $form->addField($name); + + $email = new Form\Element\Email('email'); + $email->setClass('form-control'); + $email->setContainerClass('form-group'); + $email->setLabel('Email Address'); + $email->setRequired(true); + $form->addField($email); + + $password = new Form\Element\Password('password'); + $password->setClass('form-control'); + $password->setContainerClass('form-group'); + $password->setLabel('Password (leave blank if you don\'t want to change it)'); + $password->setRequired(false); + $form->addField($password); + + $submit = new Form\Element\Submit(); + $submit->setClass('btn btn-success'); + $submit->setValue('Save »'); + $form->addField($submit); + + $form->setValues($values); + + $this->view->form = $form; + + return $this->view->render(); + } + /** * Add a user - handles both form and processing. */ diff --git a/PHPCI/View/User/profile.phtml b/PHPCI/View/User/profile.phtml new file mode 100644 index 00000000..5e006738 --- /dev/null +++ b/PHPCI/View/User/profile.phtml @@ -0,0 +1,15 @@ +

    User()->getName(); ?>

    + + +

    Your details have been updated.

    + + +
    +
    +

    Update your details

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

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

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

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

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

      Incorrect email address or password

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

      Incorrect email address or password

      - - -
      - - -
      -
      - - +Forgotten your password? \ No newline at end of file diff --git a/PHPCI/View/Session/resetPassword.phtml b/PHPCI/View/Session/resetPassword.phtml new file mode 100644 index 00000000..9544879e --- /dev/null +++ b/PHPCI/View/Session/resetPassword.phtml @@ -0,0 +1,27 @@ + + +
      +
      + Please enter a new password +
      + +
      +
      +
      + + +
      + +
      + +
      +
      +
      +
      + +
      + +
      + + + From 45b7dec478635ae5080636cb690c2be5a15b0620 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 8 May 2014 21:43:06 +0100 Subject: [PATCH 116/119] Fixing PHPCS and PHPMD errors --- PHPCI/Controller/SessionController.php | 12 +++++------ PHPCI/Helper/Email.php | 28 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 2c4712ab..def6d4c4 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -104,14 +104,14 @@ class SessionController extends \PHPCI\Controller $key = md5(date('Y-m-d') . $user->getHash()); $url = PHPCI_URL; $name = $user->getName(); - $id = $user->getId(); + $userId = $user->getId(); $message = <<setTo($user->getEmail(), $user->getName()); + $email->setEmailTo($user->getEmail(), $user->getName()); $email->setSubject('Password reset'); $email->setBody($message); $email->send(); @@ -133,9 +133,9 @@ MSG; return $this->view->render(); } - public function resetPassword($id, $key) + public function resetPassword($userId, $key) { - $user = $this->userStore->getById($id); + $user = $this->userStore->getById($userId); $userKey = md5(date('Y-m-d') . $user->getHash()); if (empty($user) || $key != $userKey) { @@ -154,7 +154,7 @@ MSG; die; } - $this->view->id = $id; + $this->view->id = $userId; $this->view->key = $key; return $this->view->render(); diff --git a/PHPCI/Helper/Email.php b/PHPCI/Helper/Email.php index 32cbe4f4..3ab57b95 100644 --- a/PHPCI/Helper/Email.php +++ b/PHPCI/Helper/Email.php @@ -9,8 +9,8 @@ class Email { const DEFAULT_FROM = 'PHPCI '; - protected $to = array(); - protected $cc = array(); + protected $emailTo = array(); + protected $emailCc = array(); protected $subject = 'Email from PHPCI'; protected $body = ''; protected $isHtml = false; @@ -21,16 +21,16 @@ class Email $this->config = Config::getInstance(); } - public function setTo($email, $name = null) + public function setEmailTo($email, $name = null) { - $this->to[$email] = $name; + $this->emailTo[$email] = $name; return $this; } public function addCc($email, $name = null) { - $this->cc[$email] = $name; + $this->emailCc[$email] = $name; return $this; } @@ -77,20 +77,20 @@ class Email $headers .= 'From: ' . $this->getFrom() . PHP_EOL; - $to = array(); - foreach ($this->to as $email => $name) { + $emailTo = array(); + foreach ($this->emailTo as $email => $name) { $thisTo = $email; if (!is_null($name)) { $thisTo = '"' . $name . '" <' . $thisTo . '>'; } - $to[] = $thisTo; + $emailTo[] = $thisTo; } - $to = implode(', ', $to); + $emailTo = implode(', ', $emailTo); - return mail($to, $this->subject, $this->body, $headers); + return mail($emailTo, $this->subject, $this->body, $headers); } protected function sendViaSwiftMailer() @@ -100,15 +100,15 @@ class Email $message = \Swift_Message::newInstance($this->subject) ->setFrom($this->getFrom()) - ->setTo($this->to) + ->setTo($this->emailTo) ->setBody($this->body); if ($this->isHtml) { $message->setContentType('text/html'); } - if (is_array($this->cc) && count($this->cc)) { - $message->setCc($this->cc); + if (is_array($this->emailCc) && count($this->emailCc)) { + $message->setCc($this->emailCc); } return $mailer->send($message); @@ -124,4 +124,4 @@ class Email return $email; } -} \ No newline at end of file +} From 63298f2a2310b10dce3b676d6656ba50c1b443d8 Mon Sep 17 00:00:00 2001 From: Jimmy Cleuren Date: Thu, 8 May 2014 23:03:13 +0200 Subject: [PATCH 117/119] remove coverage log line --- PHPCI/Plugin/Util/TapParser.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php index 595e83ef..5b099b03 100644 --- a/PHPCI/Plugin/Util/TapParser.php +++ b/PHPCI/Plugin/Util/TapParser.php @@ -7,12 +7,12 @@ class TapParser const TEST_COUNTS_PATTERN = '/([0-9]+)\.\.([0-9]+)/'; const TEST_LINE_PATTERN = '/(ok|not ok)\s+[0-9]+\s+\-\s+([^\n]+)::([^\n]+)/'; const TEST_MESSAGE_PATTERN = '/message\:\s+\'([^\']+)\'/'; + const TEST_COVERAGE_PATTERN = '/Generating code coverage report/'; /** * @var string */ protected $tapString; - protected $failures = 0; /** @@ -43,16 +43,23 @@ class TapParser throw new \Exception('TapParser only supports TAP version 13'); } + if (preg_match(self::TEST_COVERAGE_PATTERN, $lines[count($lines) - 1])) { + array_pop($lines); + if ($lines[count($lines) - 1] == "") { + array_pop($lines); + } + } + $matches = array(); $totalTests = 0; if (preg_match(self::TEST_COUNTS_PATTERN, $lines[0], $matches)) { array_shift($lines); - $totalTests = (int)$matches[2]; + $totalTests = (int) $matches[2]; } if (preg_match(self::TEST_COUNTS_PATTERN, $lines[count($lines) - 1], $matches)) { array_pop($lines); - $totalTests = (int)$matches[2]; + $totalTests = (int) $matches[2]; } $rtn = $this->processTestLines($lines); From f6c7f65f01350c442f462265db766e6111ebdff1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 9 May 2014 07:01:03 +0100 Subject: [PATCH 118/119] Removing 5.4+ array syntax from GenerateCommand --- PHPCI/Command/GenerateCommand.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PHPCI/Command/GenerateCommand.php b/PHPCI/Command/GenerateCommand.php index 44a499de..82c41531 100644 --- a/PHPCI/Command/GenerateCommand.php +++ b/PHPCI/Command/GenerateCommand.php @@ -37,7 +37,13 @@ class GenerateCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { - $gen = new CodeGenerator(Database::getConnection(), ['default' => 'PHPCI'], ['default' => PHPCI_DIR], false); + $gen = new CodeGenerator( + Database::getConnection(), + array('default' => 'PHPCI'), + array('default' => PHPCI_DIR), + false + ); + $gen->generateModels(); $gen->generateStores(); } From a42dc67fad5f6cd0969f86f8a29e5e1a77b75141 Mon Sep 17 00:00:00 2001 From: Corpsee Date: Fri, 9 May 2014 14:25:24 +0700 Subject: [PATCH 119/119] Fixed duplicate methods of CommandExecutor helper: executeCommand and buildAndExecuteCommand --- PHPCI/Builder.php | 2 +- PHPCI/Helper/CommandExecutor.php | 12 +----------- Tests/PHPCI/Helper/CommandExecutorTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index ccb78c6b..69db31e1 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -242,7 +242,7 @@ class Builder implements LoggerAwareInterface */ public function executeCommand() { - return $this->commandExecutor->buildAndExecuteCommand(func_get_args()); + return $this->commandExecutor->executeCommand(func_get_args()); } /** diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index dc284b6a..438829af 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -51,22 +51,12 @@ class CommandExecutor $this->rootDir = $rootDir; } - /** - * Executes shell commands. Accepts multiple arguments the first - * is the template and everything else is inserted in. c.f. sprintf - * @return bool Indicates success - */ - public function executeCommand() - { - return $this->buildAndExecuteCommand(func_get_args()); - } - /** * Executes shell commands. * @param array $args * @return bool Indicates success */ - public function buildAndExecuteCommand($args = array()) + public function executeCommand($args = array()) { $this->lastOutput = array(); diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index 4925e639..ae6809d5 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -21,28 +21,28 @@ class CommandExecutorTest extends ProphecyTestCase public function testGetLastOutput_ReturnsOutputOfCommand() { - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); $output = $this->testedExecutor->getLastOutput(); $this->assertEquals("Hello World", $output); } public function testGetLastOutput_ForgetsPreviousCommandOutput() { - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); - $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello Tester')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); + $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello Tester')); $output = $this->testedExecutor->getLastOutput(); $this->assertEquals("Hello Tester", $output); } public function testExecuteCommand_ReturnsTrueForValidCommands() { - $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('echo "%s"', 'Hello World')); + $returnValue = $this->testedExecutor->executeCommand(array('echo "%s"', 'Hello World')); $this->assertTrue($returnValue); } public function testExecuteCommand_ReturnsFalseForInvalidCommands() { - $returnValue = $this->testedExecutor->buildAndExecuteCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World')); + $returnValue = $this->testedExecutor->executeCommand(array('eerfdcvcho "%s" > /dev/null 2>&1', 'Hello World')); $this->assertFalse($returnValue); }