diff --git a/vendor/phpunit/php-code-coverage/.travis.yml b/vendor/phpunit/php-code-coverage/.travis.yml index 0f3c6efc2e..5c23715f51 100644 --- a/vendor/phpunit/php-code-coverage/.travis.yml +++ b/vendor/phpunit/php-code-coverage/.travis.yml @@ -5,6 +5,7 @@ php: - 5.3 - 5.4 - 5.5 + - 5.6 before_script: - COMPOSER_ROOT_VERSION=dev-master composer install --dev --prefer-source diff --git a/vendor/phpunit/php-code-coverage/CONTRIBUTING.md b/vendor/phpunit/php-code-coverage/CONTRIBUTING.md index b290539826..6f6ef34452 100644 --- a/vendor/phpunit/php-code-coverage/CONTRIBUTING.md +++ b/vendor/phpunit/php-code-coverage/CONTRIBUTING.md @@ -1,4 +1,4 @@ -Pull Requests for bug fixes should be made against the current release branch (1.2). +Pull Requests for bug fixes should be made against the current release branch (1.2). Pull Requests for new features should be made against master. diff --git a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php index 6e0fee0657..ef2467f700 100644 --- a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php +++ b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php @@ -331,7 +331,7 @@ class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report $popoverContent = ''; $popoverTitle = ''; - if (!isset($ignoredLines[$i]) && isset($coverageData[$i])) { + if (!isset($ignoredLines[$i]) && array_key_exists($i, $coverageData)) { $numTests = count($coverageData[$i]); if ($coverageData[$i] === NULL) { diff --git a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php index dead9a824c..03dd474447 100644 --- a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php +++ b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php @@ -135,7 +135,7 @@ abstract class PHP_CodeCoverage_Report_Node implements Countable public function getPath() { if ($this->path === NULL) { - if ($this->parent === NULL) { + if ($this->parent === NULL || $this->parent->getPath() == NULL) { $this->path = $this->name; } else { $this->path = $this->parent->getPath() . '/' . $this->name; diff --git a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php index fd0e7a1de8..c47a81ac7a 100644 --- a/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php +++ b/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php @@ -44,7 +44,7 @@ */ /** - * + * * * @category PHP * @package CodeCoverage @@ -56,7 +56,7 @@ */ class PHP_CodeCoverage_Version { - const VERSION = '1.2.15'; + const VERSION = '1.2.16'; protected static $version; /** @@ -72,7 +72,7 @@ class PHP_CodeCoverage_Version if (is_dir(dirname(dirname(__DIR__)) . '/.git')) { $dir = getcwd(); chdir(__DIR__); - $version = exec('git describe --tags'); + $version = @exec('git describe --tags'); chdir($dir); if ($version) { diff --git a/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php index d7f7848b06..becc6c8f9f 100644 --- a/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php +++ b/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php @@ -2,7 +2,7 @@ class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase { /** - * @covers ::globalFunction ( ) + * @covers ::globalFunction ( ) */ public function testSomething() { diff --git a/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php index 7f67f4b358..d1be1c6cf0 100644 --- a/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php +++ b/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php @@ -2,7 +2,7 @@ class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase { /** - * @covers CoveredClass::publicMethod ( ) + * @covers CoveredClass::publicMethod ( ) */ public function testSomething() { diff --git a/vendor/phpunit/php-code-coverage/package.xml b/vendor/phpunit/php-code-coverage/package.xml index cb140d2d6a..b4cedd394d 100644 --- a/vendor/phpunit/php-code-coverage/package.xml +++ b/vendor/phpunit/php-code-coverage/package.xml @@ -17,9 +17,9 @@ sb@sebastian-bergmann.de yes - 2014-02-03 + 2014-02-24 - 1.2.15 + 1.2.16 1.2.11 diff --git a/vendor/phpunit/php-token-stream/PHP/Token.php b/vendor/phpunit/php-token-stream/PHP/Token.php index 90ea43b390..45e5dc3fde 100644 --- a/vendor/phpunit/php-token-stream/PHP/Token.php +++ b/vendor/phpunit/php-token-stream/PHP/Token.php @@ -376,10 +376,15 @@ class PHP_Token_FUNCTION extends PHP_TokenWithScopeAndVisibility } $this->arguments = array(); - $i = $this->id + 2; $tokens = $this->tokenStream->tokens(); $typeHint = NULL; + // Search for first token inside brackets + $i = $this->id + 2; + while (!$tokens[$i-1] instanceof PHP_Token_OPEN_BRACKET) { + $i++; + } + while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) { if ($tokens[$i] instanceof PHP_Token_STRING) { $typeHint = (string)$tokens[$i]; diff --git a/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php b/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php index 8f65990ddc..45d169c531 100644 --- a/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php +++ b/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php @@ -99,6 +99,8 @@ class PHP_Token_FunctionTest extends PHPUnit_Framework_TestCase ); $this->assertEquals(array(), $this->functions[4]->getArguments()); + + $this->assertEquals(array('$x' => null, '$y' => null), $this->functions[5]->getArguments()); } /** diff --git a/vendor/phpunit/php-token-stream/Tests/_files/source.php b/vendor/phpunit/php-token-stream/Tests/_files/source.php index 3c8c1a2da9..0c9b87f65f 100644 --- a/vendor/phpunit/php-token-stream/Tests/_files/source.php +++ b/vendor/phpunit/php-token-stream/Tests/_files/source.php @@ -29,4 +29,8 @@ class Foo{function foo(){} public function baz() { } + + public function blaz($x, $y) + { + } } diff --git a/vendor/phpunit/php-token-stream/package.xml b/vendor/phpunit/php-token-stream/package.xml index 7739503da4..820638ad0f 100644 --- a/vendor/phpunit/php-token-stream/package.xml +++ b/vendor/phpunit/php-token-stream/package.xml @@ -17,9 +17,9 @@ sb@sebastian-bergmann.de yes - 2013-09-13 + 2014-03-03 - 1.2.1 + 1.2.2 1.2.0 diff --git a/vendor/phpunit/phpunit/.travis.yml b/vendor/phpunit/phpunit/.travis.yml index 08b3b7c425..0c6bfe73a4 100644 --- a/vendor/phpunit/phpunit/.travis.yml +++ b/vendor/phpunit/phpunit/.travis.yml @@ -5,6 +5,7 @@ php: - 5.3 - 5.4 - 5.5 + - 5.6 - hhvm env: diff --git a/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php b/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php index 5d62666971..7a4b92c2bf 100644 --- a/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php +++ b/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php @@ -56,7 +56,7 @@ */ class PHPUnit_Runner_Version { - const VERSION = '3.7.31'; + const VERSION = '3.7.32'; protected static $version; /** diff --git a/vendor/phpunit/phpunit/Tests/Framework/Constraint/CountTest.php b/vendor/phpunit/phpunit/Tests/Framework/Constraint/CountTest.php index 04f338464b..714ea1b6d3 100644 --- a/vendor/phpunit/phpunit/Tests/Framework/Constraint/CountTest.php +++ b/vendor/phpunit/phpunit/Tests/Framework/Constraint/CountTest.php @@ -40,7 +40,7 @@ * @copyright 2001-2014 Sebastian Bergmann * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License * @link http://www.phpunit.de/ - * @since File available since Release 3.9.0 + * @since File available since Release 3.7.30 */ require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'TestIterator.php'; diff --git a/vendor/phpunit/phpunit/composer.json b/vendor/phpunit/phpunit/composer.json index b4fc81dc4c..c2fe3a3693 100644 --- a/vendor/phpunit/phpunit/composer.json +++ b/vendor/phpunit/phpunit/composer.json @@ -34,7 +34,7 @@ "ext-spl": "*" }, "require-dev": { - "pear-pear/pear": "1.9.4" + "pear-pear.php.net/pear": "1.9.4" }, "repositories": [ { diff --git a/vendor/phpunit/phpunit/package.xml b/vendor/phpunit/phpunit/package.xml index 5d743d543c..cc777e49c9 100644 --- a/vendor/phpunit/phpunit/package.xml +++ b/vendor/phpunit/phpunit/package.xml @@ -17,9 +17,9 @@ sebastian@phpunit.de yes - 2014-02-03 + 2014-02-24 - 3.7.31 + 3.7.32 3.7.0