Fixing the horrors of overly long lines, misalignment, and incorrect use of new lines.

This commit is contained in:
Dan Cryer 2014-05-01 16:53:29 +01:00
parent 31ee6522c1
commit 69ea47874f
19 changed files with 938 additions and 102 deletions

View file

@ -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);

View file

@ -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');

View file

@ -58,4 +58,4 @@ class BuildInterpolator
$values = array_values($this->interpolation_vars);
return str_replace($keys, $values, $input);
}
}
}

View file

@ -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 {
}
}
}
}
}

View file

@ -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));
}
}
}
}

View file

@ -28,6 +28,4 @@ class OutputLogHandler extends AbstractProcessingHandler
{
$this->output->writeln((string)$record['formatted']);
}
}

View file

@ -98,7 +98,9 @@ class GithubBuild extends RemoteGitBuild
{
$rtn = $this->data['commit_message'];
$rtn = preg_replace('/\#([0-9]+)/', '<a target="_blank" href="https://github.com/' . $this->getProject()->getReference() . '/issues/$1">#$1</a>', $rtn);
$reference = $this->getProject()->getReference();
$commitLink = '<a target="_blank" href="https://github.com/' . $reference . '/issues/$1">#$1</a>';
$rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn);
$rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '<a target="_blank" href="https://github.com/$1">@$1</a>', $rtn);
return $rtn;

View file

@ -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()
);
}

View file

@ -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;
}

View file

@ -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 = <<<OUT
#!/bin/sh
ssh -o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o IdentityFile={$keyFile} $*
ssh {$sshFlags} -o IdentityFile={$keyFile} $*
OUT;

View file

@ -79,7 +79,9 @@ class Codeception implements \PHPCI\Plugin
if (IS_WIN) {
$cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" '. $this->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;
}

View file

@ -46,7 +46,6 @@ class Email implements \PHPCI\Plugin
Build $build,
\Swift_Mailer $mailer,
array $options = array()
) {
$this->phpci = $phpci;
$this->build = $build;

View file

@ -6,7 +6,6 @@ use \PHPCI\Logging\BuildLogger;
class Executor
{
/**
* @var BuildLogger
*/
@ -103,5 +102,4 @@ class Executor
return $rtn;
}
}

View file

@ -44,5 +44,4 @@ class PluginInformationCollection implements InstalledPluginInformation
}
return $arr;
}
}

View file

@ -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);
}

View file

@ -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"}}

881
composer.lock generated
View file

@ -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": [
],

View file

@ -16,4 +16,3 @@ require_once('../bootstrap.php');
$fc = new PHPCI\Application($config, new b8\Http\Request());
print $fc->handleRequest();

View file

@ -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));
}