diff --git a/core/composer.json b/core/composer.json index 4c2e76f..d2bc68e 100644 --- a/core/composer.json +++ b/core/composer.json @@ -23,7 +23,7 @@ "guzzlehttp/guzzle": "~5.0", "symfony-cmf/routing": "1.3.*", "easyrdf/easyrdf": "0.9.*", - "phpunit/phpunit": "4.1.*", + "phpunit/phpunit": "4.2.*", "phpunit/phpunit-mock-objects": "dev-master#e60bb929c50ae4237aaf680a4f6773f4ee17f0a2", "zendframework/zend-feed": "2.3.*", "mikey179/vfsStream": "1.*", diff --git a/core/composer.lock b/core/composer.lock index fe5dc0a..06ed64e 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "461047a83f0f5554064bfe97e2a673fb", + "hash": "8b62d79c036e69bfda8e20190ed3ad9c", "packages": [ { "name": "doctrine/annotations", @@ -1015,16 +1015,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.1.4", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26" + "reference": "c28a790620fe30b049bb693be1ef9cd4e0fe906c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a71c4842c5fb836d8b200624583b859ec34e8a26", - "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c28a790620fe30b049bb693be1ef9cd4e0fe906c", + "reference": "c28a790620fe30b049bb693be1ef9cd4e0fe906c", "shasum": "" }, "require": { @@ -1038,7 +1038,7 @@ "phpunit/php-file-iterator": "~1.3.1", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": "~2.1", + "phpunit/phpunit-mock-objects": "~2.2", "sebastian/comparator": "~1.0", "sebastian/diff": "~1.1", "sebastian/environment": "~1.0", @@ -1055,7 +1055,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1.x-dev" + "dev-master": "4.2.x-dev" } }, "autoload": { @@ -1085,7 +1085,7 @@ "testing", "xunit" ], - "time": "2014-07-18 07:15:58" + "time": "2014-09-14 09:31:24" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/core/vendor/composer/autoload_classmap.php b/core/vendor/composer/autoload_classmap.php index 9f66986..ed01cc6 100644 --- a/core/vendor/composer/autoload_classmap.php +++ b/core/vendor/composer/autoload_classmap.php @@ -140,8 +140,6 @@ 'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/src/TextUI/TestRunner.php', 'PHPUnit_Util_Blacklist' => $vendorDir . '/phpunit/phpunit/src/Util/Blacklist.php', 'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php', - 'PHPUnit_Util_DeprecatedFeature' => $vendorDir . '/phpunit/phpunit/src/Util/DeprecatedFeature.php', - 'PHPUnit_Util_DeprecatedFeature_Logger' => $vendorDir . '/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php', 'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php', 'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php', 'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php', @@ -156,6 +154,7 @@ 'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Default.php', 'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Windows.php', 'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/src/Util/Printer.php', + 'PHPUnit_Util_Regex' => $vendorDir . '/phpunit/phpunit/src/Util/Regex.php', 'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/src/Util/String.php', 'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/src/Util/Test.php', 'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php', diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index 6104e35..8c10f25 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -1142,82 +1142,6 @@ ] }, { - "name": "phpunit/phpunit", - "version": "4.1.4", - "version_normalized": "4.1.4.0", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a71c4842c5fb836d8b200624583b859ec34e8a26", - "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": "~2.0", - "phpunit/php-file-iterator": "~1.3.1", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": "~2.1", - "sebastian/comparator": "~1.0", - "sebastian/diff": "~1.1", - "sebastian/environment": "~1.0", - "sebastian/exporter": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.0" - }, - "suggest": { - "phpunit/php-invoker": "~1.1" - }, - "time": "2014-07-18 07:15:58", - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.1.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "classmap": [ - "src/" - ] - }, - "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" - ] - }, - { "name": "sdboyer/gliph", "version": "0.1.8", "version_normalized": "0.1.8.0", @@ -2674,5 +2598,81 @@ "feed", "zf2" ] + }, + { + "name": "phpunit/phpunit", + "version": "4.2.6", + "version_normalized": "4.2.6.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "c28a790620fe30b049bb693be1ef9cd4e0fe906c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c28a790620fe30b049bb693be1ef9cd4e0fe906c", + "reference": "c28a790620fe30b049bb693be1ef9cd4e0fe906c", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": "~2.0", + "phpunit/php-file-iterator": "~1.3.1", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": "~2.2", + "sebastian/comparator": "~1.0", + "sebastian/diff": "~1.1", + "sebastian/environment": "~1.0", + "sebastian/exporter": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "time": "2014-09-14 09:31:24", + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "classmap": [ + "src/" + ] + }, + "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" + ] } ] diff --git a/core/vendor/phpunit/phpunit/.gitignore b/core/vendor/phpunit/phpunit/.gitignore index 5ec1d53..65a2321 100644 --- a/core/vendor/phpunit/phpunit/.gitignore +++ b/core/vendor/phpunit/phpunit/.gitignore @@ -6,6 +6,7 @@ build/pdepend build/phar build/phpdox build/*.phar +build/*.phar.asc tests/TextUI/*.diff tests/TextUI/*.exp tests/TextUI/*.log diff --git a/core/vendor/phpunit/phpunit/.travis.yml b/core/vendor/phpunit/phpunit/.travis.yml index d5ea485..320d708 100644 --- a/core/vendor/phpunit/phpunit/.travis.yml +++ b/core/vendor/phpunit/phpunit/.travis.yml @@ -9,13 +9,10 @@ php: - hhvm - hhvm-nightly -matrix: - allow_failures: - - php: hhvm - before_script: - composer self-update - composer install --no-interaction --prefer-source --dev + - if [[ "$TRAVIS_PHP_VERSION" == hhvm* ]]; then echo -e '\nhhvm.libxml.ext_entity_whitelist = "file"' | sudo tee -a /etc/hhvm/php.ini; fi script: ./phpunit --configuration ./build/travis-ci.xml diff --git a/core/vendor/phpunit/phpunit/build.xml b/core/vendor/phpunit/phpunit/build.xml index 176d07a..29eb156 100644 --- a/core/vendor/phpunit/phpunit/build.xml +++ b/core/vendor/phpunit/phpunit/build.xml @@ -20,6 +20,7 @@ + @@ -152,6 +153,21 @@ + + + + + + + + + + + + + @@ -196,15 +212,16 @@ + + - - + @@ -212,6 +229,7 @@ + @@ -219,6 +237,7 @@ + @@ -226,25 +245,28 @@ + - + - + + + @@ -252,12 +274,14 @@ + + @@ -265,6 +289,7 @@ + @@ -272,6 +297,21 @@ + + + + + + + + + + + + + + + diff --git a/core/vendor/phpunit/phpunit/build/phar-autoload.php.in b/core/vendor/phpunit/phpunit/build/phar-autoload.php.in index 26660de..62d8f49 100644 --- a/core/vendor/phpunit/phpunit/build/phar-autoload.php.in +++ b/core/vendor/phpunit/phpunit/build/phar-autoload.php.in @@ -1,10 +1,12 @@ #!/usr/bin/env php @@ -22,4 +22,3 @@ - diff --git a/core/vendor/phpunit/phpunit/composer.json b/core/vendor/phpunit/phpunit/composer.json index bf04caf..e136bf8 100644 --- a/core/vendor/phpunit/phpunit/composer.json +++ b/core/vendor/phpunit/phpunit/composer.json @@ -26,7 +26,7 @@ "phpunit/php-text-template": "~1.2", "phpunit/php-code-coverage": "~2.0", "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": "~2.1", + "phpunit/phpunit-mock-objects": "~2.2", "symfony/yaml": "~2.0", "sebastian/comparator": "~1.0", "sebastian/diff": "~1.1", @@ -64,7 +64,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.1.x-dev" + "dev-master": "4.2.x-dev" } }, "include-path": [ diff --git a/core/vendor/phpunit/phpunit/phpunit b/core/vendor/phpunit/phpunit/phpunit index 44f3c6d..df699fa 100755 --- a/core/vendor/phpunit/phpunit/phpunit +++ b/core/vendor/phpunit/phpunit/phpunit @@ -42,12 +42,13 @@ foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php' } } +unset($file); + if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - die( - 'You need to set up the project dependencies using the following commands:' . PHP_EOL . + echo 'You need to set up the project dependencies using the following commands:' . PHP_EOL . 'wget http://getcomposer.org/composer.phar' . PHP_EOL . - 'php composer.phar install' . PHP_EOL - ); + 'php composer.phar install' . PHP_EOL; + die(1); } require PHPUNIT_COMPOSER_INSTALL; diff --git a/core/vendor/phpunit/phpunit/phpunit.xml.dist b/core/vendor/phpunit/phpunit/phpunit.xml.dist index 50966d7..dd7a0c5 100644 --- a/core/vendor/phpunit/phpunit/phpunit.xml.dist +++ b/core/vendor/phpunit/phpunit/phpunit.xml.dist @@ -1,6 +1,6 @@ diff --git a/core/vendor/phpunit/phpunit/phpunit.xsd b/core/vendor/phpunit/phpunit/phpunit.xsd index 0f46f11..f826b11 100644 --- a/core/vendor/phpunit/phpunit/phpunit.xsd +++ b/core/vendor/phpunit/phpunit/phpunit.xsd @@ -2,7 +2,7 @@ - This Schema file defines the rules by which the XML configuration file of PHPUnit 4.1 may be structured. + This Schema file defines the rules by which the XML configuration file of PHPUnit 4.2 may be structured. @@ -204,6 +204,7 @@ + diff --git a/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php index 9735a82..91ec357 100644 --- a/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php +++ b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php @@ -76,14 +76,14 @@ public function __construct(PHPUnit_Framework_TestSuite $suite, array $groups) } $tests = new RecursiveIteratorIterator( - new PHPUnit_Util_TestSuiteIterator($suite), - RecursiveIteratorIterator::LEAVES_ONLY + new PHPUnit_Util_TestSuiteIterator($suite), + RecursiveIteratorIterator::LEAVES_ONLY ); foreach ($tests as $test) { if ($test instanceof PHPUnit_Framework_TestCase) { $testGroups = PHPUnit_Util_Test::getGroups( - get_class($test), $test->getName(false) + get_class($test), $test->getName(false) ); foreach ($groups as $group) { diff --git a/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php index 49fbd96..993e357 100644 --- a/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php +++ b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php @@ -102,10 +102,10 @@ public function __construct($filename) if (!is_file($filename)) { throw new PHPUnit_Framework_Exception( - sprintf( - 'File "%s" does not exist.', - $filename - ) + sprintf( + 'File "%s" does not exist.', + $filename + ) ); } @@ -242,15 +242,15 @@ private function parse() private function render($code) { return str_replace( - array( + array( '__DIR__', '__FILE__' - ), - array( + ), + array( "'" . dirname($this->filename) . "'", "'" . $this->filename . "'" - ), - $code + ), + $code ); } } diff --git a/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php index 65efc67..f36057b 100644 --- a/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php +++ b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php @@ -80,13 +80,8 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator protected $timesRepeat = 1; /** - * Constructor. - * * @param PHPUnit_Framework_Test $test * @param integer $timesRepeat - * @param mixed $filter - * @param array $groups - * @param array $excludeGroups * @param boolean $processIsolation * @throws PHPUnit_Framework_Exception */ @@ -99,7 +94,7 @@ public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $pro $this->timesRepeat = $timesRepeat; } else { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'positive integer' + 2, 'positive integer' ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Assert.php b/core/vendor/phpunit/phpunit/src/Framework/Assert.php index 8b1b1f5..2c216cd 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Assert.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Assert.php @@ -73,13 +73,15 @@ public static function assertArrayHasKey($key, $array, $message = '') { if (!(is_integer($key) || is_string($key))) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'integer or string' + 1, + 'integer or string' ); } if (!(is_array($array) || $array instanceof ArrayAccess)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array or ArrayAccess' + 2, + 'array or ArrayAccess' ); } @@ -100,18 +102,20 @@ public static function assertArrayNotHasKey($key, $array, $message = '') { if (!(is_integer($key) || is_string($key))) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'integer or string' + 1, + 'integer or string' ); } if (!(is_array($array) || $array instanceof ArrayAccess)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array or ArrayAccess' + 2, + 'array or ArrayAccess' ); } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_ArrayHasKey($key) + new PHPUnit_Framework_Constraint_ArrayHasKey($key) ); self::assertThat($array, $constraint, $message); @@ -133,15 +137,19 @@ public static function assertContains($needle, $haystack, $message = '', $ignore if (is_array($haystack) || is_object($haystack) && $haystack instanceof Traversable) { $constraint = new PHPUnit_Framework_Constraint_TraversableContains( - $needle, $checkForObjectIdentity, $checkForNonObjectIdentity + $needle, + $checkForObjectIdentity, + $checkForNonObjectIdentity ); } elseif (is_string($haystack)) { $constraint = new PHPUnit_Framework_Constraint_StringContains( - $needle, $ignoreCase + $needle, + $ignoreCase ); } else { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array, traversable or string' + 2, + 'array, traversable or string' ); } @@ -164,12 +172,12 @@ public static function assertContains($needle, $haystack, $message = '', $ignore public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { self::assertContains( - $needle, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message, - $ignoreCase, - $checkForObjectIdentity, - $checkForNonObjectIdentity + $needle, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message, + $ignoreCase, + $checkForObjectIdentity, + $checkForNonObjectIdentity ); } @@ -189,19 +197,23 @@ public static function assertNotContains($needle, $haystack, $message = '', $ign if (is_array($haystack) || is_object($haystack) && $haystack instanceof Traversable) { $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_TraversableContains( - $needle, $checkForObjectIdentity, $checkForNonObjectIdentity - ) + new PHPUnit_Framework_Constraint_TraversableContains( + $needle, + $checkForObjectIdentity, + $checkForNonObjectIdentity + ) ); } elseif (is_string($haystack)) { $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_StringContains( - $needle, $ignoreCase - ) + new PHPUnit_Framework_Constraint_StringContains( + $needle, + $ignoreCase + ) ); } else { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array, traversable or string' + 2, + 'array, traversable or string' ); } @@ -224,12 +236,12 @@ public static function assertNotContains($needle, $haystack, $message = '', $ign public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { self::assertNotContains( - $needle, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message, - $ignoreCase, - $checkForObjectIdentity, - $checkForNonObjectIdentity + $needle, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message, + $ignoreCase, + $checkForObjectIdentity, + $checkForNonObjectIdentity ); } @@ -247,7 +259,8 @@ public static function assertContainsOnly($type, $haystack, $isNativeType = null if (!(is_array($haystack) || is_object($haystack) && $haystack instanceof Traversable)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array or traversable' + 2, + 'array or traversable' ); } @@ -256,11 +269,12 @@ public static function assertContainsOnly($type, $haystack, $isNativeType = null } self::assertThat( - $haystack, - new PHPUnit_Framework_Constraint_TraversableContainsOnly( - $type, $isNativeType - ), - $message + $haystack, + new PHPUnit_Framework_Constraint_TraversableContainsOnly( + $type, + $isNativeType + ), + $message ); } @@ -276,14 +290,16 @@ public static function assertContainsOnlyInstancesOf($classname, $haystack, $mes if (!(is_array($haystack) || is_object($haystack) && $haystack instanceof Traversable)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array or traversable' + 2, + 'array or traversable' ); } self::assertThat( $haystack, new PHPUnit_Framework_Constraint_TraversableContainsOnly( - $classname, false + $classname, + false ), $message ); @@ -303,10 +319,10 @@ public static function assertContainsOnlyInstancesOf($classname, $haystack, $mes public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') { self::assertContainsOnly( - $type, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $isNativeType, - $message + $type, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $isNativeType, + $message ); } @@ -324,7 +340,8 @@ public static function assertNotContainsOnly($type, $haystack, $isNativeType = n if (!(is_array($haystack) || is_object($haystack) && $haystack instanceof Traversable)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 2, 'array or traversable' + 2, + 'array or traversable' ); } @@ -333,13 +350,14 @@ public static function assertNotContainsOnly($type, $haystack, $isNativeType = n } self::assertThat( - $haystack, - new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_TraversableContainsOnly( - $type, $isNativeType - ) - ), - $message + $haystack, + new PHPUnit_Framework_Constraint_Not( + new PHPUnit_Framework_Constraint_TraversableContainsOnly( + $type, + $isNativeType + ) + ), + $message ); } @@ -358,10 +376,10 @@ public static function assertNotContainsOnly($type, $haystack, $isNativeType = n public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') { self::assertNotContainsOnly( - $type, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $isNativeType, - $message + $type, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $isNativeType, + $message ); } @@ -385,9 +403,9 @@ public static function assertCount($expectedCount, $haystack, $message = '') } self::assertThat( - $haystack, - new PHPUnit_Framework_Constraint_Count($expectedCount), - $message + $haystack, + new PHPUnit_Framework_Constraint_Count($expectedCount), + $message ); } @@ -404,9 +422,9 @@ public static function assertCount($expectedCount, $haystack, $message = '') public static function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') { self::assertCount( - $expectedCount, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message + $expectedCount, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message ); } @@ -430,7 +448,7 @@ public static function assertNotCount($expectedCount, $haystack, $message = '') } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_Count($expectedCount) + new PHPUnit_Framework_Constraint_Count($expectedCount) ); self::assertThat($haystack, $constraint, $message); @@ -449,9 +467,9 @@ public static function assertNotCount($expectedCount, $haystack, $message = '') public static function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') { self::assertNotCount( - $expectedCount, - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message + $expectedCount, + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message ); } @@ -469,7 +487,11 @@ public static function assertAttributeNotCount($expectedCount, $haystackAttribut public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { $constraint = new PHPUnit_Framework_Constraint_IsEqual( - $expected, $delta, $maxDepth, $canonicalize, $ignoreCase + $expected, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase ); self::assertThat($actual, $constraint, $message); @@ -490,13 +512,13 @@ public static function assertEquals($expected, $actual, $message = '', $delta = public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { self::assertEquals( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message, - $delta, - $maxDepth, - $canonicalize, - $ignoreCase + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase ); } @@ -515,9 +537,13 @@ public static function assertAttributeEquals($expected, $actualAttributeName, $a public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_IsEqual( - $expected, $delta, $maxDepth, $canonicalize, $ignoreCase - ) + new PHPUnit_Framework_Constraint_IsEqual( + $expected, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase + ) ); self::assertThat($actual, $constraint, $message); @@ -538,13 +564,13 @@ public static function assertNotEquals($expected, $actual, $message = '', $delta public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { self::assertNotEquals( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message, - $delta, - $maxDepth, - $canonicalize, - $ignoreCase + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase ); } @@ -572,8 +598,8 @@ public static function assertEmpty($actual, $message = '') public static function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') { self::assertEmpty( - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message ); } @@ -601,8 +627,8 @@ public static function assertNotEmpty($actual, $message = '') public static function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') { self::assertNotEmpty( - self::readAttribute($haystackClassOrObject, $haystackAttributeName), - $message + self::readAttribute($haystackClassOrObject, $haystackAttributeName), + $message ); } @@ -631,9 +657,9 @@ public static function assertGreaterThan($expected, $actual, $message = '') public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertGreaterThan( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -648,7 +674,9 @@ public static function assertAttributeGreaterThan($expected, $actualAttributeNam public static function assertGreaterThanOrEqual($expected, $actual, $message = '') { self::assertThat( - $actual, self::greaterThanOrEqual($expected), $message + $actual, + self::greaterThanOrEqual($expected), + $message ); } @@ -664,9 +692,9 @@ public static function assertGreaterThanOrEqual($expected, $actual, $message = ' public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertGreaterThanOrEqual( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -695,9 +723,9 @@ public static function assertLessThan($expected, $actual, $message = '') public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertLessThan( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -726,9 +754,9 @@ public static function assertLessThanOrEqual($expected, $actual, $message = '') public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertLessThanOrEqual( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -749,13 +777,13 @@ public static function assertFileEquals($expected, $actual, $message = '', $cano self::assertFileExists($actual, $message); self::assertEquals( - file_get_contents($expected), - file_get_contents($actual), - $message, - 0, - 10, - $canonicalize, - $ignoreCase + file_get_contents($expected), + file_get_contents($actual), + $message, + 0, + 10, + $canonicalize, + $ignoreCase ); } @@ -776,13 +804,13 @@ public static function assertFileNotEquals($expected, $actual, $message = '', $c self::assertFileExists($actual, $message); self::assertNotEquals( - file_get_contents($expected), - file_get_contents($actual), - $message, - 0, - 10, - $canonicalize, - $ignoreCase + file_get_contents($expected), + file_get_contents($actual), + $message, + 0, + 10, + $canonicalize, + $ignoreCase ); } @@ -802,13 +830,13 @@ public static function assertStringEqualsFile($expectedFile, $actualString, $mes self::assertFileExists($expectedFile, $message); self::assertEquals( - file_get_contents($expectedFile), - $actualString, - $message, - 0, - 10, - $canonicalize, - $ignoreCase + file_get_contents($expectedFile), + $actualString, + $message, + 0, + 10, + $canonicalize, + $ignoreCase ); } @@ -828,13 +856,13 @@ public static function assertStringNotEqualsFile($expectedFile, $actualString, $ self::assertFileExists($expectedFile, $message); self::assertNotEquals( - file_get_contents($expectedFile), - $actualString, - $message, - 0, - 10, - $canonicalize, - $ignoreCase + file_get_contents($expectedFile), + $actualString, + $message, + 0, + 10, + $canonicalize, + $ignoreCase ); } @@ -870,7 +898,7 @@ public static function assertFileNotExists($filename, $message = '') } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_FileExists + new PHPUnit_Framework_Constraint_FileExists ); self::assertThat($filename, $constraint, $message); @@ -969,7 +997,7 @@ public static function assertClassHasAttribute($attributeName, $className, $mess } $constraint = new PHPUnit_Framework_Constraint_ClassHasAttribute( - $attributeName + $attributeName ); self::assertThat($className, $constraint, $message); @@ -998,7 +1026,7 @@ public static function assertClassNotHasAttribute($attributeName, $className, $m } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_ClassHasAttribute($attributeName) + new PHPUnit_Framework_Constraint_ClassHasAttribute($attributeName) ); self::assertThat($className, $constraint, $message); @@ -1027,7 +1055,7 @@ public static function assertClassHasStaticAttribute($attributeName, $className, } $constraint = new PHPUnit_Framework_Constraint_ClassHasStaticAttribute( - $attributeName + $attributeName ); self::assertThat($className, $constraint, $message); @@ -1056,9 +1084,9 @@ public static function assertClassNotHasStaticAttribute($attributeName, $classNa } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_ClassHasStaticAttribute( - $attributeName - ) + new PHPUnit_Framework_Constraint_ClassHasStaticAttribute( + $attributeName + ) ); self::assertThat($className, $constraint, $message); @@ -1087,7 +1115,7 @@ public static function assertObjectHasAttribute($attributeName, $object, $messag } $constraint = new PHPUnit_Framework_Constraint_ObjectHasAttribute( - $attributeName + $attributeName ); self::assertThat($object, $constraint, $message); @@ -1116,7 +1144,7 @@ public static function assertObjectNotHasAttribute($attributeName, $object, $mes } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_ObjectHasAttribute($attributeName) + new PHPUnit_Framework_Constraint_ObjectHasAttribute($attributeName) ); self::assertThat($object, $constraint, $message); @@ -1137,7 +1165,7 @@ public static function assertSame($expected, $actual, $message = '') self::assertEquals($expected, $actual, $message); } else { $constraint = new PHPUnit_Framework_Constraint_IsIdentical( - $expected + $expected ); self::assertThat($actual, $constraint, $message); @@ -1156,9 +1184,9 @@ public static function assertSame($expected, $actual, $message = '') public static function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertSame( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -1177,7 +1205,7 @@ public static function assertNotSame($expected, $actual, $message = '') self::assertNotEquals($expected, $actual, $message); } else { $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_IsIdentical($expected) + new PHPUnit_Framework_Constraint_IsIdentical($expected) ); self::assertThat($actual, $constraint, $message); @@ -1196,9 +1224,9 @@ public static function assertNotSame($expected, $actual, $message = '') public static function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '') { self::assertNotSame( - $expected, - self::readAttribute($actualClassOrObject, $actualAttributeName), - $message + $expected, + self::readAttribute($actualClassOrObject, $actualAttributeName), + $message ); } @@ -1235,9 +1263,9 @@ public static function assertInstanceOf($expected, $actual, $message = '') public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '') { self::assertInstanceOf( - $expected, - self::readAttribute($classOrObject, $attributeName), - $message + $expected, + self::readAttribute($classOrObject, $attributeName), + $message ); } @@ -1274,9 +1302,9 @@ public static function assertNotInstanceOf($expected, $actual, $message = '') public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '') { self::assertNotInstanceOf( - $expected, - self::readAttribute($classOrObject, $attributeName), - $message + $expected, + self::readAttribute($classOrObject, $attributeName), + $message ); } @@ -1313,9 +1341,9 @@ public static function assertInternalType($expected, $actual, $message = '') public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '') { self::assertInternalType( - $expected, - self::readAttribute($classOrObject, $attributeName), - $message + $expected, + self::readAttribute($classOrObject, $attributeName), + $message ); } @@ -1352,9 +1380,9 @@ public static function assertNotInternalType($expected, $actual, $message = '') public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '') { self::assertNotInternalType( - $expected, - self::readAttribute($classOrObject, $attributeName), - $message + $expected, + self::readAttribute($classOrObject, $attributeName), + $message ); } @@ -1399,7 +1427,7 @@ public static function assertNotRegExp($pattern, $string, $message = '') } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_PCREMatch($pattern) + new PHPUnit_Framework_Constraint_PCREMatch($pattern) ); self::assertThat($string, $constraint, $message); @@ -1428,9 +1456,9 @@ public static function assertSameSize($expected, $actual, $message = '') } self::assertThat( - $actual, - new PHPUnit_Framework_Constraint_SameSize($expected), - $message + $actual, + new PHPUnit_Framework_Constraint_SameSize($expected), + $message ); } @@ -1457,7 +1485,7 @@ public static function assertNotSameSize($expected, $actual, $message = '') } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_SameSize($expected) + new PHPUnit_Framework_Constraint_SameSize($expected) ); self::assertThat($actual, $constraint, $message); @@ -1505,7 +1533,7 @@ public static function assertStringNotMatchesFormat($format, $string, $message = } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_StringMatches($format) + new PHPUnit_Framework_Constraint_StringMatches($format) ); self::assertThat($string, $constraint, $message); @@ -1528,7 +1556,7 @@ public static function assertStringMatchesFormatFile($formatFile, $string, $mess } $constraint = new PHPUnit_Framework_Constraint_StringMatches( - file_get_contents($formatFile) + file_get_contents($formatFile) ); self::assertThat($string, $constraint, $message); @@ -1551,9 +1579,9 @@ public static function assertStringNotMatchesFormatFile($formatFile, $string, $m } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_StringMatches( - file_get_contents($formatFile) - ) + new PHPUnit_Framework_Constraint_StringMatches( + file_get_contents($formatFile) + ) ); self::assertThat($string, $constraint, $message); @@ -1578,7 +1606,7 @@ public static function assertStringStartsWith($prefix, $string, $message = '') } $constraint = new PHPUnit_Framework_Constraint_StringStartsWith( - $prefix + $prefix ); self::assertThat($string, $constraint, $message); @@ -1603,7 +1631,7 @@ public static function assertStringStartsNotWith($prefix, $string, $message = '' } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_StringStartsWith($prefix) + new PHPUnit_Framework_Constraint_StringStartsWith($prefix) ); self::assertThat($string, $constraint, $message); @@ -1651,7 +1679,7 @@ public static function assertStringEndsNotWith($suffix, $string, $message = '') } $constraint = new PHPUnit_Framework_Constraint_Not( - new PHPUnit_Framework_Constraint_StringEndsWith($suffix) + new PHPUnit_Framework_Constraint_StringEndsWith($suffix) ); self::assertThat($string, $constraint, $message); @@ -1806,38 +1834,38 @@ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXm public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '') { self::assertEquals( - $expectedElement->tagName, - $actualElement->tagName, - $message + $expectedElement->tagName, + $actualElement->tagName, + $message ); if ($checkAttributes) { self::assertEquals( - $expectedElement->attributes->length, - $actualElement->attributes->length, - sprintf( - '%s%sNumber of attributes on node "%s" does not match', - $message, - !empty($message) ? "\n" : '', - $expectedElement->tagName - ) + $expectedElement->attributes->length, + $actualElement->attributes->length, + sprintf( + '%s%sNumber of attributes on node "%s" does not match', + $message, + !empty($message) ? "\n" : '', + $expectedElement->tagName + ) ); - for ($i = 0 ; $i < $expectedElement->attributes->length; $i++) { + for ($i = 0; $i < $expectedElement->attributes->length; $i++) { $expectedAttribute = $expectedElement->attributes->item($i); $actualAttribute = $actualElement->attributes->getNamedItem( - $expectedAttribute->name + $expectedAttribute->name ); if (!$actualAttribute) { self::fail( - sprintf( - '%s%sCould not find attribute "%s" on node "%s"', - $message, - !empty($message) ? "\n" : '', - $expectedAttribute->name, - $expectedElement->tagName - ) + sprintf( + '%s%sCould not find attribute "%s" on node "%s"', + $message, + !empty($message) ? "\n" : '', + $expectedAttribute->name, + $expectedElement->tagName + ) ); } } @@ -1847,22 +1875,22 @@ public static function assertEqualXMLStructure(DOMElement $expectedElement, DOME PHPUnit_Util_XML::removeCharacterDataNodes($actualElement); self::assertEquals( - $expectedElement->childNodes->length, - $actualElement->childNodes->length, - sprintf( - '%s%sNumber of child nodes of "%s" differs', - $message, - !empty($message) ? "\n" : '', - $expectedElement->tagName - ) + $expectedElement->childNodes->length, + $actualElement->childNodes->length, + sprintf( + '%s%sNumber of child nodes of "%s" differs', + $message, + !empty($message) ? "\n" : '', + $expectedElement->tagName + ) ); for ($i = 0; $i < $expectedElement->childNodes->length; $i++) { self::assertEqualXMLStructure( - $expectedElement->childNodes->item($i), - $actualElement->childNodes->item($i), - $checkAttributes, - $message + $expectedElement->childNodes->item($i), + $actualElement->childNodes->item($i), + $checkAttributes, + $message ); } } @@ -1882,19 +1910,27 @@ public static function assertEqualXMLStructure(DOMElement $expectedElement, DOME * assertSelectCount("#binder", true, $xml); // any? * assertSelectCount(".binder", 3, $xml); // exactly 3? * - * @param array $selector - * @param integer $count - * @param mixed $actual - * @param string $message - * @param boolean $isHtml + * @param array $selector + * @param integer|boolean|array $count + * @param mixed $actual + * @param string $message + * @param boolean $isHtml * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries + * @deprecated */ public static function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true) { + trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED); + self::assertSelectEquals( - $selector, true, $count, $actual, $message, $isHtml + $selector, + true, + $count, + $actual, + $message, + $isHtml ); } @@ -1902,20 +1938,28 @@ public static function assertSelectCount($selector, $count, $actual, $message = * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any? * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml); // 3? * - * @param array $selector - * @param string $pattern - * @param integer $count - * @param mixed $actual - * @param string $message - * @param boolean $isHtml + * @param array $selector + * @param string $pattern + * @param integer|boolean|array $count + * @param mixed $actual + * @param string $message + * @param boolean $isHtml * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries + * @deprecated */ public static function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true) { + trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED); + self::assertSelectEquals( - $selector, "regexp:$pattern", $count, $actual, $message, $isHtml + $selector, + "regexp:$pattern", + $count, + $actual, + $message, + $isHtml ); } @@ -1923,30 +1967,34 @@ public static function assertSelectRegExp($selector, $pattern, $count, $actual, * assertSelectEquals("#binder .name", "Chuck", true, $xml); // any? * assertSelectEquals("#binder .name", "Chuck", false, $xml); // none? * - * @param array $selector - * @param string $content - * @param integer $count - * @param mixed $actual - * @param string $message - * @param boolean $isHtml + * @param array $selector + * @param string $content + * @param integer|boolean|array $count + * @param mixed $actual + * @param string $message + * @param boolean $isHtml * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries + * @deprecated */ public static function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true) { + trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED); + $tags = PHPUnit_Util_XML::cssSelect( - $selector, $content, $actual, $isHtml + $selector, + $content, + $actual, + $isHtml ); // assert specific number of elements if (is_numeric($count)) { $counted = $tags ? count($tags) : 0; self::assertEquals($count, $counted, $message); - } - - // assert any elements exist if true, assert no elements exist if false - else if (is_bool($count)) { + } // assert any elements exist if true, assert no elements exist if false + elseif (is_bool($count)) { $any = count($tags) > 0 && $tags[0] instanceof DOMNode; if ($count) { @@ -1954,10 +2002,8 @@ public static function assertSelectEquals($selector, $content, $count, $actual, } else { self::assertFalse($any, $message); } - } - - // check for range number of elements - else if (is_array($count) && + } // check for range number of elements + elseif (is_array($count) && (isset($count['>']) || isset($count['<']) || isset($count['>=']) || isset($count['<=']))) { $counted = $tags ? count($tags) : 0; @@ -2118,9 +2164,12 @@ public static function assertSelectEquals($selector, $content, $count, $actual, * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries + * @deprecated */ public static function assertTag($matcher, $actual, $message = '', $isHtml = true) { + trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED); + $dom = PHPUnit_Util_XML::load($actual, $isHtml); $tags = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml); $matched = count($tags) > 0 && $tags[0] instanceof DOMNode; @@ -2141,9 +2190,12 @@ public static function assertTag($matcher, $actual, $message = '', $isHtml = tru * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries + * @deprecated */ public static function assertNotTag($matcher, $actual, $message = '', $isHtml = true) { + trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED); + $dom = PHPUnit_Util_XML::load($actual, $isHtml); $tags = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml); $matched = count($tags) > 0 && $tags[0] instanceof DOMNode; @@ -2235,7 +2287,7 @@ public static function assertJsonStringEqualsJsonFile($expectedFile, $actualJson // call constraint $constraint = new PHPUnit_Framework_Constraint_JsonMatches( - $expectedJson + $expectedJson ); self::assertThat($actualJson, $constraint, $message); @@ -2258,7 +2310,7 @@ public static function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJ // call constraint $constraint = new PHPUnit_Framework_Constraint_JsonMatches( - $expectedJson + $expectedJson ); self::assertThat($actualJson, new PHPUnit_Framework_Constraint_Not($constraint), $message); @@ -2284,7 +2336,7 @@ public static function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFil // call constraint $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches( - $expectedJson + $expectedJson ); $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson); @@ -2313,7 +2365,7 @@ public static function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, // call constraint $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches( - $expectedJson + $expectedJson ); $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson); @@ -2459,7 +2511,8 @@ public static function isNull() public static function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) { return new PHPUnit_Framework_Constraint_Attribute( - $constraint, $attributeName + $constraint, + $attributeName ); } @@ -2529,7 +2582,11 @@ public static function arrayHasKey($key) public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return new PHPUnit_Framework_Constraint_IsEqual( - $value, $delta, $maxDepth, $canonicalize, $ignoreCase + $value, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase ); } @@ -2550,10 +2607,14 @@ public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicali public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return self::attribute( - self::equalTo( - $value, $delta, $maxDepth, $canonicalize, $ignoreCase - ), - $attributeName + self::equalTo( + $value, + $delta, + $maxDepth, + $canonicalize, + $ignoreCase + ), + $attributeName ); } @@ -2603,8 +2664,8 @@ public static function greaterThan($value) public static function greaterThanOrEqual($value) { return self::logicalOr( - new PHPUnit_Framework_Constraint_IsEqual($value), - new PHPUnit_Framework_Constraint_GreaterThan($value) + new PHPUnit_Framework_Constraint_IsEqual($value), + new PHPUnit_Framework_Constraint_GreaterThan($value) ); } @@ -2618,7 +2679,7 @@ public static function greaterThanOrEqual($value) public static function classHasAttribute($attributeName) { return new PHPUnit_Framework_Constraint_ClassHasAttribute( - $attributeName + $attributeName ); } @@ -2633,7 +2694,7 @@ public static function classHasAttribute($attributeName) public static function classHasStaticAttribute($attributeName) { return new PHPUnit_Framework_Constraint_ClassHasStaticAttribute( - $attributeName + $attributeName ); } @@ -2647,7 +2708,7 @@ public static function classHasStaticAttribute($attributeName) public static function objectHasAttribute($attributeName) { return new PHPUnit_Framework_Constraint_ObjectHasAttribute( - $attributeName + $attributeName ); } @@ -2711,8 +2772,8 @@ public static function lessThan($value) public static function lessThanOrEqual($value) { return self::logicalOr( - new PHPUnit_Framework_Constraint_IsEqual($value), - new PHPUnit_Framework_Constraint_LessThan($value) + new PHPUnit_Framework_Constraint_IsEqual($value), + new PHPUnit_Framework_Constraint_LessThan($value) ); } @@ -2820,22 +2881,24 @@ public static function readAttribute($classOrObject, $attributeName) if (is_string($classOrObject)) { if (!class_exists($classOrObject)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'class name' + 1, + 'class name' ); } return self::getStaticAttribute( - $classOrObject, - $attributeName + $classOrObject, + $attributeName ); } elseif (is_object($classOrObject)) { return self::getObjectAttribute( - $classOrObject, - $attributeName + $classOrObject, + $attributeName ); } else { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'class name or object' + 1, + 'class name or object' ); } } @@ -2881,10 +2944,10 @@ public static function getStaticAttribute($className, $attributeName) } throw new PHPUnit_Framework_Exception( - sprintf( - 'Attribute "%s" not found in class.', - $attributeName - ) + sprintf( + 'Attribute "%s" not found in class.', + $attributeName + ) ); } @@ -2939,10 +3002,10 @@ public static function getObjectAttribute($object, $attributeName) } throw new PHPUnit_Framework_Exception( - sprintf( - 'Attribute "%s" not found in object.', - $attributeName - ) + sprintf( + 'Attribute "%s" not found in object.', + $attributeName + ) ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php index 041ce20..b90f69f 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php @@ -53,8 +53,8 @@ function any() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::any', - func_get_args() + 'PHPUnit_Framework_TestCase::any', + func_get_args() ); } @@ -67,8 +67,8 @@ function any() function anything() { return call_user_func_array( - 'PHPUnit_Framework_Assert::anything', - func_get_args() + 'PHPUnit_Framework_Assert::anything', + func_get_args() ); } @@ -82,8 +82,8 @@ function anything() function arrayHasKey($key) { return call_user_func_array( - 'PHPUnit_Framework_Assert::arrayHasKey', - func_get_args() + 'PHPUnit_Framework_Assert::arrayHasKey', + func_get_args() ); } @@ -98,8 +98,8 @@ function arrayHasKey($key) function assertArrayHasKey($key, $array, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertArrayHasKey', - func_get_args() + 'PHPUnit_Framework_Assert::assertArrayHasKey', + func_get_args() ); } @@ -114,8 +114,8 @@ function assertArrayHasKey($key, $array, $message = '') function assertArrayNotHasKey($key, $array, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertArrayNotHasKey', - func_get_args() + 'PHPUnit_Framework_Assert::assertArrayNotHasKey', + func_get_args() ); } @@ -135,8 +135,8 @@ function assertArrayNotHasKey($key, $array, $message = '') function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeContains', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeContains', + func_get_args() ); } @@ -154,8 +154,8 @@ function assertAttributeContains($needle, $haystackAttributeName, $haystackClass function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeContainsOnly', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeContainsOnly', + func_get_args() ); } @@ -172,8 +172,8 @@ function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackCla function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeCount', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeCount', + func_get_args() ); } @@ -189,8 +189,8 @@ function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackC function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeEmpty', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeEmpty', + func_get_args() ); } @@ -209,8 +209,8 @@ function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $m function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeEquals', + func_get_args() ); } @@ -226,8 +226,8 @@ function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrOb function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeGreaterThan', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeGreaterThan', + func_get_args() ); } @@ -243,8 +243,8 @@ function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClas function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeGreaterThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeGreaterThanOrEqual', + func_get_args() ); } @@ -260,8 +260,8 @@ function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $act function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeInstanceOf', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeInstanceOf', + func_get_args() ); } @@ -277,8 +277,8 @@ function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $m function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeInternalType', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeInternalType', + func_get_args() ); } @@ -294,8 +294,8 @@ function assertAttributeInternalType($expected, $attributeName, $classOrObject, function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeLessThan', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeLessThan', + func_get_args() ); } @@ -311,8 +311,8 @@ function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOr function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeLessThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeLessThanOrEqual', + func_get_args() ); } @@ -332,8 +332,8 @@ function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actual function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotContains', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotContains', + func_get_args() ); } @@ -352,8 +352,8 @@ function assertAttributeNotContains($needle, $haystackAttributeName, $haystackCl function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotContainsOnly', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotContainsOnly', + func_get_args() ); } @@ -370,8 +370,8 @@ function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystack function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotCount', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotCount', + func_get_args() ); } @@ -387,8 +387,8 @@ function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haysta function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotEmpty', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotEmpty', + func_get_args() ); } @@ -407,8 +407,8 @@ function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotEquals', + func_get_args() ); } @@ -424,8 +424,8 @@ function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassO function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotInstanceOf', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotInstanceOf', + func_get_args() ); } @@ -441,8 +441,8 @@ function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotInternalType', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotInternalType', + func_get_args() ); } @@ -458,8 +458,8 @@ function assertAttributeNotInternalType($expected, $attributeName, $classOrObjec function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeNotSame', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeNotSame', + func_get_args() ); } @@ -475,8 +475,8 @@ function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrO function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertAttributeSame', - func_get_args() + 'PHPUnit_Framework_Assert::assertAttributeSame', + func_get_args() ); } @@ -491,8 +491,8 @@ function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObje function assertClassHasAttribute($attributeName, $className, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertClassHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertClassHasAttribute', + func_get_args() ); } @@ -507,8 +507,8 @@ function assertClassHasAttribute($attributeName, $className, $message = '') function assertClassHasStaticAttribute($attributeName, $className, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertClassHasStaticAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertClassHasStaticAttribute', + func_get_args() ); } @@ -523,8 +523,8 @@ function assertClassHasStaticAttribute($attributeName, $className, $message = '' function assertClassNotHasAttribute($attributeName, $className, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertClassNotHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertClassNotHasAttribute', + func_get_args() ); } @@ -539,8 +539,8 @@ function assertClassNotHasAttribute($attributeName, $className, $message = '') function assertClassNotHasStaticAttribute($attributeName, $className, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute', + func_get_args() ); } @@ -558,8 +558,8 @@ function assertClassNotHasStaticAttribute($attributeName, $className, $message = function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertContains', - func_get_args() + 'PHPUnit_Framework_Assert::assertContains', + func_get_args() ); } @@ -575,8 +575,8 @@ function assertContains($needle, $haystack, $message = '', $ignoreCase = false, function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertContainsOnly', - func_get_args() + 'PHPUnit_Framework_Assert::assertContainsOnly', + func_get_args() ); } @@ -590,8 +590,8 @@ function assertContainsOnly($type, $haystack, $isNativeType = null, $message = ' function assertContainsOnlyInstancesOf($classname, $haystack, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf', - func_get_args() + 'PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf', + func_get_args() ); } @@ -605,8 +605,8 @@ function assertContainsOnlyInstancesOf($classname, $haystack, $message = '') function assertCount($expectedCount, $haystack, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertCount', - func_get_args() + 'PHPUnit_Framework_Assert::assertCount', + func_get_args() ); } @@ -620,8 +620,8 @@ function assertCount($expectedCount, $haystack, $message = '') function assertEmpty($actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertEmpty', - func_get_args() + 'PHPUnit_Framework_Assert::assertEmpty', + func_get_args() ); } @@ -638,8 +638,8 @@ function assertEmpty($actual, $message = '') function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertEqualXMLStructure', - func_get_args() + 'PHPUnit_Framework_Assert::assertEqualXMLStructure', + func_get_args() ); } @@ -657,8 +657,8 @@ function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actual function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertEquals', + func_get_args() ); } @@ -672,8 +672,8 @@ function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth function assertNotTrue($condition, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotTrue', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotTrue', + func_get_args() ); } @@ -687,8 +687,8 @@ function assertNotTrue($condition, $message = '') function assertFalse($condition, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertFalse', - func_get_args() + 'PHPUnit_Framework_Assert::assertFalse', + func_get_args() ); } @@ -706,8 +706,8 @@ function assertFalse($condition, $message = '') function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertFileEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertFileEquals', + func_get_args() ); } @@ -721,8 +721,8 @@ function assertFileEquals($expected, $actual, $message = '', $canonicalize = fal function assertFileExists($filename, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertFileExists', - func_get_args() + 'PHPUnit_Framework_Assert::assertFileExists', + func_get_args() ); } @@ -740,8 +740,8 @@ function assertFileExists($filename, $message = '') function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertFileNotEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertFileNotEquals', + func_get_args() ); } @@ -755,8 +755,8 @@ function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = function assertFileNotExists($filename, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertFileNotExists', - func_get_args() + 'PHPUnit_Framework_Assert::assertFileNotExists', + func_get_args() ); } @@ -771,8 +771,8 @@ function assertFileNotExists($filename, $message = '') function assertGreaterThan($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertGreaterThan', - func_get_args() + 'PHPUnit_Framework_Assert::assertGreaterThan', + func_get_args() ); } @@ -787,8 +787,8 @@ function assertGreaterThan($expected, $actual, $message = '') function assertGreaterThanOrEqual($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertGreaterThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::assertGreaterThanOrEqual', + func_get_args() ); } @@ -803,8 +803,8 @@ function assertGreaterThanOrEqual($expected, $actual, $message = '') function assertInstanceOf($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertInstanceOf', - func_get_args() + 'PHPUnit_Framework_Assert::assertInstanceOf', + func_get_args() ); } @@ -819,8 +819,8 @@ function assertInstanceOf($expected, $actual, $message = '') function assertInternalType($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertInternalType', - func_get_args() + 'PHPUnit_Framework_Assert::assertInternalType', + func_get_args() ); } @@ -834,8 +834,8 @@ function assertInternalType($expected, $actual, $message = '') function assertJson($expectedJson, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJson', - func_get_args() + 'PHPUnit_Framework_Assert::assertJson', + func_get_args() ); } @@ -849,8 +849,8 @@ function assertJson($expectedJson, $message = '') function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonFileEqualsJsonFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonFileEqualsJsonFile', + func_get_args() ); } @@ -864,8 +864,8 @@ function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '') function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonFileNotEqualsJsonFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonFileNotEqualsJsonFile', + func_get_args() ); } @@ -879,8 +879,8 @@ function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile', + func_get_args() ); } @@ -894,8 +894,8 @@ function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = ' function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString', + func_get_args() ); } @@ -909,8 +909,8 @@ function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile', + func_get_args() ); } @@ -924,8 +924,8 @@ function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString', - func_get_args() + 'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString', + func_get_args() ); } @@ -940,8 +940,8 @@ function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $messag function assertLessThan($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertLessThan', - func_get_args() + 'PHPUnit_Framework_Assert::assertLessThan', + func_get_args() ); } @@ -956,8 +956,8 @@ function assertLessThan($expected, $actual, $message = '') function assertLessThanOrEqual($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertLessThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::assertLessThanOrEqual', + func_get_args() ); } @@ -975,8 +975,8 @@ function assertLessThanOrEqual($expected, $actual, $message = '') function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotContains', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotContains', + func_get_args() ); } @@ -992,8 +992,8 @@ function assertNotContains($needle, $haystack, $message = '', $ignoreCase = fals function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotContainsOnly', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotContainsOnly', + func_get_args() ); } @@ -1007,8 +1007,8 @@ function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message function assertNotCount($expectedCount, $haystack, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotCount', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotCount', + func_get_args() ); } @@ -1022,8 +1022,8 @@ function assertNotCount($expectedCount, $haystack, $message = '') function assertNotEmpty($actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotEmpty', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotEmpty', + func_get_args() ); } @@ -1042,8 +1042,8 @@ function assertNotEmpty($actual, $message = '') function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotEquals', + func_get_args() ); } @@ -1058,8 +1058,8 @@ function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDe function assertNotInstanceOf($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotInstanceOf', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotInstanceOf', + func_get_args() ); } @@ -1074,8 +1074,8 @@ function assertNotInstanceOf($expected, $actual, $message = '') function assertNotInternalType($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotInternalType', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotInternalType', + func_get_args() ); } @@ -1089,8 +1089,8 @@ function assertNotInternalType($expected, $actual, $message = '') function assertNotFalse($condition, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotFalse', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotFalse', + func_get_args() ); } @@ -1103,8 +1103,8 @@ function assertNotFalse($condition, $message = '') function assertNotNull($actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotNull', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotNull', + func_get_args() ); } @@ -1119,8 +1119,8 @@ function assertNotNull($actual, $message = '') function assertNotRegExp($pattern, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotRegExp', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotRegExp', + func_get_args() ); } @@ -1136,8 +1136,8 @@ function assertNotRegExp($pattern, $string, $message = '') function assertNotSame($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotSame', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotSame', + func_get_args() ); } @@ -1152,8 +1152,8 @@ function assertNotSame($expected, $actual, $message = '') function assertNotSameSize($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotSameSize', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotSameSize', + func_get_args() ); } @@ -1174,8 +1174,8 @@ function assertNotSameSize($expected, $actual, $message = '') function assertNotTag($matcher, $actual, $message = '', $isHtml = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNotTag', - func_get_args() + 'PHPUnit_Framework_Assert::assertNotTag', + func_get_args() ); } @@ -1188,8 +1188,8 @@ function assertNotTag($matcher, $actual, $message = '', $isHtml = true) function assertNull($actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertNull', - func_get_args() + 'PHPUnit_Framework_Assert::assertNull', + func_get_args() ); } @@ -1204,8 +1204,8 @@ function assertNull($actual, $message = '') function assertObjectHasAttribute($attributeName, $object, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertObjectHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertObjectHasAttribute', + func_get_args() ); } @@ -1220,8 +1220,8 @@ function assertObjectHasAttribute($attributeName, $object, $message = '') function assertObjectNotHasAttribute($attributeName, $object, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertObjectNotHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::assertObjectNotHasAttribute', + func_get_args() ); } @@ -1235,8 +1235,8 @@ function assertObjectNotHasAttribute($attributeName, $object, $message = '') function assertRegExp($pattern, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertRegExp', - func_get_args() + 'PHPUnit_Framework_Assert::assertRegExp', + func_get_args() ); } @@ -1252,8 +1252,8 @@ function assertRegExp($pattern, $string, $message = '') function assertSame($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertSame', - func_get_args() + 'PHPUnit_Framework_Assert::assertSame', + func_get_args() ); } @@ -1268,8 +1268,8 @@ function assertSame($expected, $actual, $message = '') function assertSameSize($expected, $actual, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertSameSize', - func_get_args() + 'PHPUnit_Framework_Assert::assertSameSize', + func_get_args() ); } @@ -1300,8 +1300,8 @@ function assertSameSize($expected, $actual, $message = '') function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertSelectCount', - func_get_args() + 'PHPUnit_Framework_Assert::assertSelectCount', + func_get_args() ); } @@ -1322,8 +1322,8 @@ function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertSelectEquals', - func_get_args() + 'PHPUnit_Framework_Assert::assertSelectEquals', + func_get_args() ); } @@ -1344,8 +1344,8 @@ function assertSelectEquals($selector, $content, $count, $actual, $message = '', function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertSelectRegExp', - func_get_args() + 'PHPUnit_Framework_Assert::assertSelectRegExp', + func_get_args() ); } @@ -1360,8 +1360,8 @@ function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', function assertStringEndsNotWith($suffix, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringEndsNotWith', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringEndsNotWith', + func_get_args() ); } @@ -1376,8 +1376,8 @@ function assertStringEndsNotWith($suffix, $string, $message = '') function assertStringEndsWith($suffix, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringEndsWith', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringEndsWith', + func_get_args() ); } @@ -1395,8 +1395,8 @@ function assertStringEndsWith($suffix, $string, $message = '') function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringEqualsFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringEqualsFile', + func_get_args() ); } @@ -1411,8 +1411,8 @@ function assertStringEqualsFile($expectedFile, $actualString, $message = '', $ca function assertStringMatchesFormat($format, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringMatchesFormat', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringMatchesFormat', + func_get_args() ); } @@ -1427,8 +1427,8 @@ function assertStringMatchesFormat($format, $string, $message = '') function assertStringMatchesFormatFile($formatFile, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringMatchesFormatFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringMatchesFormatFile', + func_get_args() ); } @@ -1446,8 +1446,8 @@ function assertStringMatchesFormatFile($formatFile, $string, $message = '') function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringNotEqualsFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringNotEqualsFile', + func_get_args() ); } @@ -1462,8 +1462,8 @@ function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', function assertStringNotMatchesFormat($format, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringNotMatchesFormat', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringNotMatchesFormat', + func_get_args() ); } @@ -1478,8 +1478,8 @@ function assertStringNotMatchesFormat($format, $string, $message = '') function assertStringNotMatchesFormatFile($formatFile, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringNotMatchesFormatFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringNotMatchesFormatFile', + func_get_args() ); } @@ -1494,8 +1494,8 @@ function assertStringNotMatchesFormatFile($formatFile, $string, $message = '') function assertStringStartsNotWith($prefix, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringStartsNotWith', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringStartsNotWith', + func_get_args() ); } @@ -1510,8 +1510,8 @@ function assertStringStartsNotWith($prefix, $string, $message = '') function assertStringStartsWith($prefix, $string, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertStringStartsWith', - func_get_args() + 'PHPUnit_Framework_Assert::assertStringStartsWith', + func_get_args() ); } @@ -1655,8 +1655,8 @@ function assertStringStartsWith($prefix, $string, $message = '') function assertTag($matcher, $actual, $message = '', $isHtml = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertTag', - func_get_args() + 'PHPUnit_Framework_Assert::assertTag', + func_get_args() ); } @@ -1671,8 +1671,8 @@ function assertTag($matcher, $actual, $message = '', $isHtml = true) function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertThat', - func_get_args() + 'PHPUnit_Framework_Assert::assertThat', + func_get_args() ); } @@ -1686,8 +1686,8 @@ function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = function assertTrue($condition, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertTrue', - func_get_args() + 'PHPUnit_Framework_Assert::assertTrue', + func_get_args() ); } @@ -1702,8 +1702,8 @@ function assertTrue($condition, $message = '') function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlFileEqualsXmlFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlFileEqualsXmlFile', + func_get_args() ); } @@ -1718,8 +1718,8 @@ function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '') function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlFileNotEqualsXmlFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlFileNotEqualsXmlFile', + func_get_args() ); } @@ -1734,8 +1734,8 @@ function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '' function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlFile', + func_get_args() ); } @@ -1750,8 +1750,8 @@ function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '') function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString', + func_get_args() ); } @@ -1766,8 +1766,8 @@ function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '') function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlFile', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlFile', + func_get_args() ); } @@ -1782,8 +1782,8 @@ function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = ' function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '') { return call_user_func_array( - 'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlString', - func_get_args() + 'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlString', + func_get_args() ); } @@ -1798,8 +1798,8 @@ function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = function at($index) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::at', - func_get_args() + 'PHPUnit_Framework_TestCase::at', + func_get_args() ); } @@ -1813,8 +1813,8 @@ function at($index) function atLeastOnce() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::atLeastOnce', - func_get_args() + 'PHPUnit_Framework_TestCase::atLeastOnce', + func_get_args() ); } @@ -1829,8 +1829,8 @@ function atLeastOnce() function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) { return call_user_func_array( - 'PHPUnit_Framework_Assert::attribute', - func_get_args() + 'PHPUnit_Framework_Assert::attribute', + func_get_args() ); } @@ -1851,8 +1851,8 @@ function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName) function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::attributeEqualTo', - func_get_args() + 'PHPUnit_Framework_Assert::attributeEqualTo', + func_get_args() ); } @@ -1865,8 +1865,8 @@ function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, function callback($callback) { return call_user_func_array( - 'PHPUnit_Framework_Assert::callback', - func_get_args() + 'PHPUnit_Framework_Assert::callback', + func_get_args() ); } @@ -1880,8 +1880,8 @@ function callback($callback) function classHasAttribute($attributeName) { return call_user_func_array( - 'PHPUnit_Framework_Assert::classHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::classHasAttribute', + func_get_args() ); } @@ -1896,8 +1896,8 @@ function classHasAttribute($attributeName) function classHasStaticAttribute($attributeName) { return call_user_func_array( - 'PHPUnit_Framework_Assert::classHasStaticAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::classHasStaticAttribute', + func_get_args() ); } @@ -1914,8 +1914,8 @@ function classHasStaticAttribute($attributeName) function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::contains', - func_get_args() + 'PHPUnit_Framework_Assert::contains', + func_get_args() ); } @@ -1930,8 +1930,8 @@ function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIden function containsOnly($type) { return call_user_func_array( - 'PHPUnit_Framework_Assert::containsOnly', - func_get_args() + 'PHPUnit_Framework_Assert::containsOnly', + func_get_args() ); } @@ -1945,8 +1945,8 @@ function containsOnly($type) function containsOnlyInstancesOf($classname) { return call_user_func_array( - 'PHPUnit_Framework_Assert::containsOnlyInstancesOf', - func_get_args() + 'PHPUnit_Framework_Assert::containsOnlyInstancesOf', + func_get_args() ); } @@ -1964,8 +1964,8 @@ function containsOnlyInstancesOf($classname) function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false) { return call_user_func_array( - 'PHPUnit_Framework_Assert::equalTo', - func_get_args() + 'PHPUnit_Framework_Assert::equalTo', + func_get_args() ); } @@ -1980,8 +1980,8 @@ function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $i function exactly($count) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::exactly', - func_get_args() + 'PHPUnit_Framework_TestCase::exactly', + func_get_args() ); } @@ -1994,8 +1994,8 @@ function exactly($count) function fileExists() { return call_user_func_array( - 'PHPUnit_Framework_Assert::fileExists', - func_get_args() + 'PHPUnit_Framework_Assert::fileExists', + func_get_args() ); } @@ -2009,8 +2009,8 @@ function fileExists() function greaterThan($value) { return call_user_func_array( - 'PHPUnit_Framework_Assert::greaterThan', - func_get_args() + 'PHPUnit_Framework_Assert::greaterThan', + func_get_args() ); } @@ -2026,8 +2026,8 @@ function greaterThan($value) function greaterThanOrEqual($value) { return call_user_func_array( - 'PHPUnit_Framework_Assert::greaterThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::greaterThanOrEqual', + func_get_args() ); } @@ -2041,8 +2041,8 @@ function greaterThanOrEqual($value) function identicalTo($value) { return call_user_func_array( - 'PHPUnit_Framework_Assert::identicalTo', - func_get_args() + 'PHPUnit_Framework_Assert::identicalTo', + func_get_args() ); } @@ -2055,8 +2055,8 @@ function identicalTo($value) function isEmpty() { return call_user_func_array( - 'PHPUnit_Framework_Assert::isEmpty', - func_get_args() + 'PHPUnit_Framework_Assert::isEmpty', + func_get_args() ); } @@ -2069,8 +2069,8 @@ function isEmpty() function isFalse() { return call_user_func_array( - 'PHPUnit_Framework_Assert::isFalse', - func_get_args() + 'PHPUnit_Framework_Assert::isFalse', + func_get_args() ); } @@ -2084,8 +2084,8 @@ function isFalse() function isInstanceOf($className) { return call_user_func_array( - 'PHPUnit_Framework_Assert::isInstanceOf', - func_get_args() + 'PHPUnit_Framework_Assert::isInstanceOf', + func_get_args() ); } @@ -2098,8 +2098,8 @@ function isInstanceOf($className) function isJson() { return call_user_func_array( - 'PHPUnit_Framework_Assert::isJson', - func_get_args() + 'PHPUnit_Framework_Assert::isJson', + func_get_args() ); } @@ -2112,8 +2112,8 @@ function isJson() function isNull() { return call_user_func_array( - 'PHPUnit_Framework_Assert::isNull', - func_get_args() + 'PHPUnit_Framework_Assert::isNull', + func_get_args() ); } @@ -2126,8 +2126,8 @@ function isNull() function isTrue() { return call_user_func_array( - 'PHPUnit_Framework_Assert::isTrue', - func_get_args() + 'PHPUnit_Framework_Assert::isTrue', + func_get_args() ); } @@ -2141,8 +2141,8 @@ function isTrue() function isType($type) { return call_user_func_array( - 'PHPUnit_Framework_Assert::isType', - func_get_args() + 'PHPUnit_Framework_Assert::isType', + func_get_args() ); } @@ -2156,8 +2156,8 @@ function isType($type) function lessThan($value) { return call_user_func_array( - 'PHPUnit_Framework_Assert::lessThan', - func_get_args() + 'PHPUnit_Framework_Assert::lessThan', + func_get_args() ); } @@ -2173,8 +2173,8 @@ function lessThan($value) function lessThanOrEqual($value) { return call_user_func_array( - 'PHPUnit_Framework_Assert::lessThanOrEqual', - func_get_args() + 'PHPUnit_Framework_Assert::lessThanOrEqual', + func_get_args() ); } @@ -2187,8 +2187,8 @@ function lessThanOrEqual($value) function logicalAnd() { return call_user_func_array( - 'PHPUnit_Framework_Assert::logicalAnd', - func_get_args() + 'PHPUnit_Framework_Assert::logicalAnd', + func_get_args() ); } @@ -2202,8 +2202,8 @@ function logicalAnd() function logicalNot(PHPUnit_Framework_Constraint $constraint) { return call_user_func_array( - 'PHPUnit_Framework_Assert::logicalNot', - func_get_args() + 'PHPUnit_Framework_Assert::logicalNot', + func_get_args() ); } @@ -2216,8 +2216,8 @@ function logicalNot(PHPUnit_Framework_Constraint $constraint) function logicalOr() { return call_user_func_array( - 'PHPUnit_Framework_Assert::logicalOr', - func_get_args() + 'PHPUnit_Framework_Assert::logicalOr', + func_get_args() ); } @@ -2230,8 +2230,8 @@ function logicalOr() function logicalXor() { return call_user_func_array( - 'PHPUnit_Framework_Assert::logicalXor', - func_get_args() + 'PHPUnit_Framework_Assert::logicalXor', + func_get_args() ); } @@ -2245,8 +2245,8 @@ function logicalXor() function matches($string) { return call_user_func_array( - 'PHPUnit_Framework_Assert::matches', - func_get_args() + 'PHPUnit_Framework_Assert::matches', + func_get_args() ); } @@ -2260,8 +2260,8 @@ function matches($string) function matchesRegularExpression($pattern) { return call_user_func_array( - 'PHPUnit_Framework_Assert::matchesRegularExpression', - func_get_args() + 'PHPUnit_Framework_Assert::matchesRegularExpression', + func_get_args() ); } @@ -2275,8 +2275,8 @@ function matchesRegularExpression($pattern) function never() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::never', - func_get_args() + 'PHPUnit_Framework_TestCase::never', + func_get_args() ); } @@ -2290,8 +2290,8 @@ function never() function objectHasAttribute($attributeName) { return call_user_func_array( - 'PHPUnit_Framework_Assert::objectHasAttribute', - func_get_args() + 'PHPUnit_Framework_Assert::objectHasAttribute', + func_get_args() ); } @@ -2303,8 +2303,8 @@ function objectHasAttribute($attributeName) function onConsecutiveCalls() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::onConsecutiveCalls', - func_get_args() + 'PHPUnit_Framework_TestCase::onConsecutiveCalls', + func_get_args() ); } @@ -2318,8 +2318,8 @@ function onConsecutiveCalls() function once() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::once', - func_get_args() + 'PHPUnit_Framework_TestCase::once', + func_get_args() ); } @@ -2333,8 +2333,8 @@ function once() function returnArgument($argumentIndex) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::returnArgument', - func_get_args() + 'PHPUnit_Framework_TestCase::returnArgument', + func_get_args() ); } @@ -2348,8 +2348,8 @@ function returnArgument($argumentIndex) function returnCallback($callback) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::returnCallback', - func_get_args() + 'PHPUnit_Framework_TestCase::returnCallback', + func_get_args() ); } @@ -2364,8 +2364,8 @@ function returnCallback($callback) function returnSelf() { return call_user_func_array( - 'PHPUnit_Framework_TestCase::returnSelf', - func_get_args() + 'PHPUnit_Framework_TestCase::returnSelf', + func_get_args() ); } @@ -2379,8 +2379,8 @@ function returnSelf() function returnValue($value) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::returnValue', - func_get_args() + 'PHPUnit_Framework_TestCase::returnValue', + func_get_args() ); } @@ -2394,8 +2394,8 @@ function returnValue($value) function returnValueMap(array $valueMap) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::returnValueMap', - func_get_args() + 'PHPUnit_Framework_TestCase::returnValueMap', + func_get_args() ); } @@ -2410,8 +2410,8 @@ function returnValueMap(array $valueMap) function stringContains($string, $case = true) { return call_user_func_array( - 'PHPUnit_Framework_Assert::stringContains', - func_get_args() + 'PHPUnit_Framework_Assert::stringContains', + func_get_args() ); } @@ -2425,8 +2425,8 @@ function stringContains($string, $case = true) function stringEndsWith($suffix) { return call_user_func_array( - 'PHPUnit_Framework_Assert::stringEndsWith', - func_get_args() + 'PHPUnit_Framework_Assert::stringEndsWith', + func_get_args() ); } @@ -2440,8 +2440,8 @@ function stringEndsWith($suffix) function stringStartsWith($prefix) { return call_user_func_array( - 'PHPUnit_Framework_Assert::stringStartsWith', - func_get_args() + 'PHPUnit_Framework_Assert::stringStartsWith', + func_get_args() ); } @@ -2455,7 +2455,7 @@ function stringStartsWith($prefix) function throwException(Exception $exception) { return call_user_func_array( - 'PHPUnit_Framework_TestCase::throwException', - func_get_args() + 'PHPUnit_Framework_TestCase::throwException', + func_get_args() ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php index c787d6d..2da8517 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php +++ b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php @@ -58,21 +58,39 @@ */ abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener { - public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) + { + } - public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {} + public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) + { + } - public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) + { + } - public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) + { + } - public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) + { + } - public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {} + public function startTestSuite(PHPUnit_Framework_TestSuite $suite) + { + } - public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {} + public function endTestSuite(PHPUnit_Framework_TestSuite $suite) + { + } - public function startTest(PHPUnit_Framework_Test $test) {} + public function startTest(PHPUnit_Framework_Test $test) + { + } - public function endTest(PHPUnit_Framework_Test $test, $time) {} + public function endTest(PHPUnit_Framework_Test $test, $time) + { + } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php index 8e9a888..829f2ec 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php @@ -136,8 +136,8 @@ public function count() protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null) { $failureDescription = sprintf( - 'Failed asserting that %s.', - $this->failureDescription($other) + 'Failed asserting that %s.', + $this->failureDescription($other) ); $additionalFailureDescription = $this->additionalFailureDescription($other); @@ -151,8 +151,8 @@ protected function fail($other, $description, SebastianBergmann\Comparator\Compa } throw new PHPUnit_Framework_ExpectationFailedException( - $failureDescription, - $comparisonFailure + $failureDescription, + $comparisonFailure ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php index 28ecc95..0c22fbd 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php @@ -79,8 +79,8 @@ public function setConstraints(array $constraints) foreach ($constraints as $constraint) { if (!($constraint instanceof PHPUnit_Framework_Constraint)) { throw new PHPUnit_Framework_Exception( - 'All parameters to ' . __CLASS__ . - ' must be a constraint object.' + 'All parameters to ' . __CLASS__ . + ' must be a constraint object.' ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php index 822ed18..7f82166 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php @@ -94,11 +94,12 @@ public function __construct(PHPUnit_Framework_Constraint $constraint, $attribute public function evaluate($other, $description = '', $returnResult = false) { return parent::evaluate( - PHPUnit_Framework_Assert::readAttribute( - $other, $this->attributeName - ), - $description, - $returnResult + PHPUnit_Framework_Assert::readAttribute( + $other, + $this->attributeName + ), + $description, + $returnResult ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php index e0f4976..509f230 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php @@ -65,7 +65,8 @@ public function __construct($callback) { if (!is_callable($callback)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'callable' + 1, + 'callable' ); } @@ -95,22 +96,4 @@ public function toString() { return 'is accepted by specified callback'; } - - private function callbackToString($callback) - { - if (!is_array($callback)) { - return $callback; - } - if (empty($callback)) { - return "empty array"; - } - if (!isset($callback[0]) || !isset($callback[1])) { - return "array without indexes 0 and 1 set"; - } - if (is_object($callback[0])) { - $callback[0] = get_class($callback[0]); - } - - return $callback[0] . '::' . $callback[1]; - } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php index 5f387f5..58ec32a 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php @@ -97,9 +97,8 @@ protected function matches($other) public function toString() { return sprintf( - 'has attribute "%s"', - - $this->attributeName + 'has attribute "%s"', + $this->attributeName ); } @@ -115,11 +114,10 @@ public function toString() protected function failureDescription($other) { return sprintf( - '%sclass "%s" %s', - - is_object($other) ? 'object of ' : '', - is_object($other) ? get_class($other) : $other, - $this->toString() + '%sclass "%s" %s', + is_object($other) ? 'object of ' : '', + is_object($other) ? get_class($other) : $other, + $this->toString() ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php index 5aa0f89..146dacd 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php @@ -90,9 +90,8 @@ protected function matches($other) public function toString() { return sprintf( - 'has static attribute "%s"', - - $this->attributeName + 'has static attribute "%s"', + $this->attributeName ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php index d0aaa37..926341b 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php @@ -64,7 +64,6 @@ /** * @param PHPUnit_Framework_Constraint $innerConstraint - * @param string $attributeName */ public function __construct(PHPUnit_Framework_Constraint $innerConstraint) { @@ -92,9 +91,9 @@ public function evaluate($other, $description = '', $returnResult = false) { try { return $this->innerConstraint->evaluate( - $other, - $description, - $returnResult + $other, + $description, + $returnResult ); } catch (PHPUnit_Framework_ExpectationFailedException $e) { $this->fail($other, $description); diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php index 943c3cb..194844c 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php @@ -92,9 +92,7 @@ protected function getCountOf($other) { if ($other instanceof Countable || is_array($other)) { return count($other); - } - - else if ($other instanceof Traversable) { + } elseif ($other instanceof Traversable) { if ($other instanceof IteratorAggregate) { $iterator = $other->getIterator(); } else { @@ -108,7 +106,7 @@ protected function getCountOf($other) // moves pointer if ($key !== null) { $iterator->rewind(); - while ($key !== $iterator->key()) { + while ($iterator->valid() && $key !== $iterator->key()) { $iterator->next(); } } @@ -129,10 +127,9 @@ protected function getCountOf($other) protected function failureDescription($other) { return sprintf( - 'actual size %d matches expected size %d', - - $this->getCountOf($other), - $this->expectedCount + 'actual size %d matches expected size %d', + $this->getCountOf($other), + $this->expectedCount ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php index dc6efde..4416f63 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php @@ -101,18 +101,16 @@ protected function failureDescription($other) } return sprintf( - 'exception of type "%s" matches expected exception "%s"%s', - - get_class($other), - $this->className, - $message + 'exception of type "%s" matches expected exception "%s"%s', + get_class($other), + $this->className, + $message ); } return sprintf( - 'exception of type "%s" is thrown', - - $this->className + 'exception of type "%s" is thrown', + $this->className ); } @@ -124,9 +122,8 @@ protected function failureDescription($other) public function toString() { return sprintf( - 'exception of type "%s"', - - $this->className + 'exception of type "%s"', + $this->className ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php index 8a4e7cc..c5069aa 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php @@ -94,9 +94,9 @@ protected function matches($other) protected function failureDescription($other) { return sprintf( - '%s is equal to expected exception code %s', - $this->exporter->export($other->getCode()), - $this->exporter->export($this->expectedCode) + '%s is equal to expected exception code %s', + $this->exporter->export($other->getCode()), + $this->exporter->export($this->expectedCode) ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php index 407a5f6..85c3ed7 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php @@ -62,6 +62,11 @@ class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Co protected $expectedMessage; /** + * @var boolean + */ + protected $regexBased = false; + + /** * @param string $expected */ public function __construct($expected) @@ -79,7 +84,14 @@ public function __construct($expected) */ protected function matches($other) { - return strpos($other->getMessage(), $this->expectedMessage) !== false; + $match = PHPUnit_Util_Regex::pregMatchSafe($this->expectedMessage, $other->getMessage()); + if (false !== $match) { + $this->regexBased = true; + } else { + $match = strpos($other->getMessage(), $this->expectedMessage) !== false; + } + + return (bool) $match; } /** @@ -94,9 +106,9 @@ protected function matches($other) protected function failureDescription($other) { return sprintf( - "exception message '%s' contains '%s'", - $other->getMessage(), - $this->expectedMessage + "exception message '%s' {$this->getVerb()} '%s'", + $other->getMessage(), + $this->expectedMessage ); } @@ -105,6 +117,14 @@ protected function failureDescription($other) */ public function toString() { - return 'exception message contains '; + return "exception message {$this->getVerb()} "; + } + + /** + * @return string + */ + protected function getVerb() + { + return ($this->regexBased) ? "matches" : "contains"; } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php index 4e43e13..031ae33 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php @@ -84,9 +84,8 @@ protected function matches($other) protected function failureDescription($other) { return sprintf( - 'file "%s" exists', - - $other + 'file "%s" exists', + $other ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php index cbd9b86..6344aff 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php @@ -98,11 +98,10 @@ protected function failureDescription($other) $type = gettype($other); return sprintf( - '%s %s %s', - - $type[0] == 'a' || $type[0] == 'o' ? 'an' : 'a', - $type, - $this->toString() + '%s %s %s', + $type[0] == 'a' || $type[0] == 'o' ? 'an' : 'a', + $type, + $this->toString() ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php index cd7a0c0..ff6762b 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php @@ -153,15 +153,16 @@ public function evaluate($other, $description = '', $returnResult = false) try { $comparator = $comparatorFactory->getComparatorFor( - $other, $this->value + $this->value, + $other ); $comparator->assertEquals( - $this->value, - $other, - $this->delta, - $this->canonicalize, - $this->ignoreCase + $this->value, + $other, + $this->delta, + $this->canonicalize, + $this->ignoreCase ); } catch (SebastianBergmann\Comparator\ComparisonFailure $f) { if ($returnResult) { @@ -169,8 +170,8 @@ public function evaluate($other, $description = '', $returnResult = false) } throw new PHPUnit_Framework_ExpectationFailedException( - trim($description . "\n" . $f->getMessage()), - $f + trim($description . "\n" . $f->getMessage()), + $f ); } @@ -191,25 +192,22 @@ public function toString() return 'is equal to '; } else { return sprintf( - 'is equal to ', - - $this->value + 'is equal to ', + $this->value ); } } else { if ($this->delta != 0) { $delta = sprintf( - ' with delta <%F>', - - $this->delta + ' with delta <%F>', + $this->delta ); } return sprintf( - 'is equal to %s%s', - - $this->exporter->export($this->value), - $delta + 'is equal to %s%s', + $this->exporter->export($this->value), + $delta ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php index d96952c..c6b93f5 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php @@ -121,10 +121,10 @@ public function evaluate($other, $description = '', $returnResult = false) // if both values are strings, make sure a diff is generated if (is_string($this->value) && is_string($other)) { $f = new SebastianBergmann\Comparator\ComparisonFailure( - $this->value, - $other, - $this->value, - $other + $this->value, + $other, + $this->value, + $other ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php index d288338..9fa7158 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php @@ -99,10 +99,10 @@ protected function matches($other) protected function failureDescription($other) { return sprintf( - '%s is an instance of %s "%s"', - $this->exporter->shortenedExport($other), - $this->getType(), - $this->className + '%s is an instance of %s "%s"', + $this->exporter->shortenedExport($other), + $this->getType(), + $this->className ); } @@ -114,9 +114,9 @@ protected function failureDescription($other) public function toString() { return sprintf( - 'is instance of %s "%s"', - $this->getType(), - $this->className + 'is instance of %s "%s"', + $this->getType(), + $this->className ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php index f5f25ed..9e79f17 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php @@ -86,14 +86,13 @@ protected function failureDescription($other) { json_decode($other); $error = PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::determineJsonError( - json_last_error() + json_last_error() ); return sprintf( - '%s is valid JSON (%s)', - - $this->exporter->shortenedExport($other), - $error + '%s is valid JSON (%s)', + $this->exporter->shortenedExport($other), + $error ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php index 3f6f4d0..054f86b 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php @@ -65,7 +65,7 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint const TYPE_BOOL = 'bool'; const TYPE_FLOAT = 'float'; const TYPE_INT = 'int'; - const TYPE_null = 'null'; + const TYPE_NULL = 'null'; const TYPE_NUMERIC = 'numeric'; const TYPE_OBJECT = 'object'; const TYPE_RESOURCE = 'resource'; @@ -107,11 +107,11 @@ public function __construct($type) if (!isset($this->types[$type])) { throw new PHPUnit_Framework_Exception( - sprintf( - 'Type specified for PHPUnit_Framework_Constraint_IsType <%s> ' . - 'is not a valid type.', - $type - ) + sprintf( + 'Type specified for PHPUnit_Framework_Constraint_IsType <%s> ' . + 'is not a valid type.', + $type + ) ); } @@ -130,49 +130,49 @@ protected function matches($other) switch ($this->type) { case 'numeric': { return is_numeric($other); - } + } case 'integer': case 'int': { return is_integer($other); - } + } case 'float': { return is_float($other); - } + } case 'string': { return is_string($other); - } + } case 'boolean': case 'bool': { return is_bool($other); - } + } case 'null': { return is_null($other); - } + } case 'array': { return is_array($other); - } + } case 'object': { return is_object($other); - } + } case 'resource': { return is_resource($other); - } + } case 'scalar': { return is_scalar($other); - } + } case 'callable': { return is_callable($other); - } + } } } @@ -184,9 +184,8 @@ protected function matches($other) public function toString() { return sprintf( - 'is of type "%s"', - - $this->type + 'is of type "%s"', + $this->type ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php index 8606fc6..df573ca 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php @@ -60,6 +60,7 @@ class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider * Translates JSON error to a human readable string. * * @param string $error + * @param string $prefix * @return string */ public static function determineJsonError($error, $prefix = '') diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php index d34ca78..1cad67e 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php @@ -85,7 +85,7 @@ public function __construct($constraint) public static function negate($string) { return str_replace( - array( + array( 'contains ', 'exists', 'has ', @@ -96,8 +96,8 @@ public static function negate($string) 'ends with ', 'reference ', 'not not ' - ), - array( + ), + array( 'does not contain ', 'does not exist', 'does not have ', @@ -108,8 +108,8 @@ public static function negate($string) 'ends not with ', 'don\'t reference ', 'not ' - ), - $string + ), + $string ); } @@ -158,14 +158,14 @@ protected function failureDescription($other) case 'PHPUnit_Framework_Constraint_Not': case 'PHPUnit_Framework_Constraint_Or': { return 'not( ' . $this->constraint->failureDescription($other) . ' )'; - } + } break; default: { return self::negate( - $this->constraint->failureDescription($other) + $this->constraint->failureDescription($other) ); - } + } } } @@ -181,14 +181,14 @@ public function toString() case 'PHPUnit_Framework_Constraint_Not': case 'PHPUnit_Framework_Constraint_Or': { return 'not( ' . $this->constraint->toString() . ' )'; - } + } break; default: { return self::negate( - $this->constraint->toString() + $this->constraint->toString() ); - } + } } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php index 9d87922..c9f9b6b 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php @@ -73,7 +73,7 @@ public function setConstraints(array $constraints) foreach ($constraints as $constraint) { if (!($constraint instanceof PHPUnit_Framework_Constraint)) { $constraint = new PHPUnit_Framework_Constraint_IsEqual( - $constraint + $constraint ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php index ee77871..08a941b 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php @@ -98,9 +98,8 @@ protected function matches($other) public function toString() { return sprintf( - 'matches PCRE pattern "%s"', - - $this->pattern + 'matches PCRE pattern "%s"', + $this->pattern ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php index bf628a1..9b61ea0 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php @@ -116,9 +116,8 @@ public function toString() } return sprintf( - 'contains "%s"', - - $string + 'contains "%s"', + $string ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php index 234cd36..a4c645d 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php @@ -110,7 +110,7 @@ protected function additionalFailureDescription($other) protected function createPatternFromFormat($string) { $string = str_replace( - array( + array( '%e', '%s', '%S', @@ -122,8 +122,8 @@ protected function createPatternFromFormat($string) '%x', '%f', '%c' - ), - array( + ), + array( '\\' . DIRECTORY_SEPARATOR, '[^\r\n]+', '[^\r\n]*', @@ -135,11 +135,10 @@ protected function createPatternFromFormat($string) '[0-9a-fA-F]+', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', '.' - ), - preg_quote($string, '/') + ), + preg_quote($string, '/') ); return '/^' . $string . '$/s'; } - } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php index cb74e1d..276ce17 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php @@ -159,10 +159,9 @@ public function toString() protected function failureDescription($other) { return sprintf( - '%s %s', - - is_array($other) ? 'an array' : 'a traversable', - $this->toString() + '%s %s', + is_array($other) ? 'an array' : 'a traversable', + $this->toString() ); } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php index 1116cf7..60859f1 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php @@ -81,7 +81,7 @@ public function __construct($type, $isNativeType = true) $this->constraint = new PHPUnit_Framework_Constraint_IsType($type); } else { $this->constraint = new PHPUnit_Framework_Constraint_IsInstanceOf( - $type + $type ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php index 1876215..d97b1dd 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php +++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php @@ -73,7 +73,7 @@ public function setConstraints(array $constraints) foreach ($constraints as $constraint) { if (!($constraint instanceof PHPUnit_Framework_Constraint)) { $constraint = new PHPUnit_Framework_Constraint_IsEqual( - $constraint + $constraint ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestCase.php b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php index 6cd8728..1c7fe0f 100755 --- a/core/vendor/phpunit/phpunit/src/Framework/TestCase.php +++ b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php @@ -289,6 +289,11 @@ private $outputBufferingActive = false; /** + * @var integer + */ + private $outputBufferingLevel; + + /** * Constructs a test case with the given name. * * @param string $name @@ -315,10 +320,9 @@ public function toString() $class = new ReflectionClass($this); $buffer = sprintf( - '%s::%s', - - $class->name, - $this->getName(false) + '%s::%s', + $class->name, + $this->getName(false) ); return $buffer . $this->getDataSetAsString(); @@ -343,7 +347,8 @@ public function count() public function getAnnotations() { return PHPUnit_Util_Test::parseTestMethodAnnotations( - get_class($this), $this->name + get_class($this), + $this->name ); } @@ -371,7 +376,8 @@ public function getName($withDataSet = true) public function getSize() { return PHPUnit_Util_Test::getSize( - get_class($this), $this->getName(false) + get_class($this), + $this->getName(false) ); } @@ -476,14 +482,15 @@ protected function setExpectedExceptionFromAnnotation() { try { $expectedException = PHPUnit_Util_Test::getExpectedException( - get_class($this), $this->name + get_class($this), + $this->name ); if ($expectedException !== false) { $this->setExpectedException( - $expectedException['class'], - $expectedException['message'], - $expectedException['code'] + $expectedException['class'], + $expectedException['message'], + $expectedException['code'] ); } } catch (ReflectionException $e) { @@ -506,7 +513,8 @@ protected function setUseErrorHandlerFromAnnotation() { try { $useErrorHandler = PHPUnit_Util_Test::getErrorHandlerSettings( - get_class($this), $this->name + get_class($this), + $this->name ); if ($useErrorHandler !== null) { @@ -523,7 +531,8 @@ protected function setRequirementsFromAnnotation() { try { $requirements = PHPUnit_Util_Test::getRequirements( - get_class($this), $this->name + get_class($this), + $this->name ); if (isset($requirements['PHP'])) { @@ -561,8 +570,8 @@ protected function checkRequirements() if ($this->required['PHP'] && version_compare(PHP_VERSION, $this->required['PHP'], '<')) { $missingRequirements[] = sprintf( - 'PHP %s (or later) is required.', - $this->required['PHP'] + 'PHP %s (or later) is required.', + $this->required['PHP'] ); } @@ -570,16 +579,16 @@ protected function checkRequirements() if ($this->required['PHPUnit'] && version_compare($phpunitVersion, $this->required['PHPUnit'], '<')) { $missingRequirements[] = sprintf( - 'PHPUnit %s (or later) is required.', - $this->required['PHPUnit'] + 'PHPUnit %s (or later) is required.', + $this->required['PHPUnit'] ); } if ($this->required['OS'] && !preg_match($this->required['OS'], PHP_OS)) { $missingRequirements[] = sprintf( - 'Operating system matching %s is required.', - $this->required['OS'] + 'Operating system matching %s is required.', + $this->required['OS'] ); } @@ -592,26 +601,26 @@ protected function checkRequirements() continue; } $missingRequirements[] = sprintf( - 'Function %s is required.', - $function + 'Function %s is required.', + $function ); } foreach ($this->required['extensions'] as $extension) { if (!extension_loaded($extension)) { $missingRequirements[] = sprintf( - 'Extension %s is required.', - $extension + 'Extension %s is required.', + $extension ); } } if ($missingRequirements) { $this->markTestSkipped( - implode( - PHP_EOL, - $missingRequirements - ) + implode( + PHP_EOL, + $missingRequirements + ) ); } } @@ -687,7 +696,7 @@ public function run(PHPUnit_Framework_TestResult $result = null) $class = new ReflectionClass($this); $template = new Text_Template( - __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl' + __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl' ); if ($this->preserveGlobalState) { @@ -706,6 +715,7 @@ public function run(PHPUnit_Framework_TestResult $result = null) $isStrictAboutTestsThatDoNotTestAnything = $result->isStrictAboutTestsThatDoNotTestAnything() ? 'true' : 'false'; $isStrictAboutOutputDuringTests = $result->isStrictAboutOutputDuringTests() ? 'true' : 'false'; $isStrictAboutTestSize = $result->isStrictAboutTestSize() ? 'true' : 'false'; + $isStrictAboutTodoAnnotatedTests = $result->isStrictAboutTodoAnnotatedTests() ? 'true' : 'false'; if (defined('PHPUNIT_COMPOSER_INSTALL')) { $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, true); @@ -720,16 +730,18 @@ public function run(PHPUnit_Framework_TestResult $result = null) } $data = var_export(serialize($this->data), true); + $dataName = var_export($this->dataName, true); $dependencyInput = var_export(serialize($this->dependencyInput), true); $includePath = var_export(get_include_path(), true); // must do these fixes because TestCaseMethod.tpl has unserialize('{data}') in it, and we can't break BC // the lines above used to use addcslashes() rather than var_export(), which breaks null byte escape sequences $data = "'." . $data . ".'"; + $dataName = "'.(" . $dataName . ").'"; $dependencyInput = "'." . $dependencyInput . ".'"; $includePath = "'." . $includePath . ".'"; $template->setVar( - array( + array( 'composerAutoload' => $composerAutoload, 'phar' => $phar, 'filename' => $class->getFileName(), @@ -737,7 +749,7 @@ public function run(PHPUnit_Framework_TestResult $result = null) 'methodName' => $this->name, 'collectCodeCoverageInformation' => $coverage, 'data' => $data, - 'dataName' => $this->dataName, + 'dataName' => $dataName, 'dependencyInput' => $dependencyInput, 'constants' => $constants, 'globals' => $globals, @@ -746,8 +758,9 @@ public function run(PHPUnit_Framework_TestResult $result = null) 'iniSettings' => $iniSettings, 'isStrictAboutTestsThatDoNotTestAnything' => $isStrictAboutTestsThatDoNotTestAnything, 'isStrictAboutOutputDuringTests' => $isStrictAboutOutputDuringTests, - 'isStrictAboutTestSize' => $isStrictAboutTestSize - ) + 'isStrictAboutTestSize' => $isStrictAboutTestSize, + 'isStrictAboutTodoAnnotatedTests' => $isStrictAboutTodoAnnotatedTests + ) ); $this->prepareTemplate($template); @@ -780,20 +793,18 @@ public function runBare() if ($this->backupGlobals === null || $this->backupGlobals === true) { PHPUnit_Util_GlobalState::backupGlobals( - $this->backupGlobalsBlacklist + $this->backupGlobalsBlacklist ); } if ($this->backupStaticAttributes === true) { PHPUnit_Util_GlobalState::backupStaticAttributes( - $this->backupStaticAttributesBlacklist + $this->backupStaticAttributesBlacklist ); } } - // Start output buffering. - ob_start(); - $this->outputBufferingActive = true; + $this->startOutputBuffering(); // Clean up stat cache. clearstatcache(); @@ -804,7 +815,9 @@ public function runBare() $hookMethods = PHPUnit_Util_Test::getHookMethods(get_class($this)); try { + $hasMetRequirements = false; $this->checkRequirements(); + $hasMetRequirements = true; if ($this->inIsolation) { foreach ($hookMethods['beforeClass'] as $method) { @@ -822,6 +835,7 @@ public function runBare() $this->testResult = $this->runTest(); $this->verifyMockObjects(); $this->assertPostConditions(); + $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED; } catch (PHPUnit_Framework_IncompleteTest $e) { $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE; @@ -843,14 +857,16 @@ public function runBare() // Tear down the fixture. An exception raised in tearDown() will be // caught and passed on when no exception was raised before. try { - foreach ($hookMethods['after'] as $method) { - $this->$method(); - } - - if ($this->inIsolation) { - foreach ($hookMethods['afterClass'] as $method) { + if ($hasMetRequirements) { + foreach ($hookMethods['after'] as $method) { $this->$method(); } + + if ($this->inIsolation) { + foreach ($hookMethods['afterClass'] as $method) { + $this->$method(); + } + } } } catch (Exception $_e) { if (!isset($e)) { @@ -858,17 +874,7 @@ public function runBare() } } - // Stop output buffering. - if ($this->outputCallback === false) { - $this->output = ob_get_contents(); - } else { - $this->output = call_user_func_array( - $this->outputCallback, array(ob_get_contents()) - ); - } - - ob_end_clean(); - $this->outputBufferingActive = false; + $this->stopOutputBuffering(); // Clean up stat cache. clearstatcache(); @@ -884,7 +890,7 @@ public function runBare() if ($this->backupGlobals === null || $this->backupGlobals === true) { PHPUnit_Util_GlobalState::restoreGlobals( - $this->backupGlobalsBlacklist + $this->backupGlobalsBlacklist ); } @@ -939,7 +945,7 @@ protected function runTest() { if ($this->name === null) { throw new PHPUnit_Framework_Exception( - 'PHPUnit_Framework_TestCase::$name must not be null.' + 'PHPUnit_Framework_TestCase::$name must not be null.' ); } @@ -952,7 +958,8 @@ protected function runTest() try { $testResult = $method->invokeArgs( - $this, array_merge($this->data, $this->dependencyInput) + $this, + array_merge($this->data, $this->dependencyInput) ); } catch (Exception $e) { $checkException = false; @@ -974,28 +981,28 @@ protected function runTest() if ($checkException) { $this->assertThat( - $e, - new PHPUnit_Framework_Constraint_Exception( - $this->expectedException - ) + $e, + new PHPUnit_Framework_Constraint_Exception( + $this->expectedException + ) ); if (is_string($this->expectedExceptionMessage) && !empty($this->expectedExceptionMessage)) { $this->assertThat( - $e, - new PHPUnit_Framework_Constraint_ExceptionMessage( - $this->expectedExceptionMessage - ) + $e, + new PHPUnit_Framework_Constraint_ExceptionMessage( + $this->expectedExceptionMessage + ) ); } if ($this->expectedExceptionCode !== null) { $this->assertThat( - $e, - new PHPUnit_Framework_Constraint_ExceptionCode( - $this->expectedExceptionCode - ) + $e, + new PHPUnit_Framework_Constraint_ExceptionCode( + $this->expectedExceptionCode + ) ); } @@ -1007,10 +1014,10 @@ protected function runTest() if ($this->expectedException !== null) { $this->assertThat( - null, - new PHPUnit_Framework_Constraint_Exception( - $this->expectedException - ) + null, + new PHPUnit_Framework_Constraint_Exception( + $this->expectedException + ) ); } @@ -1219,11 +1226,11 @@ protected function iniSet($varName, $newValue) $this->iniSettings[$varName] = $currentValue; } else { throw new PHPUnit_Framework_Exception( - sprintf( - 'INI setting "%s" could not be set to "%s".', - $varName, - $newValue - ) + sprintf( + 'INI setting "%s" could not be set to "%s".', + $varName, + $newValue + ) ); } } @@ -1266,13 +1273,13 @@ protected function setLocale() $this->locale[$category] = setlocale($category, null); - $result = call_user_func_array( 'setlocale', $args ); + $result = call_user_func_array('setlocale', $args); if ($result === false) { throw new PHPUnit_Framework_Exception( - 'The locale functionality is not implemented on your platform, ' . - 'the specified locale does not exist or the category name is ' . - 'invalid.' + 'The locale functionality is not implemented on your platform, ' . + 'the specified locale does not exist or the category name is ' . + 'invalid.' ); } } @@ -1299,15 +1306,15 @@ protected function setLocale() public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false) { $mockObject = $this->getMockObjectGenerator()->getMock( - $originalClassName, - $methods, - $arguments, - $mockClassName, - $callOriginalConstructor, - $callOriginalClone, - $callAutoload, - $cloneArguments, - $callOriginalMethods + $originalClassName, + $methods, + $arguments, + $mockClassName, + $callOriginalConstructor, + $callOriginalClone, + $callAutoload, + $cloneArguments, + $callOriginalMethods ); $this->mockObjects[] = $mockObject; @@ -1325,7 +1332,8 @@ public function getMock($originalClassName, $methods = array(), array $arguments public function getMockBuilder($className) { return new PHPUnit_Framework_MockObject_MockBuilder( - $this, $className + $this, + $className ); } @@ -1347,14 +1355,14 @@ public function getMockBuilder($className) protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false) { $mock = $this->getMock( - $originalClassName, - $methods, - $arguments, - $mockClassName, - $callOriginalConstructor, - $callOriginalClone, - $callAutoload, - $cloneArguments + $originalClassName, + $methods, + $arguments, + $mockClassName, + $callOriginalConstructor, + $callOriginalClone, + $callAutoload, + $cloneArguments ); return get_class($mock); @@ -1362,8 +1370,8 @@ protected function getMockClass($originalClassName, $methods = array(), array $a /** * Returns a mock object for the specified abstract class with all abstract - * methods of the class mocked. Concrete methods to mock can be specified with - * the last parameter + * methods of the class mocked. Concrete methods are not mocked by default. + * To mock concrete methods, use the 7th parameter ($mockedMethods). * * @param string $originalClassName * @param array $arguments @@ -1380,14 +1388,14 @@ protected function getMockClass($originalClassName, $methods = array(), array $a public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false) { $mockObject = $this->getMockObjectGenerator()->getMockForAbstractClass( - $originalClassName, - $arguments, - $mockClassName, - $callOriginalConstructor, - $callOriginalClone, - $callAutoload, - $mockedMethods, - $cloneArguments + $originalClassName, + $arguments, + $mockClassName, + $callOriginalConstructor, + $callOriginalClone, + $callAutoload, + $mockedMethods, + $cloneArguments ); $this->mockObjects[] = $mockObject; @@ -1411,26 +1419,31 @@ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClas { if ($originalClassName === '') { $originalClassName = str_replace( - '.wsdl', '', basename($wsdlFile) + '.wsdl', + '', + basename($wsdlFile) ); } if (!class_exists($originalClassName)) { - eval( + eval( $this->getMockObjectGenerator()->generateClassFromWsdl( - $wsdlFile, $originalClassName, $methods, $options + $wsdlFile, + $originalClassName, + $methods, + $options ) - ); + ); } return $this->getMock( - $originalClassName, - $methods, - array('', $options), - $mockClassName, - $callOriginalConstructor, - false, - false + $originalClassName, + $methods, + array('', $options), + $mockClassName, + $callOriginalConstructor, + false, + false ); } @@ -1454,14 +1467,14 @@ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClas public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false) { $mockObject = $this->getMockObjectGenerator()->getMockForTrait( - $traitName, - $arguments, - $mockClassName, - $callOriginalConstructor, - $callOriginalClone, - $callAutoload, - $mockedMethods, - $cloneArguments + $traitName, + $arguments, + $mockClassName, + $callOriginalConstructor, + $callOriginalClone, + $callAutoload, + $mockedMethods, + $cloneArguments ); $this->mockObjects[] = $mockObject; @@ -1486,13 +1499,13 @@ public function getMockForTrait($traitName, array $arguments = array(), $mockCla protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false) { return $this->getMockObjectGenerator()->getObjectForTrait( - $traitName, - $arguments, - $traitClassName, - $callOriginalConstructor, - $callOriginalClone, - $callAutoload, - $cloneArguments + $traitName, + $arguments, + $traitClassName, + $callOriginalConstructor, + $callOriginalClone, + $callAutoload, + $cloneArguments ); } @@ -1544,6 +1557,21 @@ public static function never() /** * Returns a matcher that matches when the method it is evaluated for + * is executed at least N times. + * + * @param integer $requiredInvocations + * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount + * @since Method available since Release 4.2.0 + */ + public static function atLeast($requiredInvocations) + { + return new PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount( + $requiredInvocations + ); + } + + /** + * Returns a matcher that matches when the method it is evaluated for * is executed at least once. * * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce @@ -1581,6 +1609,21 @@ public static function exactly($count) /** * Returns a matcher that matches when the method it is evaluated for + * is executed at most N times. + * + * @param integer $allowedInvocations + * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount + * @since Method available since Release 4.2.0 + */ + public static function atMost($allowedInvocations) + { + return new PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount( + $allowedInvocations + ); + } + + /** + * Returns a matcher that matches when the method it is evaluated for * is invoked at the given $index. * * @param integer $index @@ -1626,7 +1669,7 @@ public static function returnValueMap(array $valueMap) public static function returnArgument($argumentIndex) { return new PHPUnit_Framework_MockObject_Stub_ReturnArgument( - $argumentIndex + $argumentIndex ); } @@ -1787,13 +1830,14 @@ protected function handleDependencies() if (!isset($passedKeys[$dependency])) { $this->result->addError( - $this, - new PHPUnit_Framework_SkippedTestError( - sprintf( - 'This test depends on "%s" to pass.', $dependency - ) - ), - 0 + $this, + new PHPUnit_Framework_SkippedTestError( + sprintf( + 'This test depends on "%s" to pass.', + $dependency + ) + ), + 0 ); return false; @@ -1802,11 +1846,11 @@ protected function handleDependencies() if (isset($passed[$dependency])) { if ($passed[$dependency]['size'] > $this->getSize()) { $this->result->addError( - $this, - new PHPUnit_Framework_SkippedTestError( - 'This test depends on a test that is larger than itself.' - ), - 0 + $this, + new PHPUnit_Framework_SkippedTestError( + 'This test depends on a test that is larger than itself.' + ), + 0 ); return false; @@ -1916,4 +1960,51 @@ protected function getMockObjectGenerator() return $this->mockObjectGenerator; } + + /** + * @since Method available since Release 4.2.0 + */ + private function startOutputBuffering() + { + while (!defined('PHPUNIT_TESTSUITE') && ob_get_level() > 0) { + ob_end_clean(); + } + + ob_start(); + + $this->outputBufferingActive = true; + $this->outputBufferingLevel = ob_get_level(); + } + + /** + * @since Method available since Release 4.2.0 + */ + private function stopOutputBuffering() + { + if (ob_get_level() != $this->outputBufferingLevel) { + while (ob_get_level() > 0) { + ob_end_clean(); + } + + throw new PHPUnit_Framework_RiskyTestError( + 'Test code or tested code did not (only) close its own output buffers' + ); + } + + $output = ob_get_contents(); + + if ($this->outputCallback === false) { + $this->output = $output; + } else { + $this->output = call_user_func_array( + $this->outputCallback, + array($output) + ); + } + + ob_end_clean(); + + $this->outputBufferingActive = false; + $this->outputBufferingLevel = ob_get_level(); + } } diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php index 9da0b73..bd3a391 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php +++ b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php @@ -86,10 +86,9 @@ public function __construct(PHPUnit_Framework_Test $failedTest, Exception $throw public function toString() { return sprintf( - '%s: %s', - - $this->failedTest->toString(), - $this->thrownException->getMessage() + '%s: %s', + $this->failedTest->toString(), + $this->thrownException->getMessage() ); } diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestResult.php b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php index f373b08..daf8a0a 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/TestResult.php +++ b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php @@ -69,11 +69,6 @@ class PHPUnit_Framework_TestResult implements Countable /** * @var array */ - protected $deprecatedFeatures = array(); - - /** - * @var array - */ protected $failures = array(); /** @@ -156,6 +151,11 @@ class PHPUnit_Framework_TestResult implements Countable /** * @var boolean */ + protected $beStrictAboutTodoAnnotatedTests = false; + + /** + * @var boolean + */ protected $stopOnRisky = false; /** @@ -236,21 +236,15 @@ public function flushListeners() public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) { if ($e instanceof PHPUnit_Framework_RiskyTest) { - $this->risky[] = new PHPUnit_Framework_TestFailure( - $test, $e - ); - - $notifyMethod = 'addRiskyTest'; + $this->risky[] = new PHPUnit_Framework_TestFailure($test, $e); + $notifyMethod = 'addRiskyTest'; if ($this->stopOnRisky) { $this->stop(); } } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) { - $this->notImplemented[] = new PHPUnit_Framework_TestFailure( - $test, $e - ); - - $notifyMethod = 'addIncompleteTest'; + $this->notImplemented[] = new PHPUnit_Framework_TestFailure($test, $e); + $notifyMethod = 'addIncompleteTest'; if ($this->stopOnIncomplete) { $this->stop(); @@ -290,21 +284,15 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) { if ($e instanceof PHPUnit_Framework_RiskyTest) { - $this->risky[] = new PHPUnit_Framework_TestFailure( - $test, $e - ); - - $notifyMethod = 'addRiskyTest'; + $this->risky[] = new PHPUnit_Framework_TestFailure($test, $e); + $notifyMethod = 'addRiskyTest'; if ($this->stopOnRisky) { $this->stop(); } } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) { - $this->notImplemented[] = new PHPUnit_Framework_TestFailure( - $test, $e - ); - - $notifyMethod = 'addIncompleteTest'; + $this->notImplemented[] = new PHPUnit_Framework_TestFailure($test, $e); + $notifyMethod = 'addIncompleteTest'; if ($this->stopOnIncomplete) { $this->stop(); @@ -334,16 +322,6 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser } /** - * Adds a deprecated feature notice to the list of deprecated features used during run - * - * @param PHPUnit_Util_DeprecatedFeature $deprecatedFeature - */ - public function addDeprecatedFeature(PHPUnit_Util_DeprecatedFeature $deprecatedFeature) - { - $this->deprecatedFeatures[] = $deprecatedFeature; - } - - /** * Informs the result that a testsuite will be started. * * @param PHPUnit_Framework_TestSuite $suite @@ -407,8 +385,9 @@ public function endTest(PHPUnit_Framework_Test $test, $time) $this->passed[$key] = array( 'result' => $test->getResult(), 'size' => PHPUnit_Util_Test::getSize( - $class, $test->getName(false) - ) + $class, + $test->getName(false) + ) ); $this->time += $time; @@ -532,28 +511,6 @@ public function errors() } /** - * Returns an Enumeration for the deprecated features used. - * - * @return array - * @since Method available since Release 3.5.7 - */ - public function deprecatedFeatures() - { - return $this->deprecatedFeatures; - } - - /** - * Returns an Enumeration for the deprecated features used. - * - * @return array - * @since Method available since Release 3.5.7 - */ - public function deprecatedFeaturesCount() - { - return count($this->deprecatedFeatures); - } - - /** * Gets the number of detected failures. * * @return integer @@ -627,8 +584,8 @@ public function run(PHPUnit_Framework_Test $test) if ($this->convertErrorsToExceptions) { $oldErrorHandler = set_error_handler( - array('PHPUnit_Util_ErrorHandler', 'handleError'), - E_ALL | E_STRICT + array('PHPUnit_Util_ErrorHandler', 'handleError'), + E_ALL | E_STRICT ); if ($oldErrorHandler === null) { @@ -649,7 +606,7 @@ public function run(PHPUnit_Framework_Test $test) foreach ($classes as $class) { $this->codeCoverage->filter()->addFileToBlacklist( - $class->getFileName() + $class->getFileName() ); } } @@ -666,17 +623,17 @@ public function run(PHPUnit_Framework_Test $test) switch ($test->getSize()) { case PHPUnit_Util_Test::SMALL: { $_timeout = $this->timeoutForSmallTests; - } + } break; case PHPUnit_Util_Test::MEDIUM: { $_timeout = $this->timeoutForMediumTests; - } + } break; case PHPUnit_Util_Test::LARGE: { $_timeout = $this->timeoutForLargeTests; - } + } break; } @@ -714,34 +671,38 @@ public function run(PHPUnit_Framework_Test $test) if ($append && $test instanceof PHPUnit_Framework_TestCase) { $linesToBeCovered = PHPUnit_Util_Test::getLinesToBeCovered( - get_class($test), $test->getName(false) + get_class($test), + $test->getName(false) ); $linesToBeUsed = PHPUnit_Util_Test::getLinesToBeUsed( - get_class($test), $test->getName(false) + get_class($test), + $test->getName(false) ); } try { $this->codeCoverage->stop( - $append, $linesToBeCovered, $linesToBeUsed + $append, + $linesToBeCovered, + $linesToBeUsed ); } catch (PHP_CodeCoverage_Exception_UnintentionallyCoveredCode $cce) { $this->addFailure( - $test, - new PHPUnit_Framework_UnintentionallyCoveredCodeError( - 'This test executed code that is not listed as code to be covered or used:' . - PHP_EOL . $cce->getMessage() - ), - $time + $test, + new PHPUnit_Framework_UnintentionallyCoveredCodeError( + 'This test executed code that is not listed as code to be covered or used:' . + PHP_EOL . $cce->getMessage() + ), + $time ); } catch (PHPUnit_Framework_InvalidCoversTargetException $cce) { $this->addFailure( - $test, - new PHPUnit_Framework_InvalidCoversTargetError( - $cce->getMessage() - ), - $time + $test, + new PHPUnit_Framework_InvalidCoversTargetError( + $cce->getMessage() + ), + $time ); } catch (PHP_CodeCoverage_Exception $cce) { $error = true; @@ -756,6 +717,20 @@ public function run(PHPUnit_Framework_Test $test) restore_error_handler(); } + if ($this->beStrictAboutTodoAnnotatedTests && $test instanceof PHPUnit_Framework_TestCase) { + $annotations = $test->getAnnotations(); + + if (isset($annotations['method']['todo'])) { + $this->addFailure( + $test, + new PHPUnit_Framework_RiskyTestError( + 'Test method is annotated with @todo' + ), + $time + ); + } + } + if ($error === true) { $this->addError($test, $e, $time); } elseif ($failure === true) { @@ -763,22 +738,22 @@ public function run(PHPUnit_Framework_Test $test) } elseif ($this->beStrictAboutTestsThatDoNotTestAnything && $test->getNumAssertions() == 0) { $this->addFailure( - $test, - new PHPUnit_Framework_RiskyTestError( - 'This test did not perform any assertions' - ), - $time + $test, + new PHPUnit_Framework_RiskyTestError( + 'This test did not perform any assertions' + ), + $time ); } elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) { $this->addFailure( - $test, - new PHPUnit_Framework_OutputError( - sprintf( - 'This test printed output: %s', - $test->getActualOutput() - ) - ), - $time + $test, + new PHPUnit_Framework_OutputError( + sprintf( + 'This test printed output: %s', + $test->getActualOutput() + ) + ), + $time ); } @@ -965,6 +940,29 @@ public function isStrictAboutTestSize() } /** + * @param boolean $flag + * @throws PHPUnit_Framework_Exception + * @since Method available since Release 4.2.0 + */ + public function beStrictAboutTodoAnnotatedTests($flag) + { + if (!is_bool($flag)) { + throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean'); + } + + $this->beStrictAboutTodoAnnotatedTests = $flag; + } + + /** + * @return boolean + * @since Method available since Release 4.2.0 + */ + public function isStrictAboutTodoAnnotatedTests() + { + return $this->beStrictAboutTodoAnnotatedTests; + } + + /** * Enables or disables the stopping for risky tests. * * @param boolean $flag @@ -1100,7 +1098,7 @@ protected function getHierarchy($className, $asReflectionObjects = false) while (!$done) { if ($asReflectionObjects) { $class = new ReflectionClass( - $classes[count($classes)-1]->getName() + $classes[count($classes)-1]->getName() ); } else { $class = new ReflectionClass($classes[count($classes)-1]); diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php index 03f36cd..86fa5f8 100644 --- a/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php +++ b/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php @@ -134,6 +134,11 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra protected $testCase = false; /** + * @var array + */ + protected $foundClasses = array(); + + /** * @var PHPUnit_Runner_Filter_Factory */ private $iteratorFilter = null; @@ -188,7 +193,7 @@ class_exists($theClass, false)) { if (!$theClass->isSubclassOf('PHPUnit_Framework_TestCase')) { throw new PHPUnit_Framework_Exception( - 'Class "' . $theClass->name . '" does not extend PHPUnit_Framework_TestCase.' + 'Class "' . $theClass->name . '" does not extend PHPUnit_Framework_TestCase.' ); } @@ -203,13 +208,12 @@ class_exists($theClass, false)) { if ($constructor !== null && !$constructor->isPublic()) { $this->addTest( - self::warning( - sprintf( - 'Class "%s" has no public constructor.', - - $theClass->getName() + self::warning( + sprintf( + 'Class "%s" has no public constructor.', + $theClass->getName() + ) ) - ) ); return; @@ -221,13 +225,12 @@ class_exists($theClass, false)) { if (empty($this->tests)) { $this->addTest( - self::warning( - sprintf( - 'No tests found in class "%s".', - - $theClass->getName() + self::warning( + sprintf( + 'No tests found in class "%s".', + $theClass->getName() + ) ) - ) ); } @@ -291,7 +294,8 @@ public function addTestSuite($testClass) if (!is_object($testClass)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'class name or object' + 1, + 'class name or object' ); } @@ -303,12 +307,12 @@ public function addTestSuite($testClass) if (!$testClass->isAbstract()) { if ($testClass->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) { $method = $testClass->getMethod( - PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME + PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME ); if ($method->isStatic()) { $this->addTest( - $method->invoke(null, $testClass->getName()) + $method->invoke(null, $testClass->getName()) ); $suiteMethod = true; @@ -348,23 +352,42 @@ public function addTestFile($filename, $phptOptions = array()) if (file_exists($filename) && substr($filename, -5) == '.phpt') { $this->addTest( - new PHPUnit_Extensions_PhptTestCase($filename, $phptOptions) + new PHPUnit_Extensions_PhptTestCase($filename, $phptOptions) ); - return; } + // The given file may contain further stub classes in addition to the + // test class itself. Figure out the actual test class. $classes = get_declared_classes(); $filename = PHPUnit_Util_Fileloader::checkAndLoad($filename); - $newClasses = array_values(array_diff(get_declared_classes(), $classes)); - $baseName = str_replace('.php', '', basename($filename)); - - foreach ($newClasses as $className) { - if (substr($className, 0 - strlen($baseName)) == $baseName) { + $newClasses = array_diff(get_declared_classes(), $classes); + + // The diff is empty in case a parent class (with test methods) is added + // AFTER a child class that inherited from it. To account for that case, + // cumulate all discovered classes, so the parent class may be found in + // a later invocation. + if ($newClasses) { + // On the assumption that test classes are defined first in files, + // process discovered classes in approximate LIFO order, so as to + // avoid unnecessary reflection. + $this->foundClasses = array_merge($newClasses, $this->foundClasses); + } + + // The test class's name must match the filename, either in full, or as + // a PEAR/PSR-0 prefixed shortname ('NameSpace_ShortName'), or as a + // PSR-1 local shortname ('NameSpace\ShortName'). The comparison must be + // anchored to prevent false-positive matches (e.g., 'OtherShortName'). + $shortname = basename($filename, '.php'); + $shortnameRegEx = '/(?:^|_|\\\\)' . preg_quote($shortname, '/') . '$/'; + + foreach ($this->foundClasses as $i => $className) { + if (preg_match($shortnameRegEx, $className)) { $class = new ReflectionClass($className); if ($class->getFileName() == $filename) { $newClasses = array($className); + unset($this->foundClasses[$i]); break; } } @@ -376,7 +399,7 @@ public function addTestFile($filename, $phptOptions = array()) if (!$class->isAbstract()) { if ($class->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) { $method = $class->getMethod( - PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME + PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME ); if ($method->isStatic()) { @@ -403,7 +426,8 @@ public function addTestFiles($filenames) if (!(is_array($filenames) || (is_object($filenames) && $filenames instanceof Iterator))) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'array or iterator' + 1, + 'array or iterator' ); } @@ -440,19 +464,24 @@ public static function createTest(ReflectionClass $theClass, $name) if (!$theClass->isInstantiable()) { return self::warning( - sprintf('Cannot instantiate class "%s".', $className) + sprintf('Cannot instantiate class "%s".', $className) ); } - $backupSettings = PHPUnit_Util_Test::getBackupSettings( - $className, $name - ); - $preserveGlobalState = PHPUnit_Util_Test::getPreserveGlobalStateSettings( - $className, $name - ); + $backupSettings = PHPUnit_Util_Test::getBackupSettings( + $className, + $name + ); + + $preserveGlobalState = PHPUnit_Util_Test::getPreserveGlobalStateSettings( + $className, + $name + ); + $runTestInSeparateProcess = PHPUnit_Util_Test::getProcessIsolationSettings( - $className, $name - ); + $className, + $name + ); $constructor = $theClass->getConstructor(); @@ -462,19 +491,18 @@ public static function createTest(ReflectionClass $theClass, $name) // TestCase() or TestCase($name) if (count($parameters) < 2) { $test = new $className; - } - - // TestCase($name, $data) + } // TestCase($name, $data) else { try { $data = PHPUnit_Util_Test::getProvidedData( - $className, $name + $className, + $name ); } catch (Exception $e) { $message = sprintf( - 'The data provider specified for %s::%s is invalid.', - $className, - $name + 'The data provider specified for %s::%s is invalid.', + $className, + $name ); $_message = $e->getMessage(); @@ -489,15 +517,15 @@ public static function createTest(ReflectionClass $theClass, $name) // Test method with @dataProvider. if (isset($data)) { $test = new PHPUnit_Framework_TestSuite_DataProvider( - $className . '::' . $name + $className . '::' . $name ); if (empty($data)) { $data = self::warning( - sprintf( - 'No tests found in suite "%s".', - $test->getName() - ) + sprintf( + 'No tests found in suite "%s".', + $test->getName() + ) ); } @@ -519,13 +547,13 @@ public static function createTest(ReflectionClass $theClass, $name) if ($backupSettings['backupGlobals'] !== null) { $_test->setBackupGlobals( - $backupSettings['backupGlobals'] + $backupSettings['backupGlobals'] ); } if ($backupSettings['backupStaticAttributes'] !== null) { $_test->setBackupStaticAttributes( - $backupSettings['backupStaticAttributes'] + $backupSettings['backupStaticAttributes'] ); } @@ -559,7 +587,7 @@ public static function createTest(ReflectionClass $theClass, $name) if ($backupSettings['backupStaticAttributes'] !== null) { $test->setBackupStaticAttributes( - $backupSettings['backupStaticAttributes'] + $backupSettings['backupStaticAttributes'] ); } } @@ -778,8 +806,9 @@ public function markTestSuiteSkipped($message = '') */ protected function addTestMethod(ReflectionClass $class, ReflectionMethod $method) { - if (!$this->isTestMethod($method)) + if (!$this->isTestMethod($method)) { return; + } $name = $method->getName(); @@ -790,9 +819,9 @@ protected function addTestMethod(ReflectionClass $class, ReflectionMethod $metho 'Test method "%s" in test class "%s" is not public.', $name, $class->getName() - ) ) - ); + ) + ); return; } diff --git a/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php index d92b200..73dbc01 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php +++ b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php @@ -90,7 +90,7 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') !is_file($suiteClassName . '.php') && empty($suiteClassFile)) { $facade = new File_Iterator_Facade; $files = $facade->getFilesAsArray( - $suiteClassName, $suffixes + $suiteClassName, $suffixes ); $suite = new PHPUnit_Framework_TestSuite($suiteClassName); @@ -101,7 +101,7 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') try { $testClass = $this->loadSuiteClass( - $suiteClassName, $suiteClassFile + $suiteClassName, $suiteClassFile ); } catch (PHPUnit_Framework_Exception $e) { $this->runFailed($e->getMessage()); @@ -114,7 +114,7 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') if (!$suiteMethod->isStatic()) { $this->runFailed( - 'suite() method must be static.' + 'suite() method must be static.' ); return null; @@ -124,11 +124,10 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '') $test = $suiteMethod->invoke(null, $testClass->getName()); } catch (ReflectionException $e) { $this->runFailed( - sprintf( - "Failed to invoke suite() method.\n%s", - - $e->getMessage() - ) + sprintf( + "Failed to invoke suite() method.\n%s", + $e->getMessage() + ) ); return null; @@ -158,11 +157,7 @@ protected function loadSuiteClass($suiteClassName, $suiteClassFile = '') { $loader = $this->getLoader(); - if ($loader instanceof PHPUnit_Runner_StandardTestSuiteLoader) { - return $loader->load($suiteClassName, $suiteClassFile); - } else { - return $loader->load($suiteClassName, $suiteClassFile); - } + return $loader->load($suiteClassName, $suiteClassFile); } /** diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php index 0b2abf1..e883a8a 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php +++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php @@ -67,10 +67,10 @@ public function addFilter(ReflectionClass $filter, $args) { if (!$filter->isSubclassOf('RecursiveFilterIterator')) { throw new InvalidArgumentException( - sprintf( - 'Class "%s" does not extend RecursiveFilterIterator', - $filter->name - ) + sprintf( + 'Class "%s" does not extend RecursiveFilterIterator', + $filter->name + ) ); } diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php index ee097ce..4936499 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php +++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php @@ -71,8 +71,9 @@ public function __construct(RecursiveIterator $iterator, array $groups, PHPUnit_ foreach ($suite->getGroupDetails() as $group => $tests) { if (in_array($group, $groups)) { $testHashes = array_map( - function ($test) { return spl_object_hash($test); }, - $tests + function ($test) { return spl_object_hash($test); + }, + $tests ); $this->groupTests = array_merge($this->groupTests, $testHashes); diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php index 106b8a9..affa64d 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php +++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php @@ -83,45 +83,41 @@ public function __construct(RecursiveIterator $iterator, $filter) */ protected function setFilter($filter) { - if ($filter[0] != substr($filter, -1) || - preg_match('/^[a-zA-Z0-9_]/', $filter)) { - + if (PHPUnit_Util_Regex::pregMatchSafe($filter, '') === false) { // Handles: // * testAssertEqualsSucceeds#4 // * testAssertEqualsSucceeds#4-8 if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) { if (isset($matches[3]) && $matches[2] < $matches[3]) { $filter = sprintf( - '%s.*with data set #(\d+)$', - $matches[1] + '%s.*with data set #(\d+)$', + $matches[1] ); $this->filterMin = $matches[2]; $this->filterMax = $matches[3]; } else { $filter = sprintf( - '%s.*with data set #%s$', - $matches[1], - $matches[2] + '%s.*with data set #%s$', + $matches[1], + $matches[2] ); } - } - - // Handles: + } // Handles: // * testDetermineJsonError@JSON_ERROR_NONE // * testDetermineJsonError@JSON.* elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) { $filter = sprintf( - '%s.*with data set "%s"$', - $matches[1], - $matches[2] + '%s.*with data set "%s"$', + $matches[1], + $matches[2] ); } // Escape delimiters in regular expression. Do NOT use preg_quote, // to keep magic characters. $filter = sprintf('/%s/', str_replace( - '/', '\\/', $filter + '/', '\\/', $filter )); } diff --git a/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php b/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php index 9de65a8..40a1bb5 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php +++ b/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php @@ -68,7 +68,7 @@ public function load($suiteClassName, $suiteClassFile = '') if (empty($suiteClassFile)) { $suiteClassFile = PHPUnit_Util_Filesystem::classNameToFilename( - $suiteClassName + $suiteClassName ); } @@ -78,7 +78,7 @@ public function load($suiteClassName, $suiteClassFile = '') $filename = PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile); $loadedClasses = array_values( - array_diff(get_declared_classes(), $loadedClasses) + array_diff(get_declared_classes(), $loadedClasses) ); } @@ -137,12 +137,11 @@ public function load($suiteClassName, $suiteClassFile = '') } throw new PHPUnit_Framework_Exception( - sprintf( - "Class '%s' could not be found in '%s'.", - - $suiteClassName, - $suiteClassFile - ) + sprintf( + "Class '%s' could not be found in '%s'.", + $suiteClassName, + $suiteClassFile + ) ); } diff --git a/core/vendor/phpunit/phpunit/src/Runner/Version.php b/core/vendor/phpunit/phpunit/src/Runner/Version.php index cd39538..24a6398 100644 --- a/core/vendor/phpunit/phpunit/src/Runner/Version.php +++ b/core/vendor/phpunit/phpunit/src/Runner/Version.php @@ -71,7 +71,7 @@ public static function id() } if (self::$version === null) { - $version = new SebastianBergmann\Version('4.1.4', dirname(dirname(__DIR__))); + $version = new SebastianBergmann\Version('4.2.6', dirname(dirname(__DIR__))); self::$version = $version->getVersion(); } diff --git a/core/vendor/phpunit/phpunit/src/TextUI/Command.php b/core/vendor/phpunit/phpunit/src/TextUI/Command.php index cd62882..a05fa3d 100644 --- a/core/vendor/phpunit/phpunit/src/TextUI/Command.php +++ b/core/vendor/phpunit/phpunit/src/TextUI/Command.php @@ -108,6 +108,7 @@ class PHPUnit_TextUI_Command 'strict-coverage' => null, 'disallow-test-output' => null, 'enforce-time-limit' => null, + 'disallow-todo-tests' => null, 'strict' => null, 'tap' => null, 'testdox' => null, @@ -123,6 +124,11 @@ class PHPUnit_TextUI_Command ); /** + * @var boolean + */ + private $versionStringPrinted = false; + + /** * @param boolean $exit */ public static function main($exit = true) @@ -133,8 +139,9 @@ public static function main($exit = true) } /** - * @param array $argv - * @param boolean $exit + * @param array $argv + * @param boolean $exit + * @return integer */ public function run(array $argv, $exit = true) { @@ -147,14 +154,14 @@ public function run(array $argv, $exit = true) $suite = $this->arguments['test']; } else { $suite = $runner->getTest( - $this->arguments['test'], - $this->arguments['testFile'], - $this->arguments['testSuffixes'] + $this->arguments['test'], + $this->arguments['testFile'], + $this->arguments['testSuffixes'] ); } if ($this->arguments['listGroups']) { - PHPUnit_TextUI_TestRunner::printVersionString(); + $this->printVersionString(); print "Available test group(s):\n"; @@ -261,50 +268,50 @@ protected function handleArguments(array $argv) try { $this->options = PHPUnit_Util_Getopt::getopt( - $argv, - 'd:c:hv', - array_keys($this->longOptions) + $argv, + 'd:c:hv', + array_keys($this->longOptions) ); } catch (PHPUnit_Framework_Exception $e) { - PHPUnit_TextUI_TestRunner::showError($e->getMessage()); + $this->showError($e->getMessage()); } foreach ($this->options[0] as $option) { switch ($option[0]) { case '--colors': { $this->arguments['colors'] = true; - } + } break; case '--bootstrap': { $this->arguments['bootstrap'] = $option[1]; - } + } break; case 'c': case '--configuration': { $this->arguments['configuration'] = $option[1]; - } + } break; case '--coverage-clover': { $this->arguments['coverageClover'] = $option[1]; - } + } break; case '--coverage-crap4j': { $this->arguments['coverageCrap4J'] = $option[1]; - } + } break; case '--coverage-html': { $this->arguments['coverageHtml'] = $option[1]; - } + } break; case '--coverage-php': { $this->arguments['coveragePHP'] = $option[1]; - } + } break; case '--coverage-text': { @@ -315,12 +322,12 @@ protected function handleArguments(array $argv) $this->arguments['coverageText'] = $option[1]; $this->arguments['coverageTextShowUncoveredFiles'] = false; $this->arguments['coverageTextShowOnlySummary'] = false; - } + } break; case '--coverage-xml': { $this->arguments['coverageXml'] = $option[1]; - } + } break; case 'd': { @@ -333,204 +340,210 @@ protected function handleArguments(array $argv) ini_set($ini[0], true); } } - } + } break; case '--debug': { $this->arguments['debug'] = true; - } + } break; case 'h': case '--help': { $this->showHelp(); exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT); - } + } break; case '--filter': { $this->arguments['filter'] = $option[1]; - } + } break; case '--testsuite': { $this->arguments['testsuite'] = $option[1]; - } + } break; case '--group': { $this->arguments['groups'] = explode(',', $option[1]); - } + } break; case '--exclude-group': { $this->arguments['excludeGroups'] = explode( - ',', $option[1] + ',', $option[1] ); - } + } break; case '--test-suffix': { $this->arguments['testSuffixes'] = explode( - ',', $option[1] + ',', $option[1] ); - } + } break; case '--include-path': { $includePath = $option[1]; - } + } break; case '--list-groups': { $this->arguments['listGroups'] = true; - } + } break; case '--printer': { $this->arguments['printer'] = $option[1]; - } + } break; case '--loader': { $this->arguments['loader'] = $option[1]; - } + } break; case '--log-json': { $this->arguments['jsonLogfile'] = $option[1]; - } + } break; case '--log-junit': { $this->arguments['junitLogfile'] = $option[1]; - } + } break; case '--log-tap': { $this->arguments['tapLogfile'] = $option[1]; - } + } break; case '--process-isolation': { $this->arguments['processIsolation'] = true; - } + } break; case '--repeat': { $this->arguments['repeat'] = (int) $option[1]; - } + } break; case '--stderr': { $this->arguments['stderr'] = true; - } + } break; case '--stop-on-error': { $this->arguments['stopOnError'] = true; - } + } break; case '--stop-on-failure': { $this->arguments['stopOnFailure'] = true; - } + } break; case '--stop-on-incomplete': { $this->arguments['stopOnIncomplete'] = true; - } + } break; case '--stop-on-risky': { $this->arguments['stopOnRisky'] = true; - } + } break; case '--stop-on-skipped': { $this->arguments['stopOnSkipped'] = true; - } + } break; case '--tap': { $this->arguments['printer'] = new PHPUnit_Util_Log_TAP; - } + } break; case '--testdox': { $this->arguments['printer'] = new PHPUnit_Util_TestDox_ResultPrinter_Text; - } + } break; case '--testdox-html': { $this->arguments['testdoxHTMLFile'] = $option[1]; - } + } break; case '--testdox-text': { $this->arguments['testdoxTextFile'] = $option[1]; - } + } break; case '--no-configuration': { $this->arguments['useDefaultConfiguration'] = false; - } + } break; case '--no-globals-backup': { $this->arguments['backupGlobals'] = false; - } + } break; case '--static-backup': { $this->arguments['backupStaticAttributes'] = true; - } + } break; case 'v': case '--verbose': { $this->arguments['verbose'] = true; - } + } break; case '--version': { - PHPUnit_TextUI_TestRunner::printVersionString(); + $this->printVersionString(); exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT); - } + } break; case '--report-useless-tests': { $this->arguments['reportUselessTests'] = true; - } + } break; case '--strict-coverage': { $this->arguments['strictCoverage'] = true; - } + } break; case '--disallow-test-output': { $this->arguments['disallowTestOutput'] = true; - } + } break; case '--enforce-time-limit': { $this->arguments['enforceTimeLimit'] = true; - } + } + break; + + case '--disallow-todo-tests': { + $this->arguments['disallowTodoAnnotatedTests'] = true; + } break; case '--strict': { - $this->arguments['reportUselessTests'] = true; - $this->arguments['strictCoverage'] = true; - $this->arguments['disallowTestOutput'] = true; - $this->arguments['enforceTimeLimit'] = true; - } + $this->arguments['reportUselessTests'] = true; + $this->arguments['strictCoverage'] = true; + $this->arguments['disallowTestOutput'] = true; + $this->arguments['enforceTimeLimit'] = true; + $this->arguments['disallowTodoAnnotatedTests'] = true; + } break; case '--selfupdate': case '--self-update': { $this->handleSelfUpdate(); - } + } break; default: { @@ -545,14 +558,13 @@ protected function handleArguments(array $argv) if (isset($handler) && is_callable(array($this, $handler))) { $this->$handler($option[1]); } - } + } } } $this->handleCustomTestSuite(); if (!isset($this->arguments['test'])) { - if (isset($this->options[1][0])) { $this->arguments['test'] = $this->options[1][0]; } @@ -577,8 +589,8 @@ protected function handleArguments(array $argv) if (isset($includePath)) { ini_set( - 'include_path', - $includePath . PATH_SEPARATOR . ini_get('include_path') + 'include_path', + $includePath . PATH_SEPARATOR . ini_get('include_path') ); } @@ -602,11 +614,11 @@ protected function handleArguments(array $argv) if (file_exists($configurationFile)) { $this->arguments['configuration'] = realpath( - $configurationFile + $configurationFile ); } elseif (file_exists($configurationFile . '.dist')) { $this->arguments['configuration'] = realpath( - $configurationFile . '.dist' + $configurationFile . '.dist' ); } } elseif (!isset($this->arguments['configuration']) && @@ -615,7 +627,7 @@ protected function handleArguments(array $argv) $this->arguments['configuration'] = realpath('phpunit.xml'); } elseif (file_exists('phpunit.xml.dist')) { $this->arguments['configuration'] = realpath( - 'phpunit.xml.dist' + 'phpunit.xml.dist' ); } } @@ -623,7 +635,7 @@ protected function handleArguments(array $argv) if (isset($this->arguments['configuration'])) { try { $configuration = PHPUnit_Util_Configuration::getInstance( - $this->arguments['configuration'] + $this->arguments['configuration'] ); } catch (Exception $e) { print $e->getMessage() . "\n"; @@ -643,8 +655,8 @@ protected function handleArguments(array $argv) */ if (isset($phpunit['stderr']) && $phpunit['stderr'] == true) { $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter( - 'php://stderr', - isset($this->arguments['verbose']) ? $this->arguments['verbose'] : FALSE + 'php://stderr', + isset($this->arguments['verbose']) ? $this->arguments['verbose'] : false ); } @@ -656,7 +668,7 @@ protected function handleArguments(array $argv) } $this->arguments['printer'] = $this->handlePrinter( - $phpunit['printerClass'], $file + $phpunit['printerClass'], $file ); } @@ -668,7 +680,7 @@ protected function handleArguments(array $argv) } $this->arguments['loader'] = $this->handleLoader( - $phpunit['testSuiteLoaderClass'], $file + $phpunit['testSuiteLoaderClass'], $file ); } @@ -714,7 +726,7 @@ protected function handleLoader($loaderClass, $loaderFile = '') if (!class_exists($loaderClass, false)) { if ($loaderFile == '') { $loaderFile = PHPUnit_Util_Filesystem::classNameToFilename( - $loaderClass + $loaderClass ); } @@ -730,25 +742,20 @@ protected function handleLoader($loaderClass, $loaderFile = '') if ($class->implementsInterface('PHPUnit_Runner_TestSuiteLoader') && $class->isInstantiable()) { - $loader = $class->newInstance(); + return $class->newInstance(); } } - if (!isset($loader)) { - if ($loaderClass == 'PHPUnit_Runner_StandardTestSuiteLoader') { - return; - } + if ($loaderClass == 'PHPUnit_Runner_StandardTestSuiteLoader') { + return; + } - PHPUnit_TextUI_TestRunner::showError( - sprintf( + $this->showError( + sprintf( 'Could not use "%s" as loader.', - $loaderClass - ) - ); - } - - return $loader; + ) + ); } /** @@ -763,7 +770,7 @@ protected function handlePrinter($printerClass, $printerFile = '') if (!class_exists($printerClass, false)) { if ($printerFile == '') { $printerFile = PHPUnit_Util_Filesystem::classNameToFilename( - $printerClass + $printerClass ); } @@ -784,21 +791,16 @@ protected function handlePrinter($printerClass, $printerFile = '') return $printerClass; } - $printer = $class->newInstance(); + return $class->newInstance(); } } - if (!isset($printer)) { - PHPUnit_TextUI_TestRunner::showError( - sprintf( + $this->showError( + sprintf( 'Could not use "%s" as printer.', - $printerClass - ) - ); - } - - return $printer; + ) + ); } /** @@ -811,7 +813,7 @@ protected function handleBootstrap($filename) try { PHPUnit_Util_Fileloader::checkAndLoad($filename); } catch (PHPUnit_Framework_Exception $e) { - PHPUnit_TextUI_TestRunner::showError($e->getMessage()); + $this->showError($e->getMessage()); } } @@ -820,7 +822,7 @@ protected function handleBootstrap($filename) */ protected function handleSelfUpdate() { - PHPUnit_TextUI_TestRunner::printVersionString(); + $this->printVersionString(); if (!extension_loaded('openssl')) { print "The OpenSSL extension is not loaded.\n"; @@ -828,8 +830,8 @@ protected function handleSelfUpdate() } $remoteFilename = sprintf( - 'https://phar.phpunit.de/phpunit%s.phar', - PHPUnit_Runner_Version::getReleaseChannel() + 'https://phar.phpunit.de/phpunit%s.phar', + PHPUnit_Runner_Version::getReleaseChannel() ); $localFilename = realpath($_SERVER['argv'][0]); @@ -855,12 +857,12 @@ protected function handleSelfUpdate() } file_put_contents( - $tempFilename, - file_get_contents( - $remoteFilename, - false, - stream_context_create($options) - ) + $tempFilename, + file_get_contents( + $remoteFilename, + false, + stream_context_create($options) + ) ); chmod($tempFilename, 0777 & ~umask()); @@ -874,11 +876,11 @@ protected function handleSelfUpdate() unlink($caFile); unlink($tempFilename); print " done\n\n" . $e->getMessage() . "\n"; - exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT); + exit(2); } print " done\n"; - exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT); + exit(0); } /** @@ -886,7 +888,7 @@ protected function handleSelfUpdate() */ protected function showHelp() { - PHPUnit_TextUI_TestRunner::printVersionString(); + $this->printVersionString(); print << Runs the test(s) repeatedly. --tap Report test execution progress in TAP format. --testdox Report test execution progress in TestDox format. - --printer TestSuiteListener implementation to use. + --printer TestListener implementation to use. Configuration Options: @@ -974,4 +977,26 @@ protected function showHelp() protected function handleCustomTestSuite() { } + + private function printVersionString() + { + if ($this->versionStringPrinted) { + return; + } + + print PHPUnit_Runner_Version::getVersionString() . "\n\n"; + + $this->versionStringPrinted = true; + } + + /** + */ + private function showError($message) + { + $this->printVersionString(); + + print $message . "\n"; + + exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT); + } } diff --git a/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php b/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php index 3a316c1..68e8aff 100644 --- a/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php +++ b/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php @@ -177,15 +177,6 @@ public function printResult(PHPUnit_Framework_TestResult $result) $this->printFailures($result); if ($this->verbose) { - if ($printSeparator && $result->deprecatedFeaturesCount() > 0) { - $this->write("\n--\n\n"); - } - - $printSeparator = $printSeparator || - $result->deprecatedFeaturesCount() > 0; - - $this->printDeprecated($result); - if ($printSeparator && $result->riskyCount() > 0) { $this->write("\n--\n\n"); } @@ -227,14 +218,13 @@ protected function printDefects(array $defects, $type) } $this->write( - sprintf( - "There %s %d %s%s:\n", - - ($count == 1) ? 'was' : 'were', - $count, - $type, - ($count == 1) ? '' : 's' - ) + sprintf( + "There %s %d %s%s:\n", + ($count == 1) ? 'was' : 'were', + $count, + $type, + ($count == 1) ? '' : 's' + ) ); $i = 1; @@ -269,12 +259,11 @@ protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $cou } $this->write( - sprintf( - "\n%d) %s\n", - - $count, - $testName - ) + sprintf( + "\n%d) %s\n", + $count, + $testName + ) ); } @@ -286,7 +275,7 @@ protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect) $this->write($defect->getExceptionAsString()); $trace = PHPUnit_Util_Filter::getFilteredStacktrace( - $defect->thrownException() + $defect->thrownException() ); if (!empty($trace)) { @@ -296,13 +285,13 @@ protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect) $e = $defect->thrownException()->getPrevious(); while ($e) { - $this->write( - "\nCaused by\n" . - PHPUnit_Framework_TestFailure::exceptionToString($e). "\n" . - PHPUnit_Util_Filter::getFilteredStacktrace($e) - ); + $this->write( + "\nCaused by\n" . + PHPUnit_Framework_TestFailure::exceptionToString($e). "\n" . + PHPUnit_Util_Filter::getFilteredStacktrace($e) + ); - $e = $e->getPrevious(); + $e = $e->getPrevious(); } } @@ -348,44 +337,6 @@ protected function printSkipped(PHPUnit_Framework_TestResult $result) $this->printDefects($result->skipped(), 'skipped test'); } - /** - * @param PHPUnit_Framework_TestResult $result - * @since Method available since Release 4.0.0 - */ - protected function printDeprecated(PHPUnit_Framework_TestResult $result) - { - $deprecatedFeatures = $result->deprecatedFeatures(); - $count = count($deprecatedFeatures); - - if ($count == 0) { - return; - } - - $this->write( - sprintf( - "There %s %d tests that use%s deprecated features:\n", - - ($count == 1) ? 'was' : 'were', - $count, - ($count != 1) ? '' : 's' - ) - ); - - $i = 1; - - foreach ($result->deprecatedFeatures() as $deprecatedFeature) { - $this->write( - sprintf( - "\n%d) %s\n\n%s\n", - - $i++, - $deprecatedFeature->getMessage(), - $deprecatedFeature->getSource() - ) - ); - } - } - protected function printHeader() { $this->write("\n\n" . PHP_Timer::resourceUsage() . "\n\n"); @@ -398,80 +349,61 @@ protected function printFooter(PHPUnit_Framework_TestResult $result) { if (count($result) === 0) { $this->writeWithColor( - 'fg-black, bg-yellow', - 'No tests executed!' + 'fg-black, bg-yellow', + 'No tests executed!' ); } elseif ($result->wasSuccessful() && $result->allHarmless() && $result->allCompletelyImplemented() && $result->noneSkipped()) { - $this->writeWithColor( - 'fg-black, bg-green', - sprintf( - 'OK (%d test%s, %d assertion%s)', - - count($result), - (count($result) == 1) ? '' : 's', - $this->numAssertions, - ($this->numAssertions == 1) ? '' : 's' - ) + 'fg-black, bg-green', + sprintf( + 'OK (%d test%s, %d assertion%s)', + count($result), + (count($result) == 1) ? '' : 's', + $this->numAssertions, + ($this->numAssertions == 1) ? '' : 's' + ) ); } elseif ((!$result->allCompletelyImplemented() || !$result->allHarmless() || !$result->noneSkipped()) && $result->wasSuccessful()) { $this->writeWithColor( - 'fg-black, bg-yellow', - sprintf( - "%sOK, but incomplete, skipped, or risky tests!\n" . - 'Tests: %d, Assertions: %d%s%s%s.', - - $this->verbose ? "\n" : '', - count($result), - $this->numAssertions, - $this->getCountString( - $result->notImplementedCount(), 'Incomplete' - ), - $this->getCountString( - $result->skippedCount(), 'Skipped' - ), - $this->getCountString( - $result->riskyCount(), 'Risky' + 'fg-black, bg-yellow', + sprintf( + "%sOK, but incomplete, skipped, or risky tests!\n" . + 'Tests: %d, Assertions: %d%s%s%s.', + $this->verbose ? "\n" : '', + count($result), + $this->numAssertions, + $this->getCountString( + $result->notImplementedCount(), 'Incomplete' + ), + $this->getCountString( + $result->skippedCount(), 'Skipped' + ), + $this->getCountString( + $result->riskyCount(), 'Risky' + ) ) - ) ); } else { $this->writeWithColor( - 'fg-white, bg-red', - sprintf( - "\nFAILURES!\n" . - 'Tests: %d, Assertions: %s%s%s%s%s.', - - count($result), - $this->numAssertions, - $this->getCountString($result->failureCount(), 'Failures'), - $this->getCountString($result->errorCount(), 'Errors'), - $this->getCountString( - $result->notImplementedCount(), 'Incomplete' - ), - $this->getCountString($result->skippedCount(), 'Skipped') - ) - ); - } - - if (!$this->verbose && - $result->deprecatedFeaturesCount() > 0) { - $this->write("\n"); - - $this->writeWithColor( - 'fg-white, bg-red', - sprintf( - "Warning: Deprecated PHPUnit features are being used %s times!\n" . - 'Use --verbose for more information.', - - $result->deprecatedFeaturesCount() - ) + 'fg-white, bg-red', + sprintf( + "\nFAILURES!\n" . + 'Tests: %d, Assertions: %s%s%s%s%s.', + count($result), + $this->numAssertions, + $this->getCountString($result->failureCount(), 'Failures'), + $this->getCountString($result->errorCount(), 'Errors'), + $this->getCountString( + $result->notImplementedCount(), 'Incomplete' + ), + $this->getCountString($result->skippedCount(), 'Skipped') + ) ); } } @@ -488,10 +420,9 @@ protected function getCountString($count, $name) if ($count > 0) { $string = sprintf( - ', %s: %d', - - $name, - $count + ', %s: %d', + $name, + $count ); } @@ -606,9 +537,9 @@ public function startTest(PHPUnit_Framework_Test $test) { if ($this->debug) { $this->write( - sprintf( - "\nStarting test '%s'.\n", PHPUnit_Util_Test::describe($test) - ) + sprintf( + "\nStarting test '%s'.\n", PHPUnit_Util_Test::describe($test) + ) ); } } @@ -651,14 +582,13 @@ protected function writeProgress($progress) if ($this->column == $this->maxColumn) { $this->write( - sprintf( - ' %' . $this->numTestsWidth . 'd / %' . - $this->numTestsWidth . 'd (%3s%%)', - - $this->numTestsRun, - $this->numTests, - floor(($this->numTestsRun / $this->numTests) * 100) - ) + sprintf( + ' %' . $this->numTestsWidth . 'd / %' . + $this->numTestsWidth . 'd (%3s%%)', + $this->numTestsRun, + $this->numTests, + floor(($this->numTestsRun / $this->numTests) * 100) + ) ); $this->writeNewLine(); diff --git a/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php index 73f0383..2de7320 100644 --- a/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php +++ b/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php @@ -127,12 +127,12 @@ public static function run($test, array $arguments = array()) $aTestRunner = new PHPUnit_TextUI_TestRunner; return $aTestRunner->doRun( - $test, - $arguments + $test, + $arguments ); } else { throw new PHPUnit_Framework_Exception( - 'No test case or test suite found.' + 'No test case or test suite found.' ); } } @@ -203,9 +203,9 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) if (is_integer($arguments['repeat'])) { $test = new PHPUnit_Extensions_RepeatedTest( - $suite, - $arguments['repeat'], - $arguments['processIsolation'] + $suite, + $arguments['repeat'], + $arguments['processIsolation'] ); $suite = new PHPUnit_Framework_TestSuite(); @@ -273,17 +273,17 @@ class_exists($arguments['printer'], false)) { if (!$this->printer instanceof PHPUnit_Util_Log_TAP) { $this->printer->write( - PHPUnit_Runner_Version::getVersionString() . "\n\n" + PHPUnit_Runner_Version::getVersionString() . "\n\n" ); self::$versionStringPrinted = true; if (isset($arguments['configuration'])) { $this->printer->write( - sprintf( - "Configuration read from %s\n\n", - $arguments['configuration']->getFilename() - ) + sprintf( + "Configuration read from %s\n\n", + $arguments['configuration']->getFilename() + ) ); } } @@ -294,23 +294,19 @@ class_exists($arguments['printer'], false)) { $result->addListener($this->printer); - if ($this->printer instanceof PHPUnit_TextUI_ResultPrinter) { - $result->addListener(new PHPUnit_Util_DeprecatedFeature_Logger); - } - if (isset($arguments['testdoxHTMLFile'])) { $result->addListener( - new PHPUnit_Util_TestDox_ResultPrinter_HTML( - $arguments['testdoxHTMLFile'] - ) + new PHPUnit_Util_TestDox_ResultPrinter_HTML( + $arguments['testdoxHTMLFile'] + ) ); } if (isset($arguments['testdoxTextFile'])) { $result->addListener( - new PHPUnit_Util_TestDox_ResultPrinter_Text( - $arguments['testdoxTextFile'] - ) + new PHPUnit_Util_TestDox_ResultPrinter_Text( + $arguments['testdoxTextFile'] + ) ); } @@ -356,30 +352,30 @@ class_exists($arguments['printer'], false)) { if ($codeCoverageReports > 0) { $codeCoverage = new PHP_CodeCoverage( - null, $this->codeCoverageFilter + null, $this->codeCoverageFilter ); $codeCoverage->setAddUncoveredFilesFromWhitelist( - $arguments['addUncoveredFilesFromWhitelist'] + $arguments['addUncoveredFilesFromWhitelist'] ); $codeCoverage->setCheckForUnintentionallyCoveredCode( - $arguments['strictCoverage'] + $arguments['strictCoverage'] ); $codeCoverage->setProcessUncoveredFilesFromWhitelist( - $arguments['processUncoveredFilesFromWhitelist'] + $arguments['processUncoveredFilesFromWhitelist'] ); if (isset($arguments['forceCoversAnnotation'])) { $codeCoverage->setForceCoversAnnotation( - $arguments['forceCoversAnnotation'] + $arguments['forceCoversAnnotation'] ); } if (isset($arguments['mapTestClassNameToCoveredClassName'])) { $codeCoverage->setMapTestClassNameToCoveredClassName( - $arguments['mapTestClassNameToCoveredClassName'] + $arguments['mapTestClassNameToCoveredClassName'] ); } @@ -394,26 +390,27 @@ class_exists($arguments['printer'], false)) { if (isset($arguments['jsonLogfile'])) { $result->addListener( - new PHPUnit_Util_Log_JSON($arguments['jsonLogfile']) + new PHPUnit_Util_Log_JSON($arguments['jsonLogfile']) ); } if (isset($arguments['tapLogfile'])) { $result->addListener( - new PHPUnit_Util_Log_TAP($arguments['tapLogfile']) + new PHPUnit_Util_Log_TAP($arguments['tapLogfile']) ); } if (isset($arguments['junitLogfile'])) { $result->addListener( - new PHPUnit_Util_Log_JUnit( - $arguments['junitLogfile'], $arguments['logIncompleteSkipped'] - ) + new PHPUnit_Util_Log_JUnit( + $arguments['junitLogfile'], $arguments['logIncompleteSkipped'] + ) ); } $result->beStrictAboutTestsThatDoNotTestAnything($arguments['reportUselessTests']); $result->beStrictAboutOutputDuringTests($arguments['disallowTestOutput']); + $result->beStrictAboutTodoAnnotatedTests($arguments['disallowTodoAnnotatedTests']); $result->beStrictAboutTestSize($arguments['enforceTimeLimit']); $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']); $result->setTimeoutForMediumTests($arguments['timeoutForMediumTests']); @@ -435,7 +432,7 @@ class_exists($arguments['printer'], false)) { if (isset($codeCoverage)) { if (isset($arguments['coverageClover'])) { $this->printer->write( - "\nGenerating code coverage report in Clover XML format ..." + "\nGenerating code coverage report in Clover XML format ..." ); $writer = new PHP_CodeCoverage_Report_Clover; @@ -447,7 +444,7 @@ class_exists($arguments['printer'], false)) { if (isset($arguments['coverageCrap4J'])) { $this->printer->write( - "\nGenerating Crap4J report XML file ..." + "\nGenerating Crap4J report XML file ..." ); $writer = new PHP_CodeCoverage_Report_Crap4j; @@ -459,16 +456,16 @@ class_exists($arguments['printer'], false)) { if (isset($arguments['coverageHtml'])) { $this->printer->write( - "\nGenerating code coverage report in HTML format ..." + "\nGenerating code coverage report in HTML format ..." ); $writer = new PHP_CodeCoverage_Report_HTML( - $arguments['reportLowUpperBound'], - $arguments['reportHighLowerBound'], - sprintf( - ' and PHPUnit %s', - PHPUnit_Runner_Version::id() - ) + $arguments['reportLowUpperBound'], + $arguments['reportHighLowerBound'], + sprintf( + ' and PHPUnit %s', + PHPUnit_Runner_Version::id() + ) ); $writer->process($codeCoverage, $arguments['coverageHtml']); @@ -479,7 +476,7 @@ class_exists($arguments['printer'], false)) { if (isset($arguments['coveragePHP'])) { $this->printer->write( - "\nGenerating code coverage report in PHP format ..." + "\nGenerating code coverage report in PHP format ..." ); $writer = new PHP_CodeCoverage_Report_PHP; @@ -499,20 +496,20 @@ class_exists($arguments['printer'], false)) { } $processor = new PHP_CodeCoverage_Report_Text( - $arguments['reportLowUpperBound'], - $arguments['reportHighLowerBound'], - $arguments['coverageTextShowUncoveredFiles'], - $arguments['coverageTextShowOnlySummary'] + $arguments['reportLowUpperBound'], + $arguments['reportHighLowerBound'], + $arguments['coverageTextShowUncoveredFiles'], + $arguments['coverageTextShowOnlySummary'] ); $outputStream->write( - $processor->process($codeCoverage, $colors) + $processor->process($codeCoverage, $colors) ); } if (isset($arguments['coverageXml'])) { $this->printer->write( - "\nGenerating code coverage report in PHPUnit XML format ..." + "\nGenerating code coverage report in PHPUnit XML format ..." ); $writer = new PHP_CodeCoverage_Report_XML; @@ -542,8 +539,7 @@ public function setPrinter(PHPUnit_TextUI_ResultPrinter $resultPrinter) */ protected function runFailed($message) { - self::printVersionString(); - self::write($message . PHP_EOL); + $this->write($message . PHP_EOL); exit(self::FAILURE_EXIT); } @@ -551,13 +547,17 @@ protected function runFailed($message) * @param string $buffer * @since Method available since Release 3.1.0 */ - protected static function write($buffer) + protected function write($buffer) { if (PHP_SAPI != 'cli') { $buffer = htmlspecialchars($buffer); } - print $buffer; + if ($this->printer !== null) { + $this->printer->write($buffer); + } else { + print $buffer; + } } /** @@ -576,26 +576,6 @@ public function getLoader() } /** - */ - public static function showError($message) - { - self::printVersionString(); - self::write($message . "\n"); - - exit(self::FAILURE_EXIT); - } - - /** - */ - public static function printVersionString() - { - if (!self::$versionStringPrinted) { - self::write(PHPUnit_Runner_Version::getVersionString() . "\n\n"); - self::$versionStringPrinted = true; - } - } - - /** * @param array $arguments * @since Method available since Release 3.2.1 */ @@ -604,7 +584,7 @@ protected function handleConfiguration(array &$arguments) if (isset($arguments['configuration']) && !$arguments['configuration'] instanceof PHPUnit_Util_Configuration) { $arguments['configuration'] = PHPUnit_Util_Configuration::getInstance( - $arguments['configuration'] + $arguments['configuration'] ); } @@ -702,6 +682,11 @@ protected function handleConfiguration(array &$arguments) $arguments['enforceTimeLimit'] = $phpunitConfiguration['enforceTimeLimit']; } + if (isset($phpunitConfiguration['disallowTodoAnnotatedTests']) && + !isset($arguments['disallowTodoAnnotatedTests'])) { + $arguments['disallowTodoAnnotatedTests'] = $phpunitConfiguration['disallowTodoAnnotatedTests']; + } + if (isset($phpunitConfiguration['verbose']) && !isset($arguments['verbose'])) { $arguments['verbose'] = $phpunitConfiguration['verbose']; @@ -745,11 +730,11 @@ protected function handleConfiguration(array &$arguments) $listener = new $listener['class']; } else { $listenerClass = new ReflectionClass( - $listener['class'] - ); + $listener['class'] + ); $listener = $listenerClass->newInstanceArgs( - $listener['arguments'] - ); + $listener['arguments'] + ); } if ($listener instanceof PHPUnit_Framework_TestListener) { @@ -817,7 +802,7 @@ protected function handleConfiguration(array &$arguments) if (isset($loggingConfiguration['plain'])) { $arguments['listeners'][] = new PHPUnit_TextUI_ResultPrinter( - $loggingConfiguration['plain'], true + $loggingConfiguration['plain'], true ); } @@ -852,7 +837,6 @@ protected function handleConfiguration(array &$arguments) isset($arguments['coveragePHP'])) || isset($arguments['coverageText']) && $this->canCollectCodeCoverage) { - $filterConfiguration = $arguments['configuration']->getFilterConfiguration(); $arguments['addUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['addUncoveredFilesFromWhitelist']; $arguments['processUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['processUncoveredFilesFromWhitelist']; @@ -892,7 +876,7 @@ protected function handleConfiguration(array &$arguments) foreach ($filterConfiguration['whitelist']['include']['directory'] as $dir) { $this->codeCoverageFilter->addDirectoryToWhitelist( - $dir['path'], $dir['suffix'], $dir['prefix'] + $dir['path'], $dir['suffix'], $dir['prefix'] ); } @@ -902,7 +886,7 @@ protected function handleConfiguration(array &$arguments) foreach ($filterConfiguration['whitelist']['exclude']['directory'] as $dir) { $this->codeCoverageFilter->removeDirectoryFromWhitelist( - $dir['path'], $dir['suffix'], $dir['prefix'] + $dir['path'], $dir['suffix'], $dir['prefix'] ); } @@ -940,10 +924,12 @@ protected function handleConfiguration(array &$arguments) $arguments['strictCoverage'] = isset($arguments['strictCoverage']) ? $arguments['strictCoverage'] : false; $arguments['disallowTestOutput'] = isset($arguments['disallowTestOutput']) ? $arguments['disallowTestOutput'] : false; $arguments['enforceTimeLimit'] = isset($arguments['enforceTimeLimit']) ? $arguments['enforceTimeLimit'] : false; + $arguments['disallowTodoAnnotatedTests'] = isset($arguments['disallowTodoAnnotatedTests']) ? $arguments['disallowTodoAnnotatedTests'] : false; $arguments['verbose'] = isset($arguments['verbose']) ? $arguments['verbose'] : false; } /** + * @param $extension * @param string $message * @since Method available since Release 4.0.0 */ @@ -958,7 +944,7 @@ private function showExtensionNotLoadedMessage($extension, $message = '') } $this->showMessage( - 'The ' . $extension . ' extension is not loaded.' . $message . "\n" + 'The ' . $extension . ' extension is not loaded.' . $message . "\n" ); $this->missingExtensions[$extension] = true; @@ -973,7 +959,6 @@ private function showExtensionNotLoadedMessage($extension, $message = '') */ private function showMessage($message, $exit = false) { - $this->printVersionString(); $this->write($message . "\n"); if ($exit) { diff --git a/core/vendor/phpunit/phpunit/src/Util/Blacklist.php b/core/vendor/phpunit/phpunit/src/Util/Blacklist.php index 40f9788..ab93621 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Blacklist.php +++ b/core/vendor/phpunit/phpunit/src/Util/Blacklist.php @@ -77,7 +77,9 @@ class PHPUnit_Util_Blacklist 'SebastianBergmann\Comparator\Comparator' => 1, 'SebastianBergmann\Exporter\Exporter' => 1, 'SebastianBergmann\Version' => 1, - 'Composer\Autoload\ClassLoader' => 1 + 'Composer\Autoload\ClassLoader' => 1, + 'Instantiator\Instantiator' => 1, + 'LazyMap\AbstractLazyMap' => 1 ); /** @@ -136,6 +138,15 @@ private function initialize() self::$directories[] = $directory; } - } + + // Hide process isolation workaround on Windows. + // @see PHPUnit_Util_PHP::factory() + // @see PHPUnit_Util_PHP_Windows::process() + if (DIRECTORY_SEPARATOR === '\\') { + // tempnam() prefix is limited to first 3 chars. + // @see http://php.net/manual/en/function.tempnam.php + self::$directories[] = sys_get_temp_dir() . '\\PHP'; + } + } } } diff --git a/core/vendor/phpunit/phpunit/src/Util/Configuration.php b/core/vendor/phpunit/phpunit/src/Util/Configuration.php index 844135a..9ddcfb8 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Configuration.php +++ b/core/vendor/phpunit/phpunit/src/Util/Configuration.php @@ -75,6 +75,7 @@ * beStrictAboutTestsThatDoNotTestAnything="false" * beStrictAboutOutputDuringTests="false" * beStrictAboutTestSize="false" + * beStrictAboutTodoAnnotatedTests="false" * checkForUnintentionallyCoveredCode="false" * verbose="false"> * @@ -193,7 +194,7 @@ class PHPUnit_Util_Configuration protected function __construct($filename) { $this->filename = $filename; - $this->document = PHPUnit_Util_XML::loadFile($filename, false, true); + $this->document = PHPUnit_Util_XML::loadFile($filename, false, true, true); $this->xpath = new DOMXPath($this->document); } @@ -217,10 +218,10 @@ public static function getInstance($filename) if ($realpath === false) { throw new PHPUnit_Framework_Exception( - sprintf( - 'Could not read "%s".', - $filename - ) + sprintf( + 'Could not read "%s".', + $filename + ) ); } @@ -258,19 +259,19 @@ public function getFilterConfiguration() if ($tmp->length == 1) { if ($tmp->item(0)->hasAttribute('addUncoveredFilesFromWhitelist')) { $addUncoveredFilesFromWhitelist = $this->getBoolean( - (string) $tmp->item(0)->getAttribute( - 'addUncoveredFilesFromWhitelist' - ), - true + (string) $tmp->item(0)->getAttribute( + 'addUncoveredFilesFromWhitelist' + ), + true ); } if ($tmp->item(0)->hasAttribute('processUncoveredFilesFromWhitelist')) { $processUncoveredFilesFromWhitelist = $this->getBoolean( - (string) $tmp->item(0)->getAttribute( - 'processUncoveredFilesFromWhitelist' - ), - false + (string) $tmp->item(0)->getAttribute( + 'processUncoveredFilesFromWhitelist' + ), + false ); } } @@ -279,18 +280,18 @@ public function getFilterConfiguration() 'blacklist' => array( 'include' => array( 'directory' => $this->readFilterDirectories( - 'filter/blacklist/directory' + 'filter/blacklist/directory' ), 'file' => $this->readFilterFiles( - 'filter/blacklist/file' + 'filter/blacklist/file' ) ), 'exclude' => array( 'directory' => $this->readFilterDirectories( - 'filter/blacklist/exclude/directory' - ), + 'filter/blacklist/exclude/directory' + ), 'file' => $this->readFilterFiles( - 'filter/blacklist/exclude/file' + 'filter/blacklist/exclude/file' ) ) ), @@ -299,18 +300,18 @@ public function getFilterConfiguration() 'processUncoveredFilesFromWhitelist' => $processUncoveredFilesFromWhitelist, 'include' => array( 'directory' => $this->readFilterDirectories( - 'filter/whitelist/directory' + 'filter/whitelist/directory' ), 'file' => $this->readFilterFiles( - 'filter/whitelist/file' + 'filter/whitelist/file' ) ), 'exclude' => array( 'directory' => $this->readFilterDirectories( - 'filter/whitelist/exclude/directory' + 'filter/whitelist/exclude/directory' ), 'file' => $this->readFilterFiles( - 'filter/whitelist/exclude/file' + 'filter/whitelist/exclude/file' ) ) ) @@ -358,23 +359,23 @@ public function getListenerConfiguration() if ($listener->getAttribute('file')) { $file = $this->toAbsolutePath( - (string) $listener->getAttribute('file'), true + (string) $listener->getAttribute('file'), true ); } foreach ($listener->childNodes as $node) { - if ($node instanceof DOMElement && $node->tagName == 'arguments') { - foreach ($node->childNodes as $argument) { - if ($argument instanceof DOMElement) { - if ($argument->tagName == 'file' || + if ($node instanceof DOMElement && $node->tagName == 'arguments') { + foreach ($node->childNodes as $argument) { + if ($argument instanceof DOMElement) { + if ($argument->tagName == 'file' || $argument->tagName == 'directory') { - $arguments[] = $this->toAbsolutePath((string) $argument->nodeValue); - } else { - $arguments[] = PHPUnit_Util_XML::xmlToVariable($argument); + $arguments[] = $this->toAbsolutePath((string) $argument->nodeValue); + } else { + $arguments[] = PHPUnit_Util_XML::xmlToVariable($argument); + } } } } - } } $result[] = array( @@ -417,21 +418,21 @@ public function getLoggingConfiguration() } elseif ($type == 'junit') { if ($log->hasAttribute('logIncompleteSkipped')) { $result['logIncompleteSkipped'] = $this->getBoolean( - (string) $log->getAttribute('logIncompleteSkipped'), - false + (string) $log->getAttribute('logIncompleteSkipped'), + false ); } } elseif ($type == 'coverage-text') { if ($log->hasAttribute('showUncoveredFiles')) { $result['coverageTextShowUncoveredFiles'] = $this->getBoolean( - (string) $log->getAttribute('showUncoveredFiles'), - false + (string) $log->getAttribute('showUncoveredFiles'), + false ); } if ($log->hasAttribute('showOnlySummary')) { $result['coverageTextShowOnlySummary'] = $this->getBoolean( - (string) $log->getAttribute('showOnlySummary'), - false + (string) $log->getAttribute('showOnlySummary'), + false ); } } @@ -508,10 +509,10 @@ public function handlePHPConfiguration() if (! empty($configuration['include_path'])) { ini_set( - 'include_path', - implode(PATH_SEPARATOR, $configuration['include_path']) . - PATH_SEPARATOR . - ini_get('include_path') + 'include_path', + implode(PATH_SEPARATOR, $configuration['include_path']) . + PATH_SEPARATOR . + ini_get('include_path') ); } @@ -573,13 +574,13 @@ public function getPHPUnitConfiguration() if ($root->hasAttribute('cacheTokens')) { $result['cacheTokens'] = $this->getBoolean( - (string) $root->getAttribute('cacheTokens'), false + (string) $root->getAttribute('cacheTokens'), false ); } if ($root->hasAttribute('colors')) { $result['colors'] = $this->getBoolean( - (string) $root->getAttribute('colors'), false + (string) $root->getAttribute('colors'), false ); } @@ -588,134 +589,134 @@ public function getPHPUnitConfiguration() */ if ($root->hasAttribute('stderr')) { $result['stderr'] = $this->getBoolean( - (string)$root->getAttribute('stderr'), FALSE + (string)$root->getAttribute('stderr'), false ); } if ($root->hasAttribute('backupGlobals')) { $result['backupGlobals'] = $this->getBoolean( - (string) $root->getAttribute('backupGlobals'), true + (string) $root->getAttribute('backupGlobals'), true ); } if ($root->hasAttribute('backupStaticAttributes')) { $result['backupStaticAttributes'] = $this->getBoolean( - (string) $root->getAttribute('backupStaticAttributes'), false + (string) $root->getAttribute('backupStaticAttributes'), false ); } if ($root->getAttribute('bootstrap')) { $result['bootstrap'] = $this->toAbsolutePath( - (string) $root->getAttribute('bootstrap') + (string) $root->getAttribute('bootstrap') ); } if ($root->hasAttribute('convertErrorsToExceptions')) { $result['convertErrorsToExceptions'] = $this->getBoolean( - (string) $root->getAttribute('convertErrorsToExceptions'), true + (string) $root->getAttribute('convertErrorsToExceptions'), true ); } if ($root->hasAttribute('convertNoticesToExceptions')) { $result['convertNoticesToExceptions'] = $this->getBoolean( - (string) $root->getAttribute('convertNoticesToExceptions'), true + (string) $root->getAttribute('convertNoticesToExceptions'), true ); } if ($root->hasAttribute('convertWarningsToExceptions')) { $result['convertWarningsToExceptions'] = $this->getBoolean( - (string) $root->getAttribute('convertWarningsToExceptions'), true + (string) $root->getAttribute('convertWarningsToExceptions'), true ); } if ($root->hasAttribute('forceCoversAnnotation')) { $result['forceCoversAnnotation'] = $this->getBoolean( - (string) $root->getAttribute('forceCoversAnnotation'), false + (string) $root->getAttribute('forceCoversAnnotation'), false ); } if ($root->hasAttribute('mapTestClassNameToCoveredClassName')) { $result['mapTestClassNameToCoveredClassName'] = $this->getBoolean( - (string) $root->getAttribute('mapTestClassNameToCoveredClassName'), - false + (string) $root->getAttribute('mapTestClassNameToCoveredClassName'), + false ); } if ($root->hasAttribute('processIsolation')) { $result['processIsolation'] = $this->getBoolean( - (string) $root->getAttribute('processIsolation'), false + (string) $root->getAttribute('processIsolation'), false ); } if ($root->hasAttribute('stopOnError')) { $result['stopOnError'] = $this->getBoolean( - (string) $root->getAttribute('stopOnError'), false + (string) $root->getAttribute('stopOnError'), false ); } if ($root->hasAttribute('stopOnFailure')) { $result['stopOnFailure'] = $this->getBoolean( - (string) $root->getAttribute('stopOnFailure'), false + (string) $root->getAttribute('stopOnFailure'), false ); } if ($root->hasAttribute('stopOnIncomplete')) { $result['stopOnIncomplete'] = $this->getBoolean( - (string) $root->getAttribute('stopOnIncomplete'), false + (string) $root->getAttribute('stopOnIncomplete'), false ); } if ($root->hasAttribute('stopOnRisky')) { $result['stopOnRisky'] = $this->getBoolean( - (string) $root->getAttribute('stopOnRisky'), false + (string) $root->getAttribute('stopOnRisky'), false ); } if ($root->hasAttribute('stopOnSkipped')) { $result['stopOnSkipped'] = $this->getBoolean( - (string) $root->getAttribute('stopOnSkipped'), false + (string) $root->getAttribute('stopOnSkipped'), false ); } if ($root->hasAttribute('testSuiteLoaderClass')) { $result['testSuiteLoaderClass'] = (string) $root->getAttribute( - 'testSuiteLoaderClass' + 'testSuiteLoaderClass' ); } if ($root->getAttribute('testSuiteLoaderFile')) { $result['testSuiteLoaderFile'] = $this->toAbsolutePath( - (string) $root->getAttribute('testSuiteLoaderFile') + (string) $root->getAttribute('testSuiteLoaderFile') ); } if ($root->hasAttribute('printerClass')) { $result['printerClass'] = (string) $root->getAttribute( - 'printerClass' + 'printerClass' ); } if ($root->getAttribute('printerFile')) { $result['printerFile'] = $this->toAbsolutePath( - (string) $root->getAttribute('printerFile') + (string) $root->getAttribute('printerFile') ); } if ($root->hasAttribute('timeoutForSmallTests')) { $result['timeoutForSmallTests'] = $this->getInteger( - (string) $root->getAttribute('timeoutForSmallTests'), 1 + (string) $root->getAttribute('timeoutForSmallTests'), 1 ); } if ($root->hasAttribute('timeoutForMediumTests')) { $result['timeoutForMediumTests'] = $this->getInteger( - (string) $root->getAttribute('timeoutForMediumTests'), 10 + (string) $root->getAttribute('timeoutForMediumTests'), 10 ); } if ($root->hasAttribute('timeoutForLargeTests')) { $result['timeoutForLargeTests'] = $this->getInteger( - (string) $root->getAttribute('timeoutForLargeTests'), 60 + (string) $root->getAttribute('timeoutForLargeTests'), 60 ); } @@ -743,20 +744,27 @@ public function getPHPUnitConfiguration() ); } + if ($root->hasAttribute('beStrictAboutTodoAnnotatedTests')) { + $result['disallowTodoAnnotatedTests'] = $this->getBoolean( + (string) $root->getAttribute('beStrictAboutTodoAnnotatedTests'), false + ); + } + if ($root->hasAttribute('strict')) { $flag = $this->getBoolean( (string) $root->getAttribute('strict'), false ); - $result['reportUselessTests'] = $flag; - $result['strictCoverage'] = $flag; - $result['disallowTestOutput'] = $flag; - $result['enforceTimeLimit'] = $flag; + $result['reportUselessTests'] = $flag; + $result['strictCoverage'] = $flag; + $result['disallowTestOutput'] = $flag; + $result['enforceTimeLimit'] = $flag; + $result['disallowTodoAnnotatedTests'] = $flag; } if ($root->hasAttribute('verbose')) { $result['verbose'] = $this->getBoolean( - (string) $root->getAttribute('verbose'), false + (string) $root->getAttribute('verbose'), false ); } @@ -785,7 +793,7 @@ public function getSeleniumBrowserConfiguration() if ($config->hasAttribute('port')) { $port = $this->getInteger( - (string) $config->getAttribute('port'), 4444 + (string) $config->getAttribute('port'), 4444 ); } else { $port = 4444; @@ -793,7 +801,7 @@ public function getSeleniumBrowserConfiguration() if ($config->hasAttribute('timeout')) { $timeout = $this->getInteger( - (string) $config->getAttribute('timeout'), 30000 + (string) $config->getAttribute('timeout'), 30000 ); } else { $timeout = 30000; @@ -817,7 +825,7 @@ public function getSeleniumBrowserConfiguration() * @return PHPUnit_Framework_TestSuite * @since Method available since Release 3.2.1 */ - public function getTestSuiteConfiguration($testSuiteFilter=null) + public function getTestSuiteConfiguration($testSuiteFilter = null) { $testSuiteNodes = $this->xpath->query('testsuites/testsuite'); @@ -834,7 +842,7 @@ public function getTestSuiteConfiguration($testSuiteFilter=null) foreach ($testSuiteNodes as $testSuiteNode) { $suite->addTestSuite( - $this->getTestSuite($testSuiteNode, $testSuiteFilter) + $this->getTestSuite($testSuiteNode, $testSuiteFilter) ); } @@ -847,11 +855,11 @@ public function getTestSuiteConfiguration($testSuiteFilter=null) * @return PHPUnit_Framework_TestSuite * @since Method available since Release 3.4.0 */ - protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null) + protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter = null) { if ($testSuiteNode->hasAttribute('name')) { $suite = new PHPUnit_Framework_TestSuite( - (string) $testSuiteNode->getAttribute('name') + (string) $testSuiteNode->getAttribute('name') ); } else { $suite = new PHPUnit_Framework_TestSuite; @@ -908,10 +916,10 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null } $files = $fileIteratorFacade->getFilesAsArray( - $this->toAbsolutePath($directory), - $suffix, - $prefix, - $exclude + $this->toAbsolutePath($directory), + $suffix, + $prefix, + $exclude ); $suite->addTestFiles($files); } @@ -929,7 +937,7 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null // Get the absolute path to the file $file = $fileIteratorFacade->getFilesAsArray( - $this->toAbsolutePath($file) + $this->toAbsolutePath($file) ); if (!isset($file[0])) { diff --git a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php deleted file mode 100644 index 637feb3..0000000 --- a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php +++ /dev/null @@ -1,108 +0,0 @@ -. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package PHPUnit - * @subpackage Framework - * @author Ralph Schindler - * @author Sebastian Bergmann - * @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.5.7 - */ - -/** - * Class to hold the information about a deprecated feature that was used - * - * @package PHPUnit - * @subpackage Framework - * @author Ralph Schindler - * @author Sebastian Bergmann - * @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 Interface available since Release 3.5.7 - */ -class PHPUnit_Util_DeprecatedFeature -{ - /** - * @var array - */ - protected $traceInfo = array(); - - /** - * @var string - */ - protected $message = null; - - /** - * @param string $message - * @param array $traceInfo - */ - public function __construct($message, array $traceInfo = array()) - { - $this->message = $message; - $this->traceInfo = $traceInfo; - } - - /** - * @return string - * @since Method available since Release 4.0.0 - */ - public function getMessage() - { - return $this->message; - } - - /** - * @return string - * @since Method available since Release 4.0.0 - */ - public function getSource() - { - $source = ''; - - if (isset($this->traceInfo['file'])) { - $source .= $this->traceInfo['file']; - - if (isset($this->traceInfo['line'])) { - $source .= ':' . $this->traceInfo['line']; - } - } - - return $source; - } -} diff --git a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php deleted file mode 100644 index d77a87a..0000000 --- a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php +++ /dev/null @@ -1,212 +0,0 @@ -. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package PHPUnit - * @subpackage Framework - * @author Ralph Schindler - * @author Sebastian Bergmann - * @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.5.7 - */ - -/** - * Test Listener that tracks the usage of deprecated features. - * - * @package PHPUnit - * @subpackage Framework - * @author Ralph Schindler - * @author Sebastian Bergmann - * @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 Class available since Release 3.5.7 - */ -class PHPUnit_Util_DeprecatedFeature_Logger implements PHPUnit_Framework_TestListener -{ - /** - * @var PHPUnit_Framework_TestCase - */ - protected static $currentTest = null; - - /** - * This is the publicly accessible API for notifying the system that a - * deprecated feature has been used. - * - * If it is run via a TestRunner and the test extends - * PHPUnit_Framework_TestCase, then this will inject the result into the - * test runner for display, if not, it will throw the notice to STDERR. - * - * @param string $message - * @param int|bool $backtraceDepth - */ - public static function log($message, $backtraceDepth = 2) - { - if ($backtraceDepth !== false) { - $trace = debug_backtrace(false); - - if (is_int($backtraceDepth)) { - $traceItem = $trace[$backtraceDepth]; - } - - if (!isset($traceItem['file'])) { - $reflectionClass = new ReflectionClass($traceItem['class']); - $traceItem['file'] = $reflectionClass->getFileName(); - } - - if (!isset($traceItem['line']) && - isset($traceItem['class']) && - isset($traceItem['function'])) { - if (!isset($reflectionClass)) { - $reflectionClass = new ReflectionClass($traceItem['class']); - } - - $method = $reflectionClass->getMethod($traceItem['function']); - $traceItem['line'] = $method->getStartLine() . '-' . $method->getEndLine(); - } - } - - $deprecatedFeature = new PHPUnit_Util_DeprecatedFeature( - $message, $traceItem - ); - - if (self::$currentTest instanceof PHPUnit_Framework_TestCase) { - $result = self::$currentTest->getTestResultObject(); - $result->addDeprecatedFeature($deprecatedFeature); - } else { - file_put_contents('php://stderr', $deprecatedFeature); - } - } - - /** - * An error occurred. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - */ - public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - /** - * A failure occurred. - * - * @param PHPUnit_Framework_Test $test - * @param PHPUnit_Framework_AssertionFailedError $e - * @param float $time - */ - public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) - { - } - - /** - * Incomplete test. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - */ - public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - /** - * Risky test. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - * @since Method available since Release 4.0.0 - */ - public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - /** - * Skipped test. - * - * @param PHPUnit_Framework_Test $test - * @param Exception $e - * @param float $time - * @since Method available since Release 3.0.0 - */ - public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) - { - } - - /** - * A test suite started. - * - * @param PHPUnit_Framework_TestSuite $suite - * @since Method available since Release 2.2.0 - */ - public function startTestSuite(PHPUnit_Framework_TestSuite $suite) - { - } - - /** - * A test suite ended. - * - * @param PHPUnit_Framework_TestSuite $suite - * @since Method available since Release 2.2.0 - */ - public function endTestSuite(PHPUnit_Framework_TestSuite $suite) - { - } - - /** - * A test started. - * - * @param PHPUnit_Framework_Test $test - */ - public function startTest(PHPUnit_Framework_Test $test) - { - self::$currentTest = $test; - } - - /** - * A test ended. - * - * @param PHPUnit_Framework_Test $test - * @param float $time - */ - public function endTest(PHPUnit_Framework_Test $test, $time) - { - self::$currentTest = null; - } -} diff --git a/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php b/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php index c97ad09..6d62ef8 100644 --- a/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php +++ b/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php @@ -123,4 +123,34 @@ public static function handleError($errno, $errstr, $errfile, $errline) throw new $exception($errstr, $errno, $errfile, $errline); } + + /** + * Registers a one time self-destructing error handler + * @param integer $severity PHP predefined error constant + * @link http://www.php.net/manual/en/errorfunc.constants.php + * @throws Exception if event of specified severity is emitted + */ + public static function handleErrorOnce($severity = E_WARNING) + { + $terminator = function () { + static $expired = false; + if (!$expired) { + $expired = true; + // cleans temporary error handler + return restore_error_handler(); + } + }; + + set_error_handler(function ($errno, $errstr) use ($severity, $terminator) { + if ($errno === $severity) { + $terminator(); // bye + + return; + } + + return false; + }); + + return $terminator; + } } diff --git a/core/vendor/phpunit/phpunit/src/Util/Fileloader.php b/core/vendor/phpunit/phpunit/src/Util/Fileloader.php index e2dcb52..2e7a747 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Fileloader.php +++ b/core/vendor/phpunit/phpunit/src/Util/Fileloader.php @@ -70,7 +70,7 @@ public static function checkAndLoad($filename) if (!$includePathFilename || !is_readable($includePathFilename)) { throw new PHPUnit_Framework_Exception( - sprintf('Cannot open file "%s".' . "\n", $filename) + sprintf('Cannot open file "%s".' . "\n", $filename) ); } @@ -94,8 +94,8 @@ public static function load($filename) $newVariables = get_defined_vars(); $newVariableNames = array_diff( - array_keys($newVariables), $oldVariableNames - ); + array_keys($newVariables), $oldVariableNames + ); foreach ($newVariableNames as $variableName) { if ($variableName != 'oldVariableNames') { diff --git a/core/vendor/phpunit/phpunit/src/Util/Filesystem.php b/core/vendor/phpunit/phpunit/src/Util/Filesystem.php index d5f8fee..55f6071 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Filesystem.php +++ b/core/vendor/phpunit/phpunit/src/Util/Filesystem.php @@ -73,9 +73,9 @@ class PHPUnit_Util_Filesystem public static function classNameToFilename($className) { return str_replace( - array('_', '\\'), - DIRECTORY_SEPARATOR, - $className + array('_', '\\'), + DIRECTORY_SEPARATOR, + $className ) . '.php'; } } diff --git a/core/vendor/phpunit/phpunit/src/Util/Filter.php b/core/vendor/phpunit/phpunit/src/Util/Filter.php index b36ce7d..0cf2875 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Filter.php +++ b/core/vendor/phpunit/phpunit/src/Util/Filter.php @@ -94,7 +94,7 @@ public static function getFilteredStacktrace(Exception $e, $asString = true) if (!self::frameExists($eTrace, $eFile, $eLine)) { array_unshift( - $eTrace, array('file' => $eFile, 'line' => $eLine) + $eTrace, array('file' => $eFile, 'line' => $eLine) ); } @@ -107,10 +107,9 @@ public static function getFilteredStacktrace(Exception $e, $asString = true) $frame['file'] !== $script) { if ($asString === true) { $filteredStacktrace .= sprintf( - "%s:%s\n", - - $frame['file'], - isset($frame['line']) ? $frame['line'] : '?' + "%s:%s\n", + $frame['file'], + isset($frame['line']) ? $frame['line'] : '?' ); } else { $filteredStacktrace[] = $frame; diff --git a/core/vendor/phpunit/phpunit/src/Util/Getopt.php b/core/vendor/phpunit/phpunit/src/Util/Getopt.php index 0606406..8009710 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Getopt.php +++ b/core/vendor/phpunit/phpunit/src/Util/Getopt.php @@ -93,11 +93,11 @@ public static function getopt(array $args, $short_options, $long_options = null) break; } elseif (strlen($arg) > 1 && $arg[1] == '-') { self::parseLongOption( - substr($arg, 2), $long_options, $opts, $args + substr($arg, 2), $long_options, $opts, $args ); } else { self::parseShortOption( - substr($arg, 1), $short_options, $opts, $args + substr($arg, 1), $short_options, $opts, $args ); } } @@ -116,7 +116,7 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args) if (($spec = strstr($short_options, $opt)) === false || $arg[$i] == ':') { throw new PHPUnit_Framework_Exception( - "unrecognized option -- $opt" + "unrecognized option -- $opt" ); } @@ -133,7 +133,7 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args) } elseif (list(, $opt_arg) = each($args)) { } else { throw new PHPUnit_Framework_Exception( - "option requires an argument -- $opt" + "option requires an argument -- $opt" ); } } @@ -169,7 +169,7 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args) if ($opt_rest != '' && $opt[0] != '=' && $i + 1 < $count && $opt == substr($long_options[$i+1], 0, $opt_len)) { throw new PHPUnit_Framework_Exception( - "option --$opt is ambiguous" + "option --$opt is ambiguous" ); } @@ -178,17 +178,18 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args) if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) { throw new PHPUnit_Framework_Exception( - "option --$opt requires an argument" + "option --$opt requires an argument" ); } } } elseif ($opt_arg) { throw new PHPUnit_Framework_Exception( - "option --$opt doesn't allow an argument" + "option --$opt doesn't allow an argument" ); } - $opts[] = array('--' . $opt, $opt_arg); + $full_option = '--' . preg_replace('/={1,2}$/', '', $long_opt); + $opts[] = array($full_option, $opt_arg); return; } diff --git a/core/vendor/phpunit/phpunit/src/Util/GlobalState.php b/core/vendor/phpunit/phpunit/src/Util/GlobalState.php index ab7b72b..1deecc2 100644 --- a/core/vendor/phpunit/phpunit/src/Util/GlobalState.php +++ b/core/vendor/phpunit/phpunit/src/Util/GlobalState.php @@ -116,7 +116,7 @@ public static function restoreGlobals(array $blacklist) { if (ini_get('register_long_arrays') == '1') { $superGlobalArrays = array_merge( - self::$superGlobalArrays, self::$superGlobalArraysLong + self::$superGlobalArrays, self::$superGlobalArraysLong ); } else { $superGlobalArrays = self::$superGlobalArrays; @@ -134,7 +134,7 @@ public static function restoreGlobals(array $blacklist) !in_array($key, $blacklist)) { if (isset(self::$globals['GLOBALS'][$key])) { $GLOBALS[$key] = unserialize( - self::$globals['GLOBALS'][$key] + self::$globals['GLOBALS'][$key] ); } else { unset($GLOBALS[$key]); @@ -163,15 +163,15 @@ protected static function restoreSuperGlobalArray($superGlobalArray) is_array($GLOBALS[$superGlobalArray]) && isset(self::$globals[$superGlobalArray])) { $keys = array_keys( - array_merge( - $GLOBALS[$superGlobalArray], self::$globals[$superGlobalArray] - ) + array_merge( + $GLOBALS[$superGlobalArray], self::$globals[$superGlobalArray] + ) ); foreach ($keys as $key) { if (isset(self::$globals[$superGlobalArray][$key])) { $GLOBALS[$superGlobalArray][$key] = unserialize( - self::$globals[$superGlobalArray][$key] + self::$globals[$superGlobalArray][$key] ); } else { unset($GLOBALS[$superGlobalArray][$key]); @@ -215,9 +215,9 @@ public static function getIniSettingsAsString() foreach ($iniSettings as $key => $value) { $result .= sprintf( - '@ini_set(%s, %s);' . "\n", - self::exportVariable($key), - self::exportVariable($value) + '@ini_set(%s, %s);' . "\n", + self::exportVariable($key), + self::exportVariable($value) ); } @@ -232,10 +232,10 @@ public static function getConstantsAsString() if (isset($constants['user'])) { foreach ($constants['user'] as $name => $value) { $result .= sprintf( - 'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n", - $name, - $name, - self::exportVariable($value) + 'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n", + $name, + $name, + self::exportVariable($value) ); } } @@ -257,10 +257,10 @@ public static function getGlobalsAsString() } $result .= sprintf( - '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n", - $superGlobalArray, - $key, - self::exportVariable($GLOBALS[$superGlobalArray][$key]) + '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n", + $superGlobalArray, + $key, + self::exportVariable($GLOBALS[$superGlobalArray][$key]) ); } } @@ -272,9 +272,9 @@ public static function getGlobalsAsString() foreach (array_keys($GLOBALS) as $key) { if (!in_array($key, $blacklist) && !$GLOBALS[$key] instanceof Closure) { $result .= sprintf( - '$GLOBALS[\'%s\'] = %s;' . "\n", - $key, - self::exportVariable($GLOBALS[$key]) + '$GLOBALS[\'%s\'] = %s;' . "\n", + $key, + self::exportVariable($GLOBALS[$key]) ); } } @@ -286,7 +286,7 @@ protected static function getSuperGlobalArrays() { if (ini_get('register_long_arrays') == '1') { return array_merge( - self::$superGlobalArrays, self::$superGlobalArraysLong + self::$superGlobalArrays, self::$superGlobalArraysLong ); } else { return self::$superGlobalArrays; @@ -307,7 +307,9 @@ public static function backupStaticAttributes(array $blacklist) strpos($declaredClasses[$i], 'PHP_Timer') !== 0 && strpos($declaredClasses[$i], 'PHP_Token_Stream') !== 0 && strpos($declaredClasses[$i], 'Symfony') !== 0 && - strpos($declaredClasses[$i], 'Text_Template') !== 0) { + strpos($declaredClasses[$i], 'Text_Template') !== 0 && + strpos($declaredClasses[$i], 'Instantiator') !== 0 && + strpos($declaredClasses[$i], 'LazyMap') !== 0) { $class = new ReflectionClass($declaredClasses[$i]); if ($class->isSubclassOf('PHPUnit_Framework_Test')) { @@ -362,10 +364,9 @@ protected static function exportVariable($variable) (is_array($variable) && self::arrayOnlyContainsScalars($variable))) { return var_export($variable, true); } - - return 'unserialize(\'' . - str_replace("'", "\'", serialize($variable)) . - '\')'; + return 'unserialize(' . + var_export(serialize($variable), true) . + ')'; } protected static function arrayOnlyContainsScalars(array $array) diff --git a/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php b/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php index 94f3cf4..3872550 100644 --- a/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php +++ b/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php @@ -68,14 +68,14 @@ public static function factory($argument, $type, $value = null) $stack = debug_backtrace(false); return new PHPUnit_Framework_Exception( - sprintf( - 'Argument #%d%sof %s::%s() must be a %s', - $argument, - $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ', - $stack[1]['class'], - $stack[1]['function'], - $type - ) + sprintf( + 'Argument #%d%sof %s::%s() must be a %s', + $argument, + $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ', + $stack[1]['class'], + $stack[1]['function'], + $type + ) ); } } diff --git a/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php b/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php index dfb3163..899c889 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php +++ b/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php @@ -86,11 +86,11 @@ class PHPUnit_Util_Log_JSON extends PHPUnit_Util_Printer implements PHPUnit_Fram public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->writeCase( - 'error', - $time, - PHPUnit_Util_Filter::getFilteredStacktrace($e, false), - $e->getMessage(), - $test + 'error', + $time, + PHPUnit_Util_Filter::getFilteredStacktrace($e, false), + $e->getMessage(), + $test ); $this->currentTestPass = false; @@ -106,11 +106,11 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) { $this->writeCase( - 'fail', - $time, - PHPUnit_Util_Filter::getFilteredStacktrace($e, false), - $e->getMessage(), - $test + 'fail', + $time, + PHPUnit_Util_Filter::getFilteredStacktrace($e, false), + $e->getMessage(), + $test ); $this->currentTestPass = false; @@ -126,11 +126,11 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->writeCase( - 'error', - $time, - PHPUnit_Util_Filter::getFilteredStacktrace($e, false), - 'Incomplete Test: ' . $e->getMessage(), - $test + 'error', + $time, + PHPUnit_Util_Filter::getFilteredStacktrace($e, false), + 'Incomplete Test: ' . $e->getMessage(), + $test ); $this->currentTestPass = false; @@ -147,11 +147,11 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->writeCase( - 'error', - $time, - PHPUnit_Util_Filter::getFilteredStacktrace($e, false), - 'Risky Test: ' . $e->getMessage(), - $test + 'error', + $time, + PHPUnit_Util_Filter::getFilteredStacktrace($e, false), + 'Risky Test: ' . $e->getMessage(), + $test ); $this->currentTestPass = false; @@ -167,11 +167,11 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->writeCase( - 'error', - $time, - PHPUnit_Util_Filter::getFilteredStacktrace($e, false), - 'Skipped Test: ' . $e->getMessage(), - $test + 'error', + $time, + PHPUnit_Util_Filter::getFilteredStacktrace($e, false), + 'Skipped Test: ' . $e->getMessage(), + $test ); $this->currentTestPass = false; @@ -188,11 +188,11 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) $this->currentTestName = ''; $this->write( - array( + array( 'event' => 'suiteStart', 'suite' => $this->currentTestSuiteName, 'tests' => count($suite) - ) + ) ); } @@ -218,11 +218,11 @@ public function startTest(PHPUnit_Framework_Test $test) $this->currentTestPass = true; $this->write( - array( + array( 'event' => 'testStart', 'suite' => $this->currentTestSuiteName, 'test' => $this->currentTestName - ) + ) ); } @@ -244,6 +244,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time) * @param float $time * @param array $trace * @param string $message + * @param PHPUnit_Framework_TestCase|null $test */ protected function writeCase($status, $time, array $trace = array(), $message = '', $test = null) { @@ -253,7 +254,7 @@ protected function writeCase($status, $time, array $trace = array(), $message = $output = $test->getActualOutput(); } $this->write( - array( + array( 'event' => 'test', 'suite' => $this->currentTestSuiteName, 'test' => $this->currentTestName, @@ -262,7 +263,7 @@ protected function writeCase($status, $time, array $trace = array(), $message = 'trace' => $trace, 'message' => PHPUnit_Util_String::convertToUtf8($message), 'output' => $output, - ) + ) ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php index 13fe0ec..daaa1ee 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php +++ b/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php @@ -176,7 +176,7 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) PHPUnit_Util_Filter::getFilteredStacktrace($e); $error = $this->document->createElement( - 'error', PHPUnit_Util_XML::prepareString($buffer) + 'error', PHPUnit_Util_XML::prepareString($buffer) ); $error->setAttribute('type', get_class($e)); @@ -209,7 +209,7 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser PHPUnit_Util_Filter::getFilteredStacktrace($e); $failure = $this->document->createElement( - 'failure', PHPUnit_Util_XML::prepareString($buffer) + 'failure', PHPUnit_Util_XML::prepareString($buffer) ); $failure->setAttribute('type', get_class($e)); @@ -232,11 +232,11 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t { if ($this->logIncompleteSkipped && $this->currentTestCase !== null) { $error = $this->document->createElement( - 'error', - PHPUnit_Util_XML::prepareString( - "Incomplete Test\n" . - PHPUnit_Util_Filter::getFilteredStacktrace($e) - ) + 'error', + PHPUnit_Util_XML::prepareString( + "Incomplete Test\n" . + PHPUnit_Util_Filter::getFilteredStacktrace($e) + ) ); $error->setAttribute('type', get_class($e)); @@ -261,11 +261,11 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) { if ($this->logIncompleteSkipped && $this->currentTestCase !== null) { $error = $this->document->createElement( - 'error', - PHPUnit_Util_XML::prepareString( - "Risky Test\n" . - PHPUnit_Util_Filter::getFilteredStacktrace($e) - ) + 'error', + PHPUnit_Util_XML::prepareString( + "Risky Test\n" . + PHPUnit_Util_Filter::getFilteredStacktrace($e) + ) ); $error->setAttribute('type', get_class($e)); @@ -290,11 +290,11 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time { if ($this->logIncompleteSkipped && $this->currentTestCase !== null) { $error = $this->document->createElement( - 'error', - PHPUnit_Util_XML::prepareString( - "Skipped Test\n" . - PHPUnit_Util_Filter::getFilteredStacktrace($e) - ) + 'error', + PHPUnit_Util_XML::prepareString( + "Skipped Test\n" . + PHPUnit_Util_Filter::getFilteredStacktrace($e) + ) ); $error->setAttribute('type', get_class($e)); @@ -351,23 +351,23 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite) public function endTestSuite(PHPUnit_Framework_TestSuite $suite) { $this->testSuites[$this->testSuiteLevel]->setAttribute( - 'tests', $this->testSuiteTests[$this->testSuiteLevel] + 'tests', $this->testSuiteTests[$this->testSuiteLevel] ); $this->testSuites[$this->testSuiteLevel]->setAttribute( - 'assertions', $this->testSuiteAssertions[$this->testSuiteLevel] + 'assertions', $this->testSuiteAssertions[$this->testSuiteLevel] ); $this->testSuites[$this->testSuiteLevel]->setAttribute( - 'failures', $this->testSuiteFailures[$this->testSuiteLevel] + 'failures', $this->testSuiteFailures[$this->testSuiteLevel] ); $this->testSuites[$this->testSuiteLevel]->setAttribute( - 'errors', $this->testSuiteErrors[$this->testSuiteLevel] + 'errors', $this->testSuiteErrors[$this->testSuiteLevel] ); $this->testSuites[$this->testSuiteLevel]->setAttribute( - 'time', sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]) + 'time', sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]) ); if ($this->testSuiteLevel > 1) { @@ -424,16 +424,16 @@ public function endTest(PHPUnit_Framework_Test $test, $time) $this->testSuiteAssertions[$this->testSuiteLevel] += $numAssertions; $this->currentTestCase->setAttribute( - 'assertions', $numAssertions + 'assertions', $numAssertions ); } $this->currentTestCase->setAttribute( - 'time', sprintf('%F', $time) + 'time', sprintf('%F', $time) ); $this->testSuites[$this->testSuiteLevel]->appendChild( - $this->currentTestCase + $this->currentTestCase ); $this->testSuiteTests[$this->testSuiteLevel]++; @@ -442,7 +442,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time) if (method_exists($test, 'hasOutput') && $test->hasOutput()) { $systemOut = $this->document->createElement('system-out'); $systemOut->appendChild( - $this->document->createTextNode($test->getActualOutput()) + $this->document->createTextNode($test->getActualOutput()) ); $this->currentTestCase->appendChild($systemOut); } diff --git a/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php b/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php index 8fc924c..e1a0ba4 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php +++ b/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php @@ -109,7 +109,7 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser $this->writeNotOk($test, 'Failure'); $message = explode( - "\n", PHPUnit_Framework_TestFailure::exceptionToString($e) + "\n", PHPUnit_Framework_TestFailure::exceptionToString($e) ); $diagnostic = array( @@ -131,10 +131,10 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser $yaml = new Symfony\Component\Yaml\Dumper; $this->write( - sprintf( - " ---\n%s ...\n", - $yaml->dump($diagnostic, 2, 2) - ) + sprintf( + " ---\n%s ...\n", + $yaml->dump($diagnostic, 2, 2) + ) ); } @@ -161,12 +161,11 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->write( - sprintf( - "ok %d - # RISKY%s\n", - - $this->testNumber, - $e->getMessage() != '' ? ' ' . $e->getMessage() : '' - ) + sprintf( + "ok %d - # RISKY%s\n", + $this->testNumber, + $e->getMessage() != '' ? ' ' . $e->getMessage() : '' + ) ); $this->testSuccessful = false; @@ -183,12 +182,11 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) { $this->write( - sprintf( - "ok %d - # SKIP%s\n", - - $this->testNumber, - $e->getMessage() != '' ? ' ' . $e->getMessage() : '' - ) + sprintf( + "ok %d - # SKIP%s\n", + $this->testNumber, + $e->getMessage() != '' ? ' ' . $e->getMessage() : '' + ) ); $this->testSuccessful = false; @@ -239,12 +237,11 @@ public function endTest(PHPUnit_Framework_Test $test, $time) { if ($this->testSuccessful === true) { $this->write( - sprintf( - "ok %d - %s\n", - - $this->testNumber, - PHPUnit_Util_Test::describe($test) - ) + sprintf( + "ok %d - %s\n", + $this->testNumber, + PHPUnit_Util_Test::describe($test) + ) ); } } @@ -257,14 +254,13 @@ public function endTest(PHPUnit_Framework_Test $test, $time) protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '') { $this->write( - sprintf( - "not ok %d - %s%s%s\n", - - $this->testNumber, - $prefix != '' ? $prefix . ': ' : '', - PHPUnit_Util_Test::describe($test), - $directive != '' ? ' # ' . $directive : '' - ) + sprintf( + "not ok %d - %s%s%s\n", + $this->testNumber, + $prefix != '' ? $prefix . ': ' : '', + PHPUnit_Util_Test::describe($test), + $directive != '' ? ' # ' . $directive : '' + ) ); $this->testSuccessful = false; diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP.php b/core/vendor/phpunit/phpunit/src/Util/PHP.php index 95399c0..52da2b2 100644 --- a/core/vendor/phpunit/phpunit/src/Util/PHP.php +++ b/core/vendor/phpunit/phpunit/src/Util/PHP.php @@ -84,7 +84,7 @@ public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework $_result = $this->runJob($job); $this->processChildResult( - $test, $result, $_result['stdout'], $_result['stderr'] + $test, $result, $_result['stdout'], $_result['stderr'] ); } @@ -129,8 +129,8 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew if (!empty($stderr)) { $result->addError( - $test, - new PHPUnit_Framework_Exception(trim($stderr)), $time + $test, + new PHPUnit_Framework_Exception(trim($stderr)), $time ); } else { set_error_handler(function ($errno, $errstr, $errfile, $errline) { @@ -148,13 +148,13 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew $childResult = false; $result->addError( - $test, new PHPUnit_Framework_Exception(trim($stdout), 0, $e), $time + $test, new PHPUnit_Framework_Exception(trim($stdout), 0, $e), $time ); } if ($childResult !== false) { if (!empty($childResult['output'])) { - print $childResult['output']; + $output = $childResult['output']; } $test->setResult($childResult['testResult']); @@ -164,7 +164,7 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew if ($result->getCollectCodeCoverageInformation()) { $result->getCodeCoverage()->merge( - $childResult->getCodeCoverage() + $childResult->getCodeCoverage() ); } @@ -177,29 +177,33 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew if (!empty($notImplemented)) { $result->addError( - $test, $this->getException($notImplemented[0]), $time + $test, $this->getException($notImplemented[0]), $time ); } elseif (!empty($risky)) { $result->addError( - $test, $this->getException($risky[0]), $time + $test, $this->getException($risky[0]), $time ); } elseif (!empty($skipped)) { $result->addError( - $test, $this->getException($skipped[0]), $time + $test, $this->getException($skipped[0]), $time ); } elseif (!empty($errors)) { $result->addError( - $test, $this->getException($errors[0]), $time + $test, $this->getException($errors[0]), $time ); } elseif (!empty($failures)) { $result->addFailure( - $test, $this->getException($failures[0]), $time + $test, $this->getException($failures[0]), $time ); } } } $result->endTest($test, $time); + + if (!empty($output)) { + print $output; + } } /** @@ -222,15 +226,15 @@ private function getException(PHPUnit_Framework_TestFailure $error) } $exception = new PHPUnit_Framework_SyntheticError( - sprintf( - '%s: %s', - $exceptionArray['_PHP_Incomplete_Class_Name'], - $exceptionArray['message'] - ), - $exceptionArray['code'], - $exceptionArray['file'], - $exceptionArray['line'], - $exceptionArray['trace'] + sprintf( + '%s: %s', + $exceptionArray['_PHP_Incomplete_Class_Name'], + $exceptionArray['message'] + ), + $exceptionArray['code'], + $exceptionArray['file'], + $exceptionArray['line'], + $exceptionArray['trace'] ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php b/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php index af228fc..bff6ddc 100644 --- a/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php +++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php @@ -71,18 +71,18 @@ public function runJob($job, array $settings = array()) $runtime = new Runtime; $process = proc_open( - $runtime->getBinary() . $this->settingsToParameters($settings), - array( + $runtime->getBinary() . $this->settingsToParameters($settings), + array( 0 => array('pipe', 'r'), 1 => array('pipe', 'w'), 2 => array('pipe', 'w') - ), - $pipes + ), + $pipes ); if (!is_resource($process)) { throw new PHPUnit_Framework_Exception( - 'Unable to spawn worker process' + 'Unable to spawn worker process' ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist b/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist index 8d714b5..da6501c 100644 --- a/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist +++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist @@ -30,15 +30,15 @@ function __phpunit_run_isolated_test() $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything}); $result->beStrictAboutOutputDuringTests({isStrictAboutOutputDuringTests}); $result->beStrictAboutTestSize({isStrictAboutTestSize}); + $result->beStrictAboutTodoAnnotatedTests({isStrictAboutTodoAnnotatedTests}); $test = new {className}('{methodName}', unserialize('{data}'), '{dataName}'); $test->setDependencyInput(unserialize('{dependencyInput}')); $test->setInIsolation(TRUE); ob_end_clean(); - ob_start(); $test->run($result); - $output = ob_get_clean(); + $output = $test->getActualOutput(); print serialize( array( diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php index 17d9768..b81ccff 100644 --- a/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php +++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php @@ -43,6 +43,8 @@ * @since File available since Release 3.5.12 */ +use SebastianBergmann\Environment\Runtime; + /** * Windows utility for PHP sub-processes. * @@ -62,6 +64,57 @@ class PHPUnit_Util_PHP_Windows extends PHPUnit_Util_PHP_Default private $tempFile; /** + * {@inheritdoc} + * + * Reading from STDOUT or STDERR hangs forever on Windows if the output is + * too large. + * + * @see https://bugs.php.net/bug.php?id=51800 + */ + public function runJob($job, array $settings = array()) + { + $runtime = new Runtime; + + if (false === $stdout_handle = tmpfile()) { + throw new PHPUnit_Framework_Exception( + 'A temporary file could not be created; verify that your TEMP environment variable is writable' + ); + } + + $process = proc_open( + $runtime->getBinary() . $this->settingsToParameters($settings), + array( + 0 => array('pipe', 'r'), + 1 => $stdout_handle, + 2 => array('pipe', 'w') + ), + $pipes + ); + + if (!is_resource($process)) { + throw new PHPUnit_Framework_Exception( + 'Unable to spawn worker process' + ); + } + + $this->process($pipes[0], $job); + fclose($pipes[0]); + + $stderr = stream_get_contents($pipes[2]); + fclose($pipes[2]); + + proc_close($process); + + rewind($stdout_handle); + $stdout = stream_get_contents($stdout_handle); + fclose($stdout_handle); + + $this->cleanup(); + + return array('stdout' => $stdout, 'stderr' => $stderr); + } + + /** * @param resource $pipe * @param string $job * @throws PHPUnit_Framework_Exception @@ -72,13 +125,13 @@ protected function process($pipe, $job) if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit')) || file_put_contents($this->tempFile, $job) === false) { throw new PHPUnit_Framework_Exception( - 'Unable to write temporary file' + 'Unable to write temporary file' ); } fwrite( - $pipe, - "tempFile, true) . "; ?>" + $pipe, + "tempFile, true) . "; ?>" ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/Printer.php b/core/vendor/phpunit/phpunit/src/Util/Printer.php index 9d67ad3..5004681 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Printer.php +++ b/core/vendor/phpunit/phpunit/src/Util/Printer.php @@ -127,10 +127,10 @@ public function flush() strpos($this->outTarget, 'socket://') !== 0 && extension_loaded('tidy')) { file_put_contents( - $this->outTarget, - tidy_repair_file( - $this->outTarget, array('indent' => true, 'wrap' => 0), 'utf8' - ) + $this->outTarget, + tidy_repair_file( + $this->outTarget, array('indent' => true, 'wrap' => 0), 'utf8' + ) ); } } diff --git a/core/vendor/phpunit/phpunit/src/Util/Regex.php b/core/vendor/phpunit/phpunit/src/Util/Regex.php new file mode 100644 index 0000000..9b51292 --- /dev/null +++ b/core/vendor/phpunit/phpunit/src/Util/Regex.php @@ -0,0 +1,67 @@ +. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package PHPUnit + * @subpackage Util + * @author Márcio Almada + * @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 4.2.0 + */ + +/** + * Error handler that converts PHP errors and warnings to exceptions. + * + * @package PHPUnit + * @subpackage Util + * @author Márcio Almada + * @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 Class available since Release 4.2.0 + */ +class PHPUnit_Util_Regex +{ + public static function pregMatchSafe($pattern, $subject, $matches = null, $flags = 0, $offset = 0) + { + $handler_terminator = PHPUnit_Util_ErrorHandler::handleErrorOnce(E_WARNING); + $match = preg_match($pattern, $subject, $matches, $flags, $offset); + $handler_terminator(); // cleaning + + return $match; + } +} diff --git a/core/vendor/phpunit/phpunit/src/Util/Test.php b/core/vendor/phpunit/phpunit/src/Util/Test.php index 95c2298..58dddc8 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Test.php +++ b/core/vendor/phpunit/phpunit/src/Util/Test.php @@ -116,61 +116,16 @@ public static function describe(PHPUnit_Framework_Test $test, $asString = true) */ public static function getLinesToBeCovered($className, $methodName) { - $codeToCoverList = array(); - - $class = new ReflectionClass($className); - - try { - $method = new ReflectionMethod($className, $methodName); - } catch (ReflectionException $e) { - return array(); - } - - $docComment = self::getDocCommentsOfTestClassAndTestMethodAndTemplateMethods($class, $method); - - if (strpos($docComment, '@coversNothing') !== false) { - return false; - } - - $classShortcut = preg_match_all( - '(@coversDefaultClass\s+(?P[^\s]++)\s*$)m', - $class->getDocComment(), - $matches - ); - - if ($classShortcut) { - if ($classShortcut > 1) { - throw new PHPUnit_Framework_CodeCoverageException( - sprintf( - 'More than one @coversClass annotation in class or interface "%s".', - $className - ) - ); - } - - $classShortcut = $matches['coveredClass'][0]; - } - - $match = preg_match_all( - '(@covers\s+(?P[^\s()]++)[\s()]*$)m', - $docComment, - $matches + $annotations = self::parseTestMethodAnnotations( + $className, + $methodName ); - if ($match) { - foreach ($matches['coveredElement'] as $coveredElement) { - if ($classShortcut && strncmp($coveredElement, '::', 2) === 0) { - $coveredElement = $classShortcut . $coveredElement; - } - - $codeToCoverList = array_merge( - $codeToCoverList, - self::resolveElementToReflectionObjects($coveredElement) - ); - } + if (isset($annotations['class']['coversNothing']) || isset($annotations['method']['coversNothing'])) { + return false; } - return self::resolveReflectionObjectsToLines($codeToCoverList); + return self::getLinesToBeCoveredOrUsed($className, $methodName, 'covers'); } /** @@ -183,31 +138,66 @@ public static function getLinesToBeCovered($className, $methodName) */ public static function getLinesToBeUsed($className, $methodName) { + return self::getLinesToBeCoveredOrUsed($className, $methodName, 'uses'); + } + + /** + * @param string $className + * @param string $methodName + * @param string $mode + * @return array + * @throws PHPUnit_Framework_CodeCoverageException + * @since Method available since Release 4.2.0 + */ + private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode) + { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); - $uses = array(); + $classShortcut = null; - if (isset($annotations['class']['uses'])) { - $uses = $annotations['class']['uses']; + if (!empty($annotations['class'][$mode . 'DefaultClass'])) { + if (count($annotations['class'][$mode . 'DefaultClass']) > 1) { + throw new PHPUnit_Framework_CodeCoverageException( + sprintf( + 'More than one @%sClass annotation in class or interface "%s".', + $mode, + $className + ) + ); + } + + $classShortcut = $annotations['class'][$mode . 'DefaultClass'][0]; + } + + $list = array(); + + if (isset($annotations['class'][$mode])) { + $list = $annotations['class'][$mode]; } - if (isset($annotations['method']['uses'])) { - $uses = array_merge($uses, $annotations['method']['uses']); + if (isset($annotations['method'][$mode])) { + $list = array_merge($list, $annotations['method'][$mode]); } - $uses = array_unique($uses); - $codeToUseList = array(); + $codeList = array(); - foreach (array_unique($uses) as $element) { - $codeToUseList = array_merge( - $codeToUseList, - self::resolveElementToReflectionObjects($element) + foreach (array_unique($list) as $element) { + if ($classShortcut && strncmp($element, '::', 2) === 0) { + $element = $classShortcut . $element; + } + + $element = preg_replace('/[\s()]+$/', '', $element); + + $codeList = array_merge( + $codeList, + self::resolveElementToReflectionObjects($element) ); } - return self::resolveReflectionObjectsToLines($codeToUseList); + return self::resolveReflectionObjectsToLines($codeList); } /** @@ -228,8 +218,8 @@ public static function getRequirements($className, $methodName) if ($count = preg_match_all(self::REGEX_REQUIRES_OS, $docComment, $matches)) { $requires['OS'] = sprintf( - '/%s/i', - addcslashes($matches['value'][$count - 1], '/') + '/%s/i', + addcslashes($matches['value'][$count - 1], '/') ); } if ($count = preg_match_all(self::REGEX_REQUIRES_VERSION, $docComment, $matches)) { @@ -270,7 +260,8 @@ public static function getExpectedException($className, $methodName) if (preg_match(self::REGEX_EXPECTED_EXCEPTION, $docComment, $matches)) { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); $class = $matches[1]; @@ -364,7 +355,7 @@ public static function getProvidedData($className, $methodName) $dataProviderClass = new ReflectionClass($dataProviderClassName); $dataProviderMethod = $dataProviderClass->getMethod( - $dataProviderMethodName + $dataProviderMethodName ); if ($dataProviderMethod->isStatic()) { @@ -388,10 +379,10 @@ public static function getProvidedData($className, $methodName) foreach ($data as $key => $value) { if (!is_array($value)) { throw new PHPUnit_Framework_Exception( - sprintf( - 'Data set %s is invalid.', - is_int($key) ? '#' . $key : '"' . $key . '"' - ) + sprintf( + 'Data set %s is invalid.', + is_int($key) ? '#' . $key : '"' . $key . '"' + ) ); } } @@ -464,10 +455,14 @@ public static function getBackupSettings($className, $methodName) { return array( 'backupGlobals' => self::getBooleanAnnotationSetting( - $className, $methodName, 'backupGlobals' + $className, + $methodName, + 'backupGlobals' ), 'backupStaticAttributes' => self::getBooleanAnnotationSetting( - $className, $methodName, 'backupStaticAttributes' + $className, + $methodName, + 'backupStaticAttributes' ) ); } @@ -483,7 +478,8 @@ public static function getBackupSettings($className, $methodName) public static function getDependencies($className, $methodName) { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); $dependencies = array(); @@ -494,7 +490,8 @@ public static function getDependencies($className, $methodName) if (isset($annotations['method']['depends'])) { $dependencies = array_merge( - $dependencies, $annotations['method']['depends'] + $dependencies, + $annotations['method']['depends'] ); } @@ -512,7 +509,9 @@ public static function getDependencies($className, $methodName) public static function getErrorHandlerSettings($className, $methodName) { return self::getBooleanAnnotationSetting( - $className, $methodName, 'errorHandler' + $className, + $methodName, + 'errorHandler' ); } @@ -527,7 +526,8 @@ public static function getErrorHandlerSettings($className, $methodName) public static function getGroups($className, $methodName = '') { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); $groups = array(); @@ -604,7 +604,8 @@ public static function getSize($className, $methodName) public static function getTickets($className, $methodName) { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); $tickets = array(); @@ -631,7 +632,8 @@ public static function getTickets($className, $methodName) public static function getProcessIsolationSettings($className, $methodName) { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); if (isset($annotations['class']['runTestsInSeparateProcesses']) || @@ -653,7 +655,9 @@ public static function getProcessIsolationSettings($className, $methodName) public static function getPreserveGlobalStateSettings($className, $methodName) { return self::getBooleanAnnotationSetting( - $className, $methodName, 'preserveGlobalState' + $className, + $methodName, + 'preserveGlobalState' ); } @@ -726,7 +730,8 @@ private static function emptyHookMethodsArray() private static function getBooleanAnnotationSetting($className, $methodName, $settingName) { $annotations = self::parseTestMethodAnnotations( - $className, $methodName + $className, + $methodName ); $result = null; @@ -770,11 +775,11 @@ private static function resolveElementToReflectionObjects($element) if (!class_exists($className) && !interface_exists($className)) { throw new PHPUnit_Framework_InvalidCoversTargetException( - sprintf( - 'Trying to @cover or @use not existing class or ' . - 'interface "%s".', - $className - ) + sprintf( + 'Trying to @cover or @use not existing class or ' . + 'interface "%s".', + $className + ) ); } @@ -804,7 +809,7 @@ private static function resolveElementToReflectionObjects($element) foreach ($classes as $className) { if ($className == '' && function_exists($methodName)) { $codeToCoverList[] = new ReflectionFunction( - $methodName + $methodName ); } else { if (!((class_exists($className) || @@ -812,16 +817,17 @@ private static function resolveElementToReflectionObjects($element) trait_exists($className)) && method_exists($className, $methodName))) { throw new PHPUnit_Framework_InvalidCoversTargetException( - sprintf( - 'Trying to @cover or @use not existing method "%s::%s".', - $className, - $methodName - ) + sprintf( + 'Trying to @cover or @use not existing method "%s::%s".', + $className, + $methodName + ) ); } $codeToCoverList[] = new ReflectionMethod( - $className, $methodName + $className, + $methodName ); } } @@ -830,10 +836,7 @@ private static function resolveElementToReflectionObjects($element) $extended = false; if (strpos($element, '') !== false) { - $element = str_replace( - '', '', $element - ); - + $element = str_replace('', '', $element); $extended = true; } @@ -841,9 +844,9 @@ private static function resolveElementToReflectionObjects($element) if ($extended) { $classes = array_merge( - $classes, - class_implements($element), - class_parents($element) + $classes, + class_implements($element), + class_parents($element) ); } @@ -852,11 +855,11 @@ class_parents($element) !interface_exists($className) && !trait_exists($className)) { throw new PHPUnit_Framework_InvalidCoversTargetException( - sprintf( - 'Trying to @cover or @use not existing class or ' . - 'interface "%s".', - $className - ) + sprintf( + 'Trying to @cover or @use not existing class or ' . + 'interface "%s".', + $className + ) ); } @@ -883,12 +886,10 @@ private static function resolveReflectionObjectsToLines(array $reflectors) } $result[$filename] = array_unique( - array_merge( - $result[$filename], - range( - $reflector->getStartLine(), $reflector->getEndLine() + array_merge( + $result[$filename], + range($reflector->getStartLine(), $reflector->getEndLine()) ) - ) ); } @@ -896,26 +897,6 @@ private static function resolveReflectionObjectsToLines(array $reflectors) } /** - * @param ReflectionClass $class - * @param ReflectionMethod $method - * @return string - */ - private static function getDocCommentsOfTestClassAndTestMethodAndTemplateMethods(ReflectionClass $class, ReflectionMethod $method) - { - $buffer = substr($class->getDocComment(), 3, -2) . PHP_EOL . - substr($method->getDocComment(), 3, -2); - - foreach (self::$templateMethods as $templateMethod) { - if ($class->hasMethod($templateMethod)) { - $_method = $class->getMethod($templateMethod); - $buffer .= PHP_EOL . substr($_method->getDocComment(), 3, -2); - } - } - - return $buffer; - } - - /** * @param ReflectionMethod $method * @return boolean * @since Method available since Release 4.0.8 diff --git a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php index c501dc7..16f3094 100644 --- a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php +++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php @@ -78,8 +78,8 @@ protected function startRun() protected function startClass($name) { $this->write( - '

' . $this->currentTestClassPrettified . - '

    ' + '

    ' . $this->currentTestClassPrettified . + '

      ' ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php index dc49790..0b90587 100644 --- a/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php +++ b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php @@ -67,9 +67,7 @@ class PHPUnit_Util_TestSuiteIterator implements RecursiveIterator protected $tests; /** - * Constructor. - * - * @param PHPUnit_Framework_TestSuite $suite + * @param PHPUnit_Framework_TestSuite $testSuite */ public function __construct(PHPUnit_Framework_TestSuite $testSuite) { @@ -132,7 +130,7 @@ public function next() public function getChildren() { return new PHPUnit_Util_TestSuiteIterator( - $this->tests[$this->position] + $this->tests[$this->position] ); } diff --git a/core/vendor/phpunit/phpunit/src/Util/Type.php b/core/vendor/phpunit/phpunit/src/Util/Type.php index d48d4c2..6371833 100644 --- a/core/vendor/phpunit/phpunit/src/Util/Type.php +++ b/core/vendor/phpunit/phpunit/src/Util/Type.php @@ -59,8 +59,8 @@ class PHPUnit_Util_Type public static function isType($type) { return in_array( - $type, - array( + $type, + array( 'numeric', 'integer', 'int', @@ -73,7 +73,7 @@ public static function isType($type) 'object', 'resource', 'scalar' - ) + ) ); } } diff --git a/core/vendor/phpunit/phpunit/src/Util/XML.php b/core/vendor/phpunit/phpunit/src/Util/XML.php index e4ac534..09299f3 100644 --- a/core/vendor/phpunit/phpunit/src/Util/XML.php +++ b/core/vendor/phpunit/phpunit/src/Util/XML.php @@ -70,11 +70,11 @@ class PHPUnit_Util_XML public static function prepareString($string) { return preg_replace( - '/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]/', - '', - htmlspecialchars( - PHPUnit_Util_String::convertToUtf8($string), ENT_QUOTES, 'UTF-8' - ) + '/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]/', + '', + htmlspecialchars( + PHPUnit_Util_String::convertToUtf8($string), ENT_QUOTES, 'UTF-8' + ) ); } @@ -84,10 +84,11 @@ public static function prepareString($string) * @param string $filename * @param boolean $isHtml * @param boolean $xinclude + * @param boolean $strict * @return DOMDocument * @since Method available since Release 3.3.0 */ - public static function loadFile($filename, $isHtml = false, $xinclude = false) + public static function loadFile($filename, $isHtml = false, $xinclude = false, $strict = false) { $reporting = error_reporting(0); $contents = file_get_contents($filename); @@ -95,14 +96,14 @@ public static function loadFile($filename, $isHtml = false, $xinclude = false) if ($contents === false) { throw new PHPUnit_Framework_Exception( - sprintf( - 'Could not read "%s".', - $filename - ) + sprintf( + 'Could not read "%s".', + $filename + ) ); } - return self::load($contents, $isHtml, $filename, $xinclude); + return self::load($contents, $isHtml, $filename, $xinclude, $strict); } /** @@ -123,55 +124,65 @@ public static function loadFile($filename, $isHtml = false, $xinclude = false) * @param boolean $isHtml * @param string $filename * @param boolean $xinclude + * @param boolean $strict * @return DOMDocument * @since Method available since Release 3.3.0 * @author Mike Naberezny * @author Derek DeVries * @author Tobias Schlitt */ - public static function load($actual, $isHtml = false, $filename = '', $xinclude = false) + public static function load($actual, $isHtml = false, $filename = '', $xinclude = false, $strict = false) { if ($actual instanceof DOMDocument) { return $actual; } + // Required for XInclude on Windows. + if ($xinclude) { + $cwd = getcwd(); + chdir(dirname($filename)); + } + $document = new DOMDocument; $internal = libxml_use_internal_errors(true); $message = ''; $reporting = error_reporting(0); + if ('' !== $filename) { + // Necessary for xinclude + $document->documentURI = $filename; + } + if ($isHtml) { $loaded = $document->loadHTML($actual); } else { $loaded = $document->loadXML($actual); } - if ('' !== $filename) { - // Necessary for xinclude - $document->documentURI = $filename; - } - if (!$isHtml && $xinclude) { $document->xinclude(); } foreach (libxml_get_errors() as $error) { - $message .= $error->message; + $message .= "\n" . $error->message; } libxml_use_internal_errors($internal); error_reporting($reporting); - if ($loaded === false) { - if ($filename != '') { - throw new PHPUnit_Framework_Exception( - sprintf( - 'Could not load "%s".%s', + if ($xinclude) { + chdir($cwd); + } - $filename, - $message != '' ? "\n" . $message : '' - ) + if ($loaded === false || ($strict && $message !== '')) { + if ($filename !== '') { + throw new PHPUnit_Framework_Exception( + sprintf( + 'Could not load "%s".%s', + $filename, + $message != '' ? "\n" . $message : '' + ) ); } else { throw new PHPUnit_Framework_Exception($message); @@ -245,7 +256,7 @@ public static function xmlToVariable(DOMElement $element) $variable[] = $value; } } - } + } break; case 'object': { @@ -266,12 +277,12 @@ public static function xmlToVariable(DOMElement $element) } else { $variable = new $className; } - } + } break; case 'boolean': { $variable = $element->nodeValue == 'true' ? true : false; - } + } break; case 'integer': @@ -280,7 +291,7 @@ public static function xmlToVariable(DOMElement $element) $variable = $element->nodeValue; settype($variable, $element->tagName); - } + } break; } @@ -319,7 +330,7 @@ public static function assertValidKeys(array $hash, array $validKeys) if (!empty($unknown)) { throw new PHPUnit_Framework_Exception( - 'Unknown key(s): ' . implode(', ', $unknown) + 'Unknown key(s): ' . implode(', ', $unknown) ); } @@ -351,7 +362,7 @@ public static function convertSelectToTag($selector, $content = true) // substitute spaces within attribute value while (preg_match('/\[[^\]]+"[^"]+\s[^"]+"\]/', $selector)) { $selector = preg_replace( - '/(\[[^\]]+"[^"]+)\s([^"]+"\])/', "$1__SPACE__$2", $selector + '/(\[[^\]]+"[^"]+)\s([^"]+"\])/', "$1__SPACE__$2", $selector ); } @@ -390,7 +401,7 @@ public static function convertSelectToTag($selector, $content = true) // match attributes (\[[^\]]*\]*), ids (#[^\.#\[]*), // and classes (\.[^\.#\[]*)) preg_match_all( - "/(\[[^\]]*\]*|#[^\.#\[]*|\.[^\.#\[]*)/", $element, $matches + "/(\[[^\]]*\]*|#[^\.#\[]*|\.[^\.#\[]*)/", $element, $matches ); if (!empty($matches[1])) { @@ -401,15 +412,11 @@ public static function convertSelectToTag($selector, $content = true) // id matched if (substr($match, 0, 1) == '#') { $tag['id'] = substr($match, 1); - } - - // class matched - else if (substr($match, 0, 1) == '.') { + } // class matched + elseif (substr($match, 0, 1) == '.') { $classes[] = substr($match, 1); - } - - // attribute matched - else if (substr($match, 0, 1) == '[' && + } // attribute matched + elseif (substr($match, 0, 1) == '[' && substr($match, -1, 1) == ']') { $attribute = substr($match, 1, strlen($match) - 2); $attribute = str_replace('"', '', $attribute); @@ -418,15 +425,11 @@ public static function convertSelectToTag($selector, $content = true) if (strstr($attribute, '~=')) { list($key, $value) = explode('~=', $attribute); $value = "regexp:/.*\b$value\b.*/"; - } - - // match substring - else if (strstr($attribute, '*=')) { + } // match substring + elseif (strstr($attribute, '*=')) { list($key, $value) = explode('*=', $attribute); $value = "regexp:/.*$value.*/"; - } - - // exact match + } // exact match else { list($key, $value) = explode('=', $attribute); } @@ -531,7 +534,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if ($options['tag']) { if ($isHtml) { $elements = self::getElementsByCaseInsensitiveTagName( - $dom, $options['tag'] + $dom, $options['tag'] ); } else { $elements = $dom->getElementsByTagName($options['tag']); @@ -544,9 +547,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if (empty($nodes)) { return false; } - } - - // no tag selected, get them all + } // no tag selected, get them all else { $tags = array( 'a', 'abbr', 'acronym', 'address', 'area', 'b', 'base', 'bdo', @@ -571,7 +572,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru foreach ($tags as $tag) { if ($isHtml) { $elements = self::getElementsByCaseInsensitiveTagName( - $dom, $tag + $dom, $tag ); } else { $elements = $dom->getElementsByTagName($tag); @@ -598,18 +599,16 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if (!preg_match($matches[1], $node->getAttribute($name))) { $invalid = true; } - } - - // class can match only a part - else if ($name == 'class') { + } // class can match only a part + elseif ($name == 'class') { // split to individual classes $findClasses = explode( - ' ', preg_replace("/\s+/", " ", $value) + ' ', preg_replace("/\s+/", " ", $value) ); $allClasses = explode( - ' ', - preg_replace("/\s+/", " ", $node->getAttribute($name)) + ' ', + preg_replace("/\s+/", " ", $node->getAttribute($name)) ); // make sure each class given is in the actual node @@ -618,9 +617,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru $invalid = true; } } - } - - // match by exact string + } // match by exact string else { if ($node->getAttribute($name) != $value) { $invalid = true; @@ -652,17 +649,13 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if (!preg_match($matches[1], self::getNodeText($node))) { $invalid = true; } - } - - // match empty string - else if ($options['content'] === '') { + } // match empty string + elseif ($options['content'] === '') { if (self::getNodeText($node) !== '') { $invalid = true; } - } - - // match by exact string - else if (strstr(self::getNodeText($node), $options['content']) === false) { + } // match by exact string + elseif (strstr(self::getNodeText($node), $options['content']) === false) { $invalid = true; } @@ -807,8 +800,8 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if ($options['children']) { $validChild = array('count', 'greater_than', 'less_than', 'only'); $childOptions = self::assertValidKeys( - $options['children'], $validChild - ); + $options['children'], $validChild + ); foreach ($nodes as $node) { $childNodes = $node->childNodes; @@ -827,26 +820,20 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru if (count($children) !== $childOptions['count']) { break; } - } - - // range count of children - else if ($childOptions['less_than'] !== null && + } // range count of children + elseif ($childOptions['less_than'] !== null && $childOptions['greater_than'] !== null) { if (count($children) >= $childOptions['less_than'] || count($children) <= $childOptions['greater_than']) { break; } - } - - // less than a given count - else if ($childOptions['less_than'] !== null) { + } // less than a given count + elseif ($childOptions['less_than'] !== null) { if (count($children) >= $childOptions['less_than']) { break; } - } - - // more than a given count - else if ($childOptions['greater_than'] !== null) { + } // more than a given count + elseif ($childOptions['greater_than'] !== null) { if (count($children) <= $childOptions['greater_than']) { break; } @@ -855,7 +842,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = tru // match each child against a specific tag if ($childOptions['only']) { $onlyNodes = self::findNodes( - $dom, $childOptions['only'], $isHtml + $dom, $childOptions['only'], $isHtml ); // try to match each child to one of the 'only' nodes diff --git a/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php b/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php index e934e9b..19c74c4 100644 --- a/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php +++ b/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php @@ -96,9 +96,7 @@ public function testRepeatedNegative() { try { $test = new PHPUnit_Extensions_RepeatedTest($this->suite, -1); - } - - catch (Exception $e) { + } catch (Exception $e) { return; } diff --git a/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php index 1736520..bc4d933 100644 --- a/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php +++ b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php @@ -70,9 +70,7 @@ public function testFail() { try { $this->fail(); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -93,9 +91,7 @@ public function testAssertSplObjectStorageContainsObject() try { $this->assertContains($b, $c); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -114,9 +110,7 @@ public function testAssertArrayContainsObject() try { $this->assertContains($a, array($b)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -132,9 +126,7 @@ public function testAssertArrayContainsString() try { $this->assertContains('foo', array('bar')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -150,9 +142,7 @@ public function testAssertArrayContainsNonObject() try { $this->assertContains('foo', array(true), '', false, true, true); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -209,9 +199,7 @@ public function testAssertArrayHasIntegerKey() try { $this->assertArrayHasKey(1, array('foo')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -245,9 +233,7 @@ public function testAssertArrayNotHasIntegerKey() try { $this->assertArrayNotHasKey(0, array('foo')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -263,9 +249,7 @@ public function testAssertArrayHasStringKey() try { $this->assertArrayHasKey('bar', array('foo' => 'bar')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -281,9 +265,7 @@ public function testAssertArrayNotHasStringKey() try { $this->assertArrayNotHasKey('foo', array('foo' => 'bar')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -373,9 +355,7 @@ public function testAssertIteratorContainsObject() try { $this->assertContains($foo, new TestIterator(array(new stdClass))); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -391,9 +371,7 @@ public function testAssertIteratorContainsString() try { $this->assertContains('foo', new TestIterator(array('bar'))); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -409,9 +387,7 @@ public function testAssertStringContainsString() try { $this->assertContains('foo', 'bar'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -441,9 +417,7 @@ public function testAssertSplObjectStorageNotContainsObject() try { $this->assertNotContains($a, $c); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -462,9 +436,7 @@ public function testAssertArrayNotContainsObject() try { $this->assertNotContains($a, array($a)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -480,9 +452,7 @@ public function testAssertArrayNotContainsString() try { $this->assertNotContains('foo', array('foo')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -498,9 +468,7 @@ public function testAssertArrayNotContainsNonObject() try { $this->assertNotContains('foo', array(true)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -516,9 +484,7 @@ public function testAssertStringNotContainsString() try { $this->assertNotContains('foo', 'foo'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -561,9 +527,7 @@ public function testAssertArrayContainsOnlyIntegers() try { $this->assertContainsOnly('integer', array("1", 2, 3)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -579,9 +543,7 @@ public function testAssertArrayNotContainsOnlyIntegers() try { $this->assertNotContainsOnly('integer', array(1, 2, 3)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -597,9 +559,7 @@ public function testAssertArrayContainsOnlyStdClass() try { $this->assertContainsOnly('StdClass', array('StdClass')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -615,9 +575,7 @@ public function testAssertArrayNotContainsOnlyStdClass() try { $this->assertNotContainsOnly('StdClass', array(new StdClass)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -679,9 +637,9 @@ protected function notEqualValues() $book4 = new stdClass; $book4->author = 'Terry Pratchett'; - $object1 = new SampleClass( 4, 8, 15); + $object1 = new SampleClass( 4, 8, 15); $object2 = new SampleClass(16, 23, 42); - $object3 = new SampleClass( 4, 8, 15); + $object3 = new SampleClass( 4, 8, 15); $storage1 = new SplObjectStorage; $storage1->attach($object1); $storage2 = new SplObjectStorage; @@ -959,9 +917,7 @@ public function testAssertEqualsFails($a, $b, $delta = 0.0, $canonicalize = fals { try { $this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -985,9 +941,7 @@ public function testAssertNotEqualsFails($a, $b, $delta = 0.0, $canonicalize = f { try { $this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1011,9 +965,7 @@ public function testAssertSameFails($a, $b) { try { $this->assertSame($a, $b); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1037,9 +989,7 @@ public function testAssertNotSameFails($a, $b) { try { $this->assertNotSame($a, $b); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1052,18 +1002,16 @@ public function testAssertNotSameFails($a, $b) public function testAssertXmlFileEqualsXmlFile() { $this->assertXmlFileEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'foo.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'foo.xml' ); try { $this->assertXmlFileEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'bar.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'bar.xml' ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1076,18 +1024,16 @@ public function testAssertXmlFileEqualsXmlFile() public function testAssertXmlFileNotEqualsXmlFile() { $this->assertXmlFileNotEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'bar.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'bar.xml' ); try { $this->assertXmlFileNotEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'foo.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'foo.xml' ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1100,18 +1046,16 @@ public function testAssertXmlFileNotEqualsXmlFile() public function testAssertXmlStringEqualsXmlFile() { $this->assertXmlStringEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'foo.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'foo.xml') ); try { $this->assertXmlStringEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'bar.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'bar.xml') ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1124,18 +1068,16 @@ public function testAssertXmlStringEqualsXmlFile() public function testXmlStringNotEqualsXmlFile() { $this->assertXmlStringNotEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'bar.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'bar.xml') ); try { $this->assertXmlStringNotEqualsXmlFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'foo.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'foo.xml') ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1151,9 +1093,7 @@ public function testAssertXmlStringEqualsXmlString() try { $this->assertXmlStringEqualsXmlString('', ''); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1169,9 +1109,7 @@ public function testAssertXmlStringNotEqualsXmlString() try { $this->assertXmlStringNotEqualsXmlString('', ''); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1190,7 +1128,7 @@ public function testXMLStructureIsSame() $actual->load($this->filesDirectory . 'structureExpected.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1207,7 +1145,7 @@ public function testXMLStructureWrongNumberOfAttributes() $actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1224,7 +1162,7 @@ public function testXMLStructureWrongNumberOfNodes() $actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1240,7 +1178,7 @@ public function testXMLStructureIsSameButDataIsNot() $actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1256,7 +1194,7 @@ public function testXMLStructureAttributesAreSameButValuesAreNot() $actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1272,7 +1210,7 @@ public function testXMLStructureIgnoreTextNodes() $actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml'); $this->assertEqualXMLStructure( - $expected->firstChild, $actual->firstChild, true + $expected->firstChild, $actual->firstChild, true ); } @@ -1285,9 +1223,7 @@ public function testAssertStringEqualsNumeric() try { $this->assertEquals('0', 1); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1320,9 +1256,7 @@ public function testAssertFileExists() try { $this->assertFileExists(__DIR__ . DIRECTORY_SEPARATOR . 'NotExisting'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1347,9 +1281,7 @@ public function testAssertFileNotExists() try { $this->assertFileNotExists(__FILE__); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1367,9 +1299,7 @@ public function testAssertObjectHasAttribute() try { $this->assertObjectHasAttribute('foo', $o); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1387,9 +1317,7 @@ public function testAssertObjectNotHasAttribute() try { $this->assertObjectNotHasAttribute('name', $o); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1405,9 +1333,7 @@ public function testAssertNull() try { $this->assertNull(new stdClass); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1423,9 +1349,7 @@ public function testAssertNotNull() try { $this->assertNotNull(null); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1441,9 +1365,7 @@ public function testAssertTrue() try { $this->assertTrue(false); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1461,9 +1383,7 @@ public function testAssertNotTrue() try { $this->assertNotTrue(true); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1479,9 +1399,7 @@ public function testAssertFalse() try { $this->assertFalse(true); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1499,9 +1417,7 @@ public function testAssertNotFalse() try { $this->assertNotFalse(false); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1553,9 +1469,7 @@ public function testAssertRegExp() try { $this->assertRegExp('/foo/', 'bar'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1571,9 +1485,7 @@ public function testAssertNotRegExp() try { $this->assertNotRegExp('/foo/', 'foobar'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1591,12 +1503,10 @@ public function testAssertSame() try { $this->assertSame( - new stdClass, - new stdClass + new stdClass, + new stdClass ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1613,9 +1523,7 @@ public function testAssertSame2() try { $this->assertSame(true, false); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1628,27 +1536,25 @@ public function testAssertSame2() public function testAssertNotSame() { $this->assertNotSame( - new stdClass, - null + new stdClass, + null ); $this->assertNotSame( - null, - new stdClass + null, + new stdClass ); $this->assertNotSame( - new stdClass, - new stdClass + new stdClass, + new stdClass ); $o = new stdClass; try { $this->assertNotSame($o, $o); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1665,9 +1571,7 @@ public function testAssertNotSame2() try { $this->assertNotSame(true, true); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1681,9 +1585,7 @@ public function testAssertNotSameFailsNull() { try { $this->assertNotSame(null, null); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1699,9 +1601,7 @@ public function testGreaterThan() try { $this->assertGreaterThan(2, 1); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1714,16 +1614,14 @@ public function testGreaterThan() public function testAttributeGreaterThan() { $this->assertAttributeGreaterThan( - 1, 'bar', new ClassWithNonPublicAttributes + 1, 'bar', new ClassWithNonPublicAttributes ); try { $this->assertAttributeGreaterThan( - 1, 'foo', new ClassWithNonPublicAttributes + 1, 'foo', new ClassWithNonPublicAttributes ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1739,9 +1637,7 @@ public function testGreaterThanOrEqual() try { $this->assertGreaterThanOrEqual(2, 1); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1754,16 +1650,14 @@ public function testGreaterThanOrEqual() public function testAttributeGreaterThanOrEqual() { $this->assertAttributeGreaterThanOrEqual( - 1, 'bar', new ClassWithNonPublicAttributes + 1, 'bar', new ClassWithNonPublicAttributes ); try { $this->assertAttributeGreaterThanOrEqual( - 2, 'foo', new ClassWithNonPublicAttributes + 2, 'foo', new ClassWithNonPublicAttributes ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1779,9 +1673,7 @@ public function testLessThan() try { $this->assertLessThan(1, 2); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1794,16 +1686,14 @@ public function testLessThan() public function testAttributeLessThan() { $this->assertAttributeLessThan( - 2, 'foo', new ClassWithNonPublicAttributes + 2, 'foo', new ClassWithNonPublicAttributes ); try { $this->assertAttributeLessThan( - 1, 'bar', new ClassWithNonPublicAttributes + 1, 'bar', new ClassWithNonPublicAttributes ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1819,9 +1709,7 @@ public function testLessThanOrEqual() try { $this->assertLessThanOrEqual(1, 2); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -1834,16 +1722,14 @@ public function testLessThanOrEqual() public function testAttributeLessThanOrEqual() { $this->assertAttributeLessThanOrEqual( - 2, 'foo', new ClassWithNonPublicAttributes + 2, 'foo', new ClassWithNonPublicAttributes ); try { $this->assertAttributeLessThanOrEqual( - 1, 'bar', new ClassWithNonPublicAttributes + 1, 'bar', new ClassWithNonPublicAttributes ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2011,8 +1897,8 @@ public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument3() public function testGetObjectAttributeWorksForInheritedAttributes() { $this->assertEquals( - 'bar', - $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute') + 'bar', + $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute') ); } @@ -2027,9 +1913,7 @@ public function testAssertPublicAttributeContains() try { $this->assertAttributeContains('bar', 'publicArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2047,9 +1931,7 @@ public function testAssertPublicAttributeContainsOnly() try { $this->assertAttributeContainsOnly('integer', 'publicArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2067,9 +1949,7 @@ public function testAssertPublicAttributeNotContains() try { $this->assertAttributeNotContains('foo', 'publicArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2087,9 +1967,7 @@ public function testAssertPublicAttributeNotContainsOnly() try { $this->assertAttributeNotContainsOnly('string', 'publicArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2107,9 +1985,7 @@ public function testAssertProtectedAttributeContains() try { $this->assertAttributeContains('foo', 'protectedArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2127,9 +2003,7 @@ public function testAssertProtectedAttributeNotContains() try { $this->assertAttributeNotContains('bar', 'protectedArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2147,9 +2021,7 @@ public function testAssertPrivateAttributeContains() try { $this->assertAttributeContains('foo', 'privateArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2167,9 +2039,7 @@ public function testAssertPrivateAttributeNotContains() try { $this->assertAttributeNotContains('baz', 'privateArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2187,9 +2057,7 @@ public function testAssertAttributeContainsNonObject() try { $this->assertAttributeContains(true, 'privateArray', $obj, '', false, true, true); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2207,9 +2075,7 @@ public function testAssertAttributeNotContainsNonObject() try { $this->assertAttributeNotContains(true, 'privateArray', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2227,9 +2093,7 @@ public function testAssertPublicAttributeEquals() try { $this->assertAttributeEquals('bar', 'publicAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2247,9 +2111,7 @@ public function testAssertPublicAttributeNotEquals() try { $this->assertAttributeNotEquals('foo', 'publicAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2267,9 +2129,7 @@ public function testAssertPublicAttributeSame() try { $this->assertAttributeSame('bar', 'publicAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2287,9 +2147,7 @@ public function testAssertPublicAttributeNotSame() try { $this->assertAttributeNotSame('foo', 'publicAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2307,9 +2165,7 @@ public function testAssertProtectedAttributeEquals() try { $this->assertAttributeEquals('foo', 'protectedAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2327,9 +2183,7 @@ public function testAssertProtectedAttributeNotEquals() try { $this->assertAttributeNotEquals('bar', 'protectedAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2347,9 +2201,7 @@ public function testAssertPrivateAttributeEquals() try { $this->assertAttributeEquals('foo', 'privateAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2367,9 +2219,7 @@ public function testAssertPrivateAttributeNotEquals() try { $this->assertAttributeNotEquals('baz', 'privateAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2385,9 +2235,7 @@ public function testAssertPublicStaticAttributeEquals() try { $this->assertAttributeEquals('bar', 'publicStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2403,9 +2251,7 @@ public function testAssertPublicStaticAttributeNotEquals() try { $this->assertAttributeNotEquals('foo', 'publicStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2421,9 +2267,7 @@ public function testAssertProtectedStaticAttributeEquals() try { $this->assertAttributeEquals('foo', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2439,9 +2283,7 @@ public function testAssertProtectedStaticAttributeNotEquals() try { $this->assertAttributeNotEquals('bar', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2457,9 +2299,7 @@ public function testAssertPrivateStaticAttributeEquals() try { $this->assertAttributeEquals('foo', 'privateStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2475,9 +2315,7 @@ public function testAssertPrivateStaticAttributeNotEquals() try { $this->assertAttributeNotEquals('baz', 'privateStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2655,9 +2493,7 @@ public function testClassHasPublicAttribute() try { $this->assertClassHasAttribute('attribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2673,9 +2509,7 @@ public function testClassNotHasPublicAttribute() try { $this->assertClassNotHasAttribute('publicAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2691,9 +2525,7 @@ public function testClassHasPublicStaticAttribute() try { $this->assertClassHasStaticAttribute('attribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2709,9 +2541,7 @@ public function testClassNotHasPublicStaticAttribute() try { $this->assertClassNotHasStaticAttribute('publicStaticAttribute', 'ClassWithNonPublicAttributes'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2729,9 +2559,7 @@ public function testObjectHasPublicAttribute() try { $this->assertObjectHasAttribute('attribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2749,9 +2577,7 @@ public function testObjectNotHasPublicAttribute() try { $this->assertObjectNotHasAttribute('publicAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2770,9 +2596,7 @@ public function testObjectHasOnTheFlyAttribute() try { $this->assertObjectHasAttribute('bar', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2791,9 +2615,7 @@ public function testObjectNotHasOnTheFlyAttribute() try { $this->assertObjectNotHasAttribute('foo', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2811,9 +2633,7 @@ public function testObjectHasProtectedAttribute() try { $this->assertObjectHasAttribute('attribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2831,9 +2651,7 @@ public function testObjectNotHasProtectedAttribute() try { $this->assertObjectNotHasAttribute('protectedAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2851,9 +2669,7 @@ public function testObjectHasPrivateAttribute() try { $this->assertObjectHasAttribute('attribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2871,9 +2687,7 @@ public function testObjectNotHasPrivateAttribute() try { $this->assertObjectNotHasAttribute('privateAttribute', $obj); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -2888,11 +2702,11 @@ public function testObjectNotHasPrivateAttribute() public function testAssertThatAttributeEquals() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->attribute( - $this->equalTo('foo'), - 'publicAttribute' - ) + new ClassWithNonPublicAttributes, + $this->attribute( + $this->equalTo('foo'), + 'publicAttribute' + ) ); } @@ -2905,11 +2719,11 @@ public function testAssertThatAttributeEquals() public function testAssertThatAttributeEquals2() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->attribute( - $this->equalTo('bar'), - 'publicAttribute' - ) + new ClassWithNonPublicAttributes, + $this->attribute( + $this->equalTo('bar'), + 'publicAttribute' + ) ); } @@ -2921,8 +2735,8 @@ public function testAssertThatAttributeEquals2() public function testAssertThatAttributeEqualTo() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->attributeEqualTo('publicAttribute', 'foo') + new ClassWithNonPublicAttributes, + $this->attributeEqualTo('publicAttribute', 'foo') ); } @@ -2943,10 +2757,10 @@ public function testAssertThatAnything() public function testAssertThatAnythingAndAnything() { $this->assertThat( - 'anything', - $this->logicalAnd( - $this->anything(), $this->anything() - ) + 'anything', + $this->logicalAnd( + $this->anything(), $this->anything() + ) ); } @@ -2958,10 +2772,10 @@ public function testAssertThatAnythingAndAnything() public function testAssertThatAnythingOrAnything() { $this->assertThat( - 'anything', - $this->logicalOr( - $this->anything(), $this->anything() - ) + 'anything', + $this->logicalOr( + $this->anything(), $this->anything() + ) ); } @@ -2974,11 +2788,11 @@ public function testAssertThatAnythingOrAnything() public function testAssertThatAnythingXorNotAnything() { $this->assertThat( - 'anything', - $this->logicalXor( - $this->anything(), - $this->logicalNot($this->anything()) - ) + 'anything', + $this->logicalXor( + $this->anything(), + $this->logicalNot($this->anything()) + ) ); } @@ -3033,8 +2847,8 @@ public function testAssertThatArrayHasKey() public function testAssertThatClassHasAttribute() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->classHasAttribute('publicAttribute') + new ClassWithNonPublicAttributes, + $this->classHasAttribute('publicAttribute') ); } @@ -3045,8 +2859,8 @@ public function testAssertThatClassHasAttribute() public function testAssertThatClassHasStaticAttribute() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->classHasStaticAttribute('publicStaticAttribute') + new ClassWithNonPublicAttributes, + $this->classHasStaticAttribute('publicStaticAttribute') ); } @@ -3057,8 +2871,8 @@ public function testAssertThatClassHasStaticAttribute() public function testAssertThatObjectHasAttribute() { $this->assertThat( - new ClassWithNonPublicAttributes, - $this->objectHasAttribute('publicAttribute') + new ClassWithNonPublicAttributes, + $this->objectHasAttribute('publicAttribute') ); } @@ -3170,7 +2984,8 @@ public function testAssertThatMatchesRegularExpression() */ public function testAssertThatCallback() { - $this->assertThat(null, $this->callback(function ($other) { return true; })); + $this->assertThat(null, $this->callback(function ($other) { return true; + })); } /** @@ -3188,18 +3003,16 @@ public function testAssertThatCountOf() public function testAssertFileEquals() { $this->assertFileEquals( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'foo.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'foo.xml' ); try { $this->assertFileEquals( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'bar.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'bar.xml' ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3212,18 +3025,16 @@ public function testAssertFileEquals() public function testAssertFileNotEquals() { $this->assertFileNotEquals( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'bar.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'bar.xml' ); try { $this->assertFileNotEquals( - $this->filesDirectory . 'foo.xml', - $this->filesDirectory . 'foo.xml' + $this->filesDirectory . 'foo.xml', + $this->filesDirectory . 'foo.xml' ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3236,18 +3047,16 @@ public function testAssertFileNotEquals() public function testAssertStringEqualsFile() { $this->assertStringEqualsFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'foo.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'foo.xml') ); try { $this->assertStringEqualsFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'bar.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'bar.xml') ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3260,18 +3069,16 @@ public function testAssertStringEqualsFile() public function testAssertStringNotEqualsFile() { $this->assertStringNotEqualsFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'bar.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'bar.xml') ); try { $this->assertStringNotEqualsFile( - $this->filesDirectory . 'foo.xml', - file_get_contents($this->filesDirectory . 'foo.xml') + $this->filesDirectory . 'foo.xml', + file_get_contents($this->filesDirectory . 'foo.xml') ); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3359,9 +3166,7 @@ public function testAssertStringStartsWith() try { $this->assertStringStartsWith('prefix', 'foo'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3377,9 +3182,7 @@ public function testAssertStringStartsNotWith() try { $this->assertStringStartsNotWith('prefix', 'prefixfoo'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3395,9 +3198,7 @@ public function testAssertStringEndsWith() try { $this->assertStringEndsWith('suffix', 'foo'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3413,9 +3214,7 @@ public function testAssertStringEndsNotWith() try { $this->assertStringEndsNotWith('suffix', 'foosuffix'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3484,9 +3283,7 @@ public function testAssertStringNotMatchesFormat() try { $this->assertStringMatchesFormat('*%s*', '**'); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3502,9 +3299,7 @@ public function testAssertEmpty() try { $this->assertEmpty(array('foo')); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3520,9 +3315,7 @@ public function testAssertNotEmpty() try { $this->assertNotEmpty(array()); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3542,9 +3335,7 @@ public function testAssertAttributeEmpty() try { $o->a = array('b'); $this->assertAttributeEmpty('a', $o); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3564,9 +3355,7 @@ public function testAssertAttributeNotEmpty() try { $o->a = array(); $this->assertAttributeNotEmpty('a', $o); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3580,9 +3369,7 @@ public function testMarkTestIncomplete() { try { $this->markTestIncomplete('incomplete'); - } - - catch (PHPUnit_Framework_IncompleteTestError $e) { + } catch (PHPUnit_Framework_IncompleteTestError $e) { $this->assertEquals('incomplete', $e->getMessage()); return; @@ -3598,9 +3385,7 @@ public function testMarkTestSkipped() { try { $this->markTestSkipped('skipped'); - } - - catch (PHPUnit_Framework_SkippedTestError $e) { + } catch (PHPUnit_Framework_SkippedTestError $e) { $this->assertEquals('skipped', $e->getMessage()); return; @@ -3618,9 +3403,7 @@ public function testAssertCount() try { $this->assertCount(2, array(1,2,3)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3634,9 +3417,7 @@ public function testAssertCountThrowsExceptionIfExpectedCountIsNoInteger() { try { $this->assertCount('a', array()); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a integer', $e->getMessage()); return; @@ -3653,9 +3434,7 @@ public function testAssertCountThrowsExceptionIfElementIsNotCountable() try { $this->assertCount(2, ''); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a countable or traversable', $e->getMessage()); return; @@ -3684,9 +3463,7 @@ public function testAssertNotCount() try { $this->assertNotCount(2, array(1,2)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3731,9 +3508,7 @@ public function testAssertSameSize() try { $this->assertSameSize(array(1,2), array(1,2,3)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3747,9 +3522,7 @@ public function testAssertSameSizeThrowsExceptionIfExpectedIsNotCountable() { try { $this->assertSameSize('a', array()); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage()); return; @@ -3765,9 +3538,7 @@ public function testAssertSameSizeThrowsExceptionIfActualIsNotCountable() { try { $this->assertSameSize(array(), ''); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage()); return; @@ -3785,9 +3556,7 @@ public function testAssertNotSameSize() try { $this->assertNotSameSize(array(1,2), array(3,4)); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -3878,7 +3647,7 @@ public function testAssertJsonStringNotEqualsJsonStringErrorRaised($expected, $a */ public function testAssertJsonStringEqualsJsonFile() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; $actual = json_encode(array("Mascott" => "Tux")); $message = ''; $this->assertJsonStringEqualsJsonFile($file, $actual, $message); @@ -3889,7 +3658,7 @@ public function testAssertJsonStringEqualsJsonFile() */ public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedException() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; $actual = json_encode(array("Mascott" => "Beastie")); $message = ''; try { @@ -3910,7 +3679,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingExpectationFailedExce */ public function testAssertJsonStringEqualsJsonFileExpectingException() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; try { $this->assertJsonStringEqualsJsonFile($file, null); } catch (PHPUnit_Framework_Exception $e) { @@ -3924,7 +3693,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingException() */ public function testAssertJsonStringNotEqualsJsonFile() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; $actual = json_encode(array("Mascott" => "Beastie")); $message = ''; $this->assertJsonStringNotEqualsJsonFile($file, $actual, $message); @@ -3935,7 +3704,7 @@ public function testAssertJsonStringNotEqualsJsonFile() */ public function testAssertJsonStringNotEqualsJsonFileExpectingException() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; try { $this->assertJsonStringNotEqualsJsonFile($file, null); } catch (PHPUnit_Framework_Exception $e) { @@ -3949,8 +3718,8 @@ public function testAssertJsonStringNotEqualsJsonFileExpectingException() */ public function testAssertJsonFileNotEqualsJsonFile() { - $fileExpected = __DIR__ . '/../_files/JsonData/simpleObject.js'; - $fileActual = __DIR__ . '/../_files/JsonData/arrayObject.js'; + $fileExpected = __DIR__ . '/../_files/JsonData/simpleObject.json'; + $fileActual = __DIR__ . '/../_files/JsonData/arrayObject.json'; $message = ''; $this->assertJsonFileNotEqualsJsonFile($fileExpected, $fileActual, $message); } @@ -3960,7 +3729,7 @@ public function testAssertJsonFileNotEqualsJsonFile() */ public function testAssertJsonFileEqualsJsonFile() { - $file = __DIR__ . '/../_files/JsonData/simpleObject.js'; + $file = __DIR__ . '/../_files/JsonData/simpleObject.json'; $message = ''; $this->assertJsonFileEqualsJsonFile($file, $file, $message); } @@ -3974,9 +3743,7 @@ public function testAssertInstanceOf() try { $this->assertInstanceOf('Exception', new stdClass); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -4012,9 +3779,7 @@ public function testAssertNotInstanceOf() try { $this->assertNotInstanceOf('stdClass', new stdClass); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -4050,9 +3815,7 @@ public function testAssertInternalType() try { $this->assertInternalType('string', 1); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } @@ -4088,9 +3851,7 @@ public function testAssertNotInternalType() try { $this->assertNotInternalType('integer', 1); - } - - catch (PHPUnit_Framework_AssertionFailedError $e) { + } catch (PHPUnit_Framework_AssertionFailedError $e) { return; } diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php new file mode 100644 index 0000000..0d1cbc3 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php @@ -0,0 +1,125 @@ +. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package PHPUnit + * @author Sebastian Bergmann + * @author Jeroen Versteeg + * @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.7.30 + */ + +/** + * + * + * @package PHPUnit + * @author Márcio Almada + * @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 Class available since Release 4.0.20 + * @covers PHPUnit_Framework_Constraint_ExceptionMessage + */ +class ExceptionMessageTest extends PHPUnit_Framework_TestCase +{ + + /** + * @expectedException \Exception + * @expectedExceptionMessage A literal exception message + */ + public function testLiteralMessage() + { + throw new Exception("A literal exception message"); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage A partial + */ + public function testPatialMessageBegin() + { + throw new Exception("A partial exception message"); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage partial exception + */ + public function testPatialMessageMiddle() + { + throw new Exception("A partial exception message"); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage exception message + */ + public function testPatialMessageEnd() + { + throw new Exception("A partial exception message"); + } + + /** + * @runInSeparateProcess + * @requires extension xdebug + * @expectedException \Exception + * @expectedExceptionMessage Screaming preg_match + */ + public function testMessageWithXdebugScreamOn() + { + ini_set('xdebug.scream', '1'); + throw new Exception("Screaming preg_match"); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage /^A polymorphic \w+ message/ + */ + public function testRegexMessage() + { + throw new Exception("A polymorphic exception message"); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage /^a poly[a-z]+ [a-zA-Z0-9_]+ me(s){2}age$/i + */ + public function testRegexMessageExtreme() + { + throw new Exception("A polymorphic exception message"); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php b/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php deleted file mode 100644 index 17a2083..0000000 --- a/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php +++ /dev/null @@ -1,977 +0,0 @@ -. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Sebastian Bergmann nor the names of his - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * @package PHPUnit - * @author Sebastian Bergmann - * @author Bernhard Schussek - * @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 2.0.0 - */ - -/** - * - * - * @package PHPUnit - * @author Sebastian Bergmann - * @author Bernhard Schussek - * @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 Class available since Release 2.0.0 - */ -class Framework_SelectorAssertionsTest extends PHPUnit_Framework_TestCase -{ - private $html; - - protected function setUp() - { - $this->html = file_get_contents( - dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'SelectorAssertionsFixture.html' - ); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagTypeTrue() - { - $matcher = array('tag' => 'html'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagTypeFalse() - { - $matcher = array('tag' => 'code'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagIdTrue() - { - $matcher = array('id' => 'test_text'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagIdFalse() - { - $matcher = array('id' => 'test_text_doesnt_exist'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagStringContentTrue() - { - $matcher = array('id' => 'test_text', - 'content' => 'My test tag content'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagStringContentFalse() - { - $matcher = array('id' => 'test_text', - 'content' => 'My non existent tag content'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagRegexpContentTrue() - { - $matcher = array('id' => 'test_text', - 'content' => 'regexp:/test tag/'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagRegexpModifierContentTrue() - { - $matcher = array('id' => 'test_text', - 'content' => 'regexp:/TEST TAG/i'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagRegexpContentFalse() - { - $matcher = array('id' => 'test_text', - 'content' => 'regexp:/asdf/'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagCdataContentTrue() - { - $matcher = array('tag' => 'script', - 'content' => 'alert(\'Hello, world!\');'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagCdataontentFalse() - { - $matcher = array('tag' => 'script', - 'content' => 'asdf'); - $this->assertTag($matcher, $this->html); - } - - - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesTrueA() - { - $matcher = array('tag' => 'span', - 'attributes' => array('class' => 'test_class')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesTrueB() - { - $matcher = array('tag' => 'div', - 'attributes' => array('id' => 'test_child_id')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAttributesFalse() - { - $matcher = array('tag' => 'span', - 'attributes' => array('class' => 'test_missing_class')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesRegexpTrueA() - { - $matcher = array('tag' => 'span', - 'attributes' => array('class' => 'regexp:/.+_class/')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesRegexpTrueB() - { - $matcher = array('tag' => 'div', - 'attributes' => array('id' => 'regexp:/.+_child_.+/')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesRegexpModifierTrue() - { - $matcher = array('tag' => 'div', - 'attributes' => array('id' => 'regexp:/.+_CHILD_.+/i')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAttributesRegexpModifierFalse() - { - $matcher = array('tag' => 'div', - 'attributes' => array('id' => 'regexp:/.+_CHILD_.+/')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAttributesRegexpFalse() - { - $matcher = array('tag' => 'span', - 'attributes' => array('class' => 'regexp:/.+_missing_.+/')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesMultiPartClassTrueA() - { - $matcher = array('tag' => 'div', - 'id' => 'test_multi_class', - 'attributes' => array('class' => 'multi class')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAttributesMultiPartClassTrueB() - { - $matcher = array('tag' => 'div', - 'id' => 'test_multi_class', - 'attributes' => array('class' => 'multi')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAttributesMultiPartClassFalse() - { - $matcher = array('tag' => 'div', - 'id' => 'test_multi_class', - 'attributes' => array('class' => 'mul')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagParentTrue() - { - $matcher = array('tag' => 'head', - 'parent' => array('tag' => 'html')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagParentFalse() - { - $matcher = array('tag' => 'head', - 'parent' => array('tag' => 'div')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagMultiplePossibleChildren() - { - $matcher = array( - 'tag' => 'li', - 'parent' => array( - 'tag' => 'ul', - 'id' => 'another_ul' - ) - ); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagChildTrue() - { - $matcher = array('tag' => 'html', - 'child' => array('tag' => 'head')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagChildFalse() - { - $matcher = array('tag' => 'html', - 'child' => array('tag' => 'div')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAdjacentSiblingTrue() - { - $matcher = array('tag' => 'img', - 'adjacent-sibling' => array('tag' => 'input')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAdjacentSiblingFalse() - { - $matcher = array('tag' => 'img', - 'adjacent-sibling' => array('tag' => 'div')); - $this->assertTag($matcher, $this->html); - } - - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagAncestorTrue() - { - $matcher = array('tag' => 'div', - 'ancestor' => array('tag' => 'html')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagAncestorFalse() - { - $matcher = array('tag' => 'html', - 'ancestor' => array('tag' => 'div')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagDescendantTrue() - { - $matcher = array('tag' => 'html', - 'descendant' => array('tag' => 'div')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagDescendantFalse() - { - $matcher = array('tag' => 'div', - 'descendant' => array('tag' => 'html')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagChildrenCountTrue() - { - $matcher = array('tag' => 'ul', - 'children' => array('count' => 3)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagChildrenCountFalse() - { - $matcher = array('tag' => 'ul', - 'children' => array('count' => 5)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagChildrenLessThanTrue() - { - $matcher = array('tag' => 'ul', - 'children' => array('less_than' => 10)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagChildrenLessThanFalse() - { - $matcher = array('tag' => 'ul', - 'children' => array('less_than' => 2)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagChildrenGreaterThanTrue() - { - $matcher = array('tag' => 'ul', - 'children' => array('greater_than' => 2)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagChildrenGreaterThanFalse() - { - $matcher = array('tag' => 'ul', - 'children' => array('greater_than' => 10)); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagChildrenOnlyTrue() - { - $matcher = array('tag' => 'ul', - 'children' => array('only' => array('tag' =>'li'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagChildrenOnlyFalse() - { - $matcher = array('tag' => 'ul', - 'children' => array('only' => array('tag' =>'div'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagTypeIdTrueA() - { - $matcher = array('tag' => 'ul', 'id' => 'my_ul'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagTypeIdTrueB() - { - $matcher = array('id' => 'my_ul', 'tag' => 'ul'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagTypeIdTrueC() - { - $matcher = array('tag' => 'input', 'id' => 'input_test_id'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertTagTypeIdFalse() - { - $matcher = array('tag' => 'div', 'id' => 'my_ul'); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertTagContentAttributes() - { - $matcher = array('tag' => 'div', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id', - 'class' => 'my_test_class')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertParentContentAttributes() - { - $matcher = array('tag' => 'div', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id', - 'class' => 'my_test_class'), - 'parent' => array('tag' => 'body')); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertChildContentAttributes() - { - $matcher = array('tag' => 'div', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id', - 'class' => 'my_test_class'), - 'child' => array('tag' => 'div', - 'attributes' => array('id' => 'test_child_id'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertAdjacentSiblingContentAttributes() - { - $matcher = array('tag' => 'div', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id', - 'class' => 'my_test_class'), - 'adjacent-sibling' => array('tag' => 'div', - 'attributes' => array('id' => 'test_children'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertChildSubChildren() - { - $matcher = array('id' => 'test_id', - 'child' => array('id' => 'test_child_id', - 'child' => array('id' => 'test_subchild_id'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertAdjacentSiblingSubAdjacentSibling() - { - $matcher = array('id' => 'test_id', - 'adjacent-sibling' => array('id' => 'test_children', - 'adjacent-sibling' => array('class' => 'test_class'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertAncestorContentAttributes() - { - $matcher = array('id' => 'test_subchild_id', - 'content' => 'My Subchild', - 'attributes' => array('id' => 'test_subchild_id'), - 'ancestor' => array('tag' => 'div', - 'attributes' => array('id' => 'test_id'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertDescendantContentAttributes() - { - $matcher = array('id' => 'test_id', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id'), - 'descendant' => array('tag' => 'span', - 'attributes' => array('id' => 'test_subchild_id'))); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertTag - */ - public function testAssertChildrenContentAttributes() - { - $matcher = array('id' => 'test_children', - 'content' => 'My Children', - 'attributes' => array('class' => 'children'), - - 'children' => array('less_than' => '25', - 'greater_than' => '2', - 'only' => array('tag' => 'div', - 'attributes' => array('class' => 'my_child')) - )); - $this->assertTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertNotTag - */ - public function testAssertNotTagTypeIdFalse() - { - $matcher = array('tag' => 'div', 'id' => 'my_ul'); - $this->assertNotTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertNotTag - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertNotTagContentAttributes() - { - $matcher = array('tag' => 'div', - 'content' => 'Test Id Text', - 'attributes' => array('id' => 'test_id', - 'class' => 'my_test_class')); - $this->assertNotTag($matcher, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountPresentTrue() - { - $selector = 'div#test_id'; - $count = true; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountPresentFalse() - { - $selector = 'div#non_existent'; - $count = true; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountNotPresentTrue() - { - $selector = 'div#non_existent'; - $count = false; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectNotPresentFalse() - { - $selector = 'div#test_id'; - $count = false; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountChildTrue() - { - $selector = '#my_ul > li'; - $count = 3; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountChildFalse() - { - $selector = '#my_ul > li'; - $count = 4; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountAdjacentSiblingTrue() - { - $selector = 'div + div + div'; - $count = 2; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountAdjacentSiblingFalse() - { - $selector = '#test_children + div'; - $count = 1; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountDescendantTrue() - { - $selector = '#my_ul li'; - $count = 3; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountDescendantFalse() - { - $selector = '#my_ul li'; - $count = 4; - - $this->assertSelectCount($selector, $count, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountGreaterThanTrue() - { - $selector = '#my_ul > li'; - $range = array('>' => 2); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountGreaterThanFalse() - { - $selector = '#my_ul > li'; - $range = array('>' => 3); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountGreaterThanEqualToTrue() - { - $selector = '#my_ul > li'; - $range = array('>=' => 3); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountGreaterThanEqualToFalse() - { - $selector = '#my_ul > li'; - $range = array('>=' => 4); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountLessThanTrue() - { - $selector = '#my_ul > li'; - $range = array('<' => 4); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountLessThanFalse() - { - $selector = '#my_ul > li'; - $range = array('<' => 3); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountLessThanEqualToTrue() - { - $selector = '#my_ul > li'; - $range = array('<=' => 3); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountLessThanEqualToFalse() - { - $selector = '#my_ul > li'; - $range = array('<=' => 2); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - */ - public function testAssertSelectCountRangeTrue() - { - $selector = '#my_ul > li'; - $range = array('>' => 2, '<' => 4); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectCount - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectCountRangeFalse() - { - $selector = '#my_ul > li'; - $range = array('>' => 1, '<' => 3); - - $this->assertSelectCount($selector, $range, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectEquals - */ - public function testAssertSelectEqualsContentPresentTrue() - { - $selector = 'span.test_class'; - $content = 'Test Class Text'; - - $this->assertSelectEquals($selector, $content, true, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectEquals - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectEqualsContentPresentFalse() - { - $selector = 'span.test_class'; - $content = 'Test Nonexistent'; - - $this->assertSelectEquals($selector, $content, true, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectEquals - */ - public function testAssertSelectEqualsContentNotPresentTrue() - { - $selector = 'span.test_class'; - $content = 'Test Nonexistent'; - - $this->assertSelectEquals($selector, $content, false, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectEquals - * @expectedException PHPUnit_Framework_AssertionFailedError - */ - public function testAssertSelectEqualsContentNotPresentFalse() - { - $selector = 'span.test_class'; - $content = 'Test Class Text'; - - $this->assertSelectEquals($selector, $content, false, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectRegExp - */ - public function testAssertSelectRegExpContentPresentTrue() - { - $selector = 'span.test_class'; - $regexp = '/Test.*Text/'; - - $this->assertSelectRegExp($selector, $regexp, true, $this->html); - } - - /** - * @covers PHPUnit_Framework_Assert::assertSelectRegExp - */ - public function testAssertSelectRegExpContentPresentFalse() - { - $selector = 'span.test_class'; - $regexp = '/Nonexistant/'; - - $this->assertSelectRegExp($selector, $regexp, false, $this->html); - } -} diff --git a/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php b/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php index 61e141c..e954f21 100644 --- a/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php +++ b/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php @@ -62,7 +62,8 @@ * @since Class available since Release 2.0.0 * @covers PHPUnit_Framework_TestSuite */ -class Framework_SuiteTest extends PHPUnit_Framework_TestCase { +class Framework_SuiteTest extends PHPUnit_Framework_TestCase +{ protected $result; protected function setUp() @@ -85,6 +86,7 @@ public static function suite() $suite->addTest(new Framework_SuiteTest('testShadowedTests')); $suite->addTest(new Framework_SuiteTest('testBeforeClassAndAfterClassAnnotations')); $suite->addTest(new Framework_SuiteTest('testBeforeAnnotation')); + $suite->addTest(new Framework_SuiteTest('testDontSkipInheritedClass')); return $suite; } @@ -92,7 +94,7 @@ public static function suite() public function testAddTestSuite() { $suite = new PHPUnit_Framework_TestSuite( - 'OneTestCase' + 'OneTestCase' ); $suite->run($this->result); @@ -103,7 +105,7 @@ public function testAddTestSuite() public function testInheritedTests() { $suite = new PHPUnit_Framework_TestSuite( - 'InheritedTestCase' + 'InheritedTestCase' ); $suite->run($this->result); @@ -115,7 +117,7 @@ public function testInheritedTests() public function testNoTestCases() { $suite = new PHPUnit_Framework_TestSuite( - 'NoTestCases' + 'NoTestCases' ); $suite->run($this->result); @@ -147,7 +149,7 @@ public function testNotExistingTestCase() public function testNotPublicTestCase() { $suite = new PHPUnit_Framework_TestSuite( - 'NotPublicTestCase' + 'NotPublicTestCase' ); $this->assertEquals(2, count($suite)); @@ -156,7 +158,7 @@ public function testNotPublicTestCase() public function testNotVoidTestCase() { $suite = new PHPUnit_Framework_TestSuite( - 'NotVoidTestCase' + 'NotVoidTestCase' ); $this->assertEquals(1, count($suite)); @@ -165,7 +167,7 @@ public function testNotVoidTestCase() public function testOneTestCase() { $suite = new PHPUnit_Framework_TestSuite( - 'OneTestCase' + 'OneTestCase' ); $suite->run($this->result); @@ -179,7 +181,7 @@ public function testOneTestCase() public function testShadowedTests() { $suite = new PHPUnit_Framework_TestSuite( - 'OverrideTestCase' + 'OverrideTestCase' ); $suite->run($this->result); @@ -190,7 +192,7 @@ public function testShadowedTests() public function testBeforeClassAndAfterClassAnnotations() { $suite = new PHPUnit_Framework_TestSuite( - 'BeforeClassAndAfterClassTest' + 'BeforeClassAndAfterClassTest' ); BeforeClassAndAfterClassTest::resetProperties(); @@ -213,4 +215,18 @@ public function testBeforeAnnotation() $this->assertEquals(2, BeforeAndAfterTest::$afterWasRun); } + public function testDontSkipInheritedClass() + { + $suite = new PHPUnit_Framework_TestSuite( + 'DontSkipInheritedClass' + ); + + $dir = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Inheritance' . DIRECTORY_SEPARATOR; + + $suite->addTestFile($dir.'InheritanceA.php'); + $suite->addTestFile($dir.'InheritanceB.php'); + $result = $suite->run(); + $this->assertEquals(2, count($result)); + + } } diff --git a/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php index b660ec6..e66392b 100644 --- a/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php +++ b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php @@ -78,8 +78,8 @@ class Framework_TestCaseTest extends PHPUnit_Framework_TestCase public function testCaseToString() { $this->assertEquals( - 'Framework_TestCaseTest::testCaseToString', - $this->toString() + 'Framework_TestCaseTest::testCaseToString', + $this->toString() ); } @@ -204,6 +204,58 @@ public function testException() $this->assertTrue($result->wasSuccessful()); } + public function testExceptionWithMessage() + { + $test = new ThrowExceptionTestCase('test'); + $test->setExpectedException('RuntimeException', 'A runtime error occurred'); + + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertTrue($result->wasSuccessful()); + } + + public function testExceptionWithWrongMessage() + { + $test = new ThrowExceptionTestCase('test'); + $test->setExpectedException('RuntimeException', 'A logic error occurred'); + + $result = $test->run(); + + $this->assertEquals(1, $result->failureCount()); + $this->assertEquals(1, count($result)); + $this->assertEquals( + "Failed asserting that exception message 'A runtime error occurred' contains 'A logic error occurred'.", + $test->getStatusMessage() + ); + } + + public function testExceptionWithRegexpMessage() + { + $test = new ThrowExceptionTestCase('test'); + $test->setExpectedException('RuntimeException', '/runtime .*? occurred/'); + + $result = $test->run(); + + $this->assertEquals(1, count($result)); + $this->assertTrue($result->wasSuccessful()); + } + + public function testExceptionWithWrongRegexpMessage() + { + $test = new ThrowExceptionTestCase('test'); + $test->setExpectedException('RuntimeException', '/logic .*? occurred/'); + + $result = $test->run(); + + $this->assertEquals(1, $result->failureCount()); + $this->assertEquals(1, count($result)); + $this->assertEquals( + "Failed asserting that exception message 'A runtime error occurred' matches '/logic .*? occurred/'.", + $test->getStatusMessage() + ); + } + public function testNoException() { $test = new ThrowNoExceptionTestCase('test'); @@ -353,8 +405,8 @@ public function testSkipsIfRequiresHigherVersionOfPHPUnit() $this->assertEquals(1, $result->skippedCount()); $this->assertEquals( - 'PHPUnit 1111111 (or later) is required.', - $test->getStatusMessage() + 'PHPUnit 1111111 (or later) is required.', + $test->getStatusMessage() ); } @@ -365,8 +417,8 @@ public function testSkipsIfRequiresHigherVersionOfPHP() $this->assertEquals(1, $result->skippedCount()); $this->assertEquals( - 'PHP 9999999 (or later) is required.', - $test->getStatusMessage() + 'PHP 9999999 (or later) is required.', + $test->getStatusMessage() ); } @@ -377,8 +429,8 @@ public function testSkipsIfRequiresNonExistingOs() $this->assertEquals(1, $result->skippedCount()); $this->assertEquals( - 'Operating system matching /DOESNOTEXIST/i is required.', - $test->getStatusMessage() + 'Operating system matching /DOESNOTEXIST/i is required.', + $test->getStatusMessage() ); } @@ -389,8 +441,8 @@ public function testSkipsIfRequiresNonExistingFunction() $this->assertEquals(1, $result->skippedCount()); $this->assertEquals( - 'Function testFunc is required.', - $test->getStatusMessage() + 'Function testFunc is required.', + $test->getStatusMessage() ); } @@ -400,8 +452,8 @@ public function testSkipsIfRequiresNonExistingExtension() $result = $test->run(); $this->assertEquals( - 'Extension testExt is required.', - $test->getStatusMessage() + 'Extension testExt is required.', + $test->getStatusMessage() ); } @@ -411,14 +463,14 @@ public function testSkipsProvidesMessagesForAllSkippingReasons() $result = $test->run(); $this->assertEquals( - 'PHP 99-dev (or later) is required.' . PHP_EOL . - 'PHPUnit 9-dev (or later) is required.' . PHP_EOL . - 'Operating system matching /DOESNOTEXIST/i is required.' . PHP_EOL . - 'Function testFuncOne is required.' . PHP_EOL . - 'Function testFuncTwo is required.' . PHP_EOL . - 'Extension testExtOne is required.' . PHP_EOL . - 'Extension testExtTwo is required.', - $test->getStatusMessage() + 'PHP 99-dev (or later) is required.' . PHP_EOL . + 'PHPUnit 9-dev (or later) is required.' . PHP_EOL . + 'Operating system matching /DOESNOTEXIST/i is required.' . PHP_EOL . + 'Function testFuncOne is required.' . PHP_EOL . + 'Function testFuncTwo is required.' . PHP_EOL . + 'Extension testExtOne is required.' . PHP_EOL . + 'Extension testExtTwo is required.', + $test->getStatusMessage() ); } @@ -459,5 +511,4 @@ public function testCurrentWorkingDirectoryIsRestored() $this->assertSame($expectedCwd, getcwd()); } - } diff --git a/core/vendor/phpunit/phpunit/tests/Regression/578.phpt b/core/vendor/phpunit/phpunit/tests/Regression/578.phpt index dfbf855..4a4d3e0 100644 --- a/core/vendor/phpunit/phpunit/tests/Regression/578.phpt +++ b/core/vendor/phpunit/phpunit/tests/Regression/578.phpt @@ -21,17 +21,17 @@ There were 3 errors: 1) Issue578Test::testNoticesDoublePrintStackTrace Invalid error type specified -%s/Issue578Test.php:%i +%sIssue578Test.php:%i 2) Issue578Test::testWarningsDoublePrintStackTrace Invalid error type specified -%s/Issue578Test.php:%i +%sIssue578Test.php:%i 3) Issue578Test::testUnexpectedExceptionsPrintsCorrectly Exception: Double printed exception -%s/Issue578Test.php:%i +%sIssue578Test.php:%i FAILURES! Tests: 3, Assertions: 0, Errors: 3. diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt new file mode 100644 index 0000000..7d9dfcf --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149.phpt @@ -0,0 +1,20 @@ +--TEST-- +GH-1149: Test swallows output buffer when run in a separate process +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +.1.2 + +Time: %s, Memory: %sMb + +OK (2 tests, 2 assertions) diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php new file mode 100644 index 0000000..01ac870 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php @@ -0,0 +1,18 @@ +assertTrue(true); + print '1'; + } + + /** + * @runInSeparateProcess + */ + public function testTwo() + { + $this->assertTrue(true); + print '2'; + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt new file mode 100644 index 0000000..af02df1 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330.phpt @@ -0,0 +1,26 @@ +--TEST-- +GH-1330: Allow non-ambiguous shortened longopts +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +Configuration read from %s + + +Starting test 'Issue1330Test::testTrue'. +. + +Time: %s, Memory: %sMb + +OK (1 test, 1 assertion) diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php new file mode 100644 index 0000000..0829cb9 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php @@ -0,0 +1,8 @@ +assertTrue(PHPUNIT_1330); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml new file mode 100644 index 0000000..a61e0cc --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt new file mode 100644 index 0000000..de467f6 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt @@ -0,0 +1,21 @@ +--TEST-- +GH-1335: exportVariable multiple backslash problem +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +............ + +Time: %s, Memory: %sMb + +OK (12 tests, 12 assertions) diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php new file mode 100644 index 0000000..307ef66 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php @@ -0,0 +1,67 @@ +assertEquals("Hello", $GLOBALS['globalString']); + } + + function testGlobalIntTruthy() + { + $this->assertEquals(1, $GLOBALS['globalIntTruthy']); + } + + function testGlobalIntFalsey() + { + $this->assertEquals(0, $GLOBALS['globalIntFalsey']); + } + + function testGlobalFloat() + { + $this->assertEquals(1.123, $GLOBALS['globalFloat']); + } + + function testGlobalBoolTrue() + { + $this->assertEquals(true, $GLOBALS['globalBoolTrue']); + } + + function testGlobalBoolFalse() + { + $this->assertEquals(false, $GLOBALS['globalBoolFalse']); + } + + function testGlobalNull() + { + $this->assertEquals(null, $GLOBALS['globalNull']); + } + + function testGlobalArray() + { + $this->assertEquals(array("foo"), $GLOBALS['globalArray']); + } + + function testGlobalNestedArray() + { + $this->assertEquals(array(array("foo")), $GLOBALS['globalNestedArray']); + } + + function testGlobalObject() + { + $this->assertEquals((object)array("foo"=>"bar"), $GLOBALS['globalObject']); + } + + function testGlobalObjectWithBackSlashString() + { + $this->assertEquals((object)array("foo"=>"back\\slash"), $GLOBALS['globalObjectWithBackSlashString']); + } + + function testGlobalObjectWithDoubleBackSlashString() + { + $this->assertEquals((object)array("foo"=>"back\\\\slash"), $GLOBALS['globalObjectWithDoubleBackSlashString']); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php new file mode 100644 index 0000000..6435677 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php @@ -0,0 +1,13 @@ +"bar"); +$globalObjectWithBackSlashString = (object)array("foo"=>"back\\slash"); +$globalObjectWithDoubleBackSlashString = (object)array("foo"=>"back\\\\slash"); diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt new file mode 100644 index 0000000..17ee08e --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337.phpt @@ -0,0 +1,21 @@ +--TEST-- +GH-1337: Data Provider with \ at the end of the name breaks with process isolation +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +.. + +Time: %s, Memory: %sMb + +OK (2 tests, 2 assertions) \ No newline at end of file diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php new file mode 100644 index 0000000..44a2fce --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php @@ -0,0 +1,19 @@ +assertTrue($a); + } + + public function dataProvider() + { + return array( + 'c:\\'=>array(true), + 0.9=>array(true) + ); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt new file mode 100644 index 0000000..4e1cd1f --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340.phpt @@ -0,0 +1,34 @@ +--TEST-- +GH-1340: Process isolation blocks infinitely upon fatal error +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. +%A +.E.EE + +Time: %s, Memory: %sMb + +There were 3 errors: + +1) Issue1340Test::testLargeStderrOutputDoesNotBlockInIsolation +PHPUnit_Framework_Exception: testLargeStderrOutputDoesNotBlockInIsolation: stderr:%d +%A +2) Issue1340Test::testPhpNoticeWithStderrOutputIsAnError +PHPUnit_Framework_Exception: shutdown: stderr:%d +%A +3) Issue1340Test::testFatalErrorDoesNotPass +PHPUnit_Framework_Exception: Fatal error: Call to undefined function undefined_function() in %s on line %d +%A +shutdown: stderr:%d +%A +FAILURES! +Tests: 5, Assertions: 3, Errors: 3. \ No newline at end of file diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php new file mode 100644 index 0000000..19c4fbd --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php @@ -0,0 +1,70 @@ +assertTrue(true); + } + + /** + * @runInSeparateProcess + */ + public function testLargeStderrOutputDoesNotBlockInIsolation() + { + error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n"); + $this->assertTrue(true); + } + + /** + * @runInSeparateProcess + * @expectedException \PHPUnit_Framework_Error_Notice + * @expectedExceptionMessage Undefined variable: foo + */ + public function testPhpNoticeIsCaught() + { + $bar = $foo['foo']; + } + + /** + * @runInSeparateProcess + * @expectedException \PHPUnit_Framework_Error_Notice + * @expectedExceptionMessage Undefined variable: foo + */ + public function testPhpNoticeWithStderrOutputIsAnError() + { + register_shutdown_function(__CLASS__ . '::onShutdown'); + $bar = $foo['foo']; + } + + /** + * @runInSeparateProcess + */ + public function testFatalErrorDoesNotPass() + { + register_shutdown_function(__CLASS__ . '::onShutdown'); + $undefined = 'undefined_function'; + $undefined(); + } + + public static function onShutdown() + { + echo "\nshutdown: stdout:", self::get4KB(), "\n"; + error_log("\nshutdown: stderr:" . self::get4KB()); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt new file mode 100644 index 0000000..9ec7e3c --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374.phpt @@ -0,0 +1,21 @@ +--TEST-- +GH-1374: tearDown() is called despite unmet requirements +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +S + +Time: %s, Memory: %sMb + +OK, but incomplete, skipped, or risky tests! +Tests: 1, Assertions: 0, Skipped: 1. diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php new file mode 100644 index 0000000..ad6a3bf --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php @@ -0,0 +1,21 @@ +fail('This should not be reached'); + } + + protected function tearDown() + { + print __FUNCTION__; + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php index 201780c..43ddcb4 100644 --- a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php @@ -1,7 +1,8 @@ assertEquals( (object)array(1,2,"Test\r\n",4,5,6,7,8), (object)array(1,2,"Test\r\n",4,1,6,7,8) diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt index 79b33a4..7005b41 100644 --- a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt @@ -22,7 +22,7 @@ There was 1 error: 1) Issue74Test::testCreateAndThrowNewExceptionInProcessIsolation NewException: Testing GH-74 -%s/tests/Regression/GitHub/74/Issue74Test.php:7 +%sIssue74Test.php:7 FAILURES! Tests: 1, Assertions: 0, Errors: 1. diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php index 70ef27d..70fd904 100644 --- a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php +++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php @@ -1,9 +1,9 @@ - + diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt index fa7287c..9854e2f 100644 --- a/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt +++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt @@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann. ..F. - + diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt new file mode 100644 index 0000000..9183bf4 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-insensitive.phpt @@ -0,0 +1,21 @@ +--TEST-- +phpunit --filter /balanceIsInitiallyZero/i BankAccountTest ../_files/BankAccountTest.php +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + +. + +Time: %s, Memory: %sMb + +OK (1 test, 1 assertion) diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt new file mode 100644 index 0000000..0f4aedb --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-case-sensitive-no-result.phpt @@ -0,0 +1,21 @@ +--TEST-- +phpunit --filter balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php +--FILE-- + +--EXPECTF-- +PHPUnit %s by Sebastian Bergmann. + + + +Time: %s, Memory: %sMb + +No tests executed! diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt index b917f5c..853a87a 100644 --- a/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt +++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt @@ -1,5 +1,5 @@ --TEST-- -phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php +phpunit --filter doesNotExist BankAccountTest ../_files/BankAccountTest.php --FILE-- Runs the test(s) repeatedly. --tap Report test execution progress in TAP format. --testdox Report test execution progress in TestDox format. - --printer TestSuiteListener implementation to use. + --printer TestListener implementation to use. Configuration Options: diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt index 0e1297a..1615e29 100644 --- a/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt +++ b/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt @@ -48,6 +48,7 @@ Test Execution Options: --strict-coverage Be strict about unintentionally covered code. --disallow-test-output Be strict about output during tests. --enforce-time-limit Enforce time limit based on test size. + --disallow-todo-tests Disallow @todo-annotated tests. --strict Run tests in strict mode (enables all of the above). --process-isolation Run each test in a separate PHP process. @@ -68,7 +69,7 @@ Test Execution Options: --repeat Runs the test(s) repeatedly. --tap Report test execution progress in TAP format. --testdox Report test execution progress in TestDox format. - --printer TestSuiteListener implementation to use. + --printer TestListener implementation to use. Configuration Options: diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt index c1f83fb..c6c2c1d 100644 --- a/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt +++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt @@ -19,7 +19,7 @@ PHPUnit %s by Sebastian Bergmann. - + diff --git a/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php index a1d3f1d..3893881 100644 --- a/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php +++ b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php @@ -59,7 +59,7 @@ class Util_ConfigurationTest extends PHPUnit_Framework_TestCase protected function setUp() { $this->configuration = PHPUnit_Util_Configuration::getInstance( - dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.xml' + dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration.xml' ); } @@ -78,7 +78,7 @@ public function testExceptionIsThrownForNotExistingConfigurationFile() public function testFilterConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 'blacklist' => array( 'include' => @@ -155,8 +155,8 @@ public function testFilterConfigurationIsReadCorrectly() ), ), ), - ), - $this->configuration->getFilterConfiguration() + ), + $this->configuration->getFilterConfiguration() ); } @@ -166,7 +166,7 @@ public function testFilterConfigurationIsReadCorrectly() public function testGroupConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 'include' => array( 0 => 'name', @@ -175,8 +175,8 @@ public function testGroupConfigurationIsReadCorrectly() array( 0 => 'name', ), - ), - $this->configuration->getGroupConfiguration() + ), + $this->configuration->getGroupConfiguration() ); } @@ -191,7 +191,7 @@ public function testListenerConfigurationIsReadCorrectly() ini_set('include_path', $dir . PATH_SEPARATOR . $includePath); $this->assertEquals( - array( + array( 0 => array( 'class' => 'MyListener', @@ -224,8 +224,8 @@ public function testListenerConfigurationIsReadCorrectly() 0 => 42 ), ), - ), - $this->configuration->getListenerConfiguration() + ), + $this->configuration->getListenerConfiguration() ); ini_set('include_path', $includePath); @@ -237,7 +237,7 @@ public function testListenerConfigurationIsReadCorrectly() public function testLoggingConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 'lowUpperBound' => '50', 'highLowerBound' => '90', 'coverage-html' => '/tmp/report', @@ -249,8 +249,8 @@ public function testLoggingConfigurationIsReadCorrectly() 'junit' => '/tmp/logfile.xml', 'testdox-html' => '/tmp/testdox.html', 'testdox-text' => '/tmp/testdox.txt', - ), - $this->configuration->getLoggingConfiguration() + ), + $this->configuration->getLoggingConfiguration() ); } @@ -260,7 +260,7 @@ public function testLoggingConfigurationIsReadCorrectly() public function testPHPConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 'include_path' => array( dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.', @@ -276,8 +276,8 @@ public function testPHPConfigurationIsReadCorrectly() 'server'=> array('foo' => 'bar'), 'files'=> array('foo' => 'bar'), 'request'=> array('foo' => 'bar'), - ), - $this->configuration->getPHPConfiguration() + ), + $this->configuration->getPHPConfiguration() ); } @@ -336,7 +336,7 @@ public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv() public function testPHPUnitConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 'backupGlobals' => true, 'backupStaticAttributes' => false, 'bootstrap' => '/path/to/bootstrap.php', @@ -354,13 +354,14 @@ public function testPHPUnitConfigurationIsReadCorrectly() 'strictCoverage' => false, 'disallowTestOutput' => false, 'enforceTimeLimit' => false, + 'disallowTodoAnnotatedTests' => false, 'testSuiteLoaderClass' => 'PHPUnit_Runner_StandardTestSuiteLoader', 'verbose' => false, 'timeoutForSmallTests' => 1, 'timeoutForMediumTests' => 10, 'timeoutForLargeTests' => 60 - ), - $this->configuration->getPHPUnitConfiguration() + ), + $this->configuration->getPHPUnitConfiguration() ); } @@ -370,7 +371,7 @@ public function testPHPUnitConfigurationIsReadCorrectly() public function testSeleniumBrowserConfigurationIsReadCorrectly() { $this->assertEquals( - array( + array( 0 => array( 'name' => 'Firefox on Linux', @@ -379,8 +380,8 @@ public function testSeleniumBrowserConfigurationIsReadCorrectly() 'port' => 4444, 'timeout' => 30000, ), - ), - $this->configuration->getSeleniumBrowserConfiguration() + ), + $this->configuration->getSeleniumBrowserConfiguration() ); } @@ -390,7 +391,7 @@ public function testSeleniumBrowserConfigurationIsReadCorrectly() public function testXincludeInConfiguration() { $configurationWithXinclude = PHPUnit_Util_Configuration::getInstance( - dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_xinclude.xml' + dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_xinclude.xml' ); $this->assertConfigurationEquals( @@ -411,7 +412,7 @@ public function testXincludeInConfiguration() public function testWithEmptyConfigurations() { $emptyConfiguration = PHPUnit_Util_Configuration::getInstance( - dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_empty.xml' + dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'configuration_empty.xml' ); $logging = $emptyConfiguration->getLoggingConfiguration(); @@ -446,7 +447,7 @@ public function testWithEmptyConfigurations() * @param PHPUnit_Util_Configuration $actualConfiguration * @return void */ - protected function assertConfigurationEquals( PHPUnit_Util_Configuration $expectedConfiguration, PHPUnit_Util_Configuration $actualConfiguration ) + protected function assertConfigurationEquals(PHPUnit_Util_Configuration $expectedConfiguration, PHPUnit_Util_Configuration $actualConfiguration) { $this->assertEquals( $expectedConfiguration->getFilterConfiguration(), diff --git a/core/vendor/phpunit/phpunit/tests/Util/RegexTest.php b/core/vendor/phpunit/phpunit/tests/Util/RegexTest.php new file mode 100644 index 0000000..97ad27a --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/Util/RegexTest.php @@ -0,0 +1,93 @@ +. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Sebastian Bergmann nor the names of his + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * @package PHPUnit + * @author Jeff Welch + * @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 4.2.0 + */ + +/** + * + * + * @package PHPUnit + * @author Jeff Welch + * @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 Class available since Release 4.2.0 + */ +class Util_RegexTest extends PHPUnit_Framework_TestCase +{ + public function validRegexpProvider() + { + return array( + array('#valid regexp#', 'valid regexp', 1), + array(';val.*xp;', 'valid regexp', 1), + array('/val.*xp/i', 'VALID REGEXP', 1), + array('/a val.*p/','valid regexp', 0), + ); + } + + public function invalidRegexpProvider() + { + return array( + array('valid regexp', 'valid regexp'), + array(';val.*xp', 'valid regexp'), + array('val.*xp/i', 'VALID REGEXP'), + ); + } + + /** + * @dataProvider validRegexpProvider + * @covers PHPUnit_Util_Regex::pregMatchSafe + */ + public function testValidRegex($pattern, $subject, $return) + { + $this->assertEquals($return, PHPUnit_Util_Regex::pregMatchSafe($pattern, $subject)); + } + + /** + * @dataProvider invalidRegexpProvider + * @covers PHPUnit_Util_Regex::pregMatchSafe + */ + public function testInvalidRegex($pattern, $subject) + { + $this->assertFalse(PHPUnit_Util_Regex::pregMatchSafe($pattern, $subject)); + } +} diff --git a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php index 99e55bd..e8efaaf 100644 --- a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php +++ b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php @@ -44,9 +44,9 @@ if (!defined('TEST_FILES_PATH')) { define( - 'TEST_FILES_PATH', - dirname(__DIR__) . DIRECTORY_SEPARATOR . - '_files' . DIRECTORY_SEPARATOR + 'TEST_FILES_PATH', + dirname(__DIR__) . DIRECTORY_SEPARATOR . + '_files' . DIRECTORY_SEPARATOR ); } @@ -69,53 +69,53 @@ class Util_TestTest extends PHPUnit_Framework_TestCase public function testGetExpectedException() { $this->assertSame( - array('class' => 'FooBarBaz', 'code' => null, 'message' => ''), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne') + array('class' => 'FooBarBaz', 'code' => null, 'message' => ''), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne') ); $this->assertSame( - array('class' => 'Foo_Bar_Baz', 'code' => null, 'message' => ''), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo') + array('class' => 'Foo_Bar_Baz', 'code' => null, 'message' => ''), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo') ); $this->assertSame( - array('class' => 'Foo\Bar\Baz', 'code' => null, 'message' => ''), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree') + array('class' => 'Foo\Bar\Baz', 'code' => null, 'message' => ''), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree') ); $this->assertSame( - array('class' => 'ほげ', 'code' => null, 'message' => ''), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour') + array('class' => 'ほげ', 'code' => null, 'message' => ''), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour') ); $this->assertSame( - array('class' => 'Class', 'code' => 1234, 'message' => 'Message'), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive') + array('class' => 'Class', 'code' => 1234, 'message' => 'Message'), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive') ); $this->assertSame( - array('class' => 'Class', 'code' => 1234, 'message' => 'Message'), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix') + array('class' => 'Class', 'code' => 1234, 'message' => 'Message'), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix') ); $this->assertSame( - array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven') + array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven') ); $this->assertSame( - array('class' => 'Class', 'code' => 0, 'message' => 'Message'), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight') + array('class' => 'Class', 'code' => 0, 'message' => 'Message'), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight') ); $this->assertSame( - array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine') + array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine') ); $this->assertSame( - array('class' => 'Class', 'code' => null, 'message' => ''), - PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine') + array('class' => 'Class', 'code' => null, 'message' => ''), + PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine') ); $this->assertSame( @@ -142,8 +142,8 @@ public function testGetExpectedException() public function testGetRequirements($test, $result) { $this->assertEquals( - $result, - PHPUnit_Util_Test::getRequirements('RequirementsTest', $test) + $result, + PHPUnit_Util_Test::getRequirements('RequirementsTest', $test) ); } @@ -207,8 +207,8 @@ public function testGetRequirementsMergesClassAndMethodDocBlocks() ); $this->assertEquals( - $expectedAnnotations, - PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod') + $expectedAnnotations, + PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod') ); } @@ -246,8 +246,8 @@ public function testGetProvidedDataRegEx() public function testParseAnnotation() { $this->assertEquals( - array('Foo', 'ほげ'), - PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotation') + array('Foo', 'ほげ'), + PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotation') ); } @@ -266,8 +266,8 @@ public function methodForTestParseAnnotation() public function testParseAnnotationThatIsOnlyOneLine() { $this->assertEquals( - array('Bar'), - PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotationThatIsOnlyOneLine') + array('Bar'), + PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotationThatIsOnlyOneLine') ); } @@ -279,6 +279,7 @@ public function methodForTestParseAnnotationThatIsOnlyOneLine() /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed * @covers PHPUnit_Util_Test::resolveElementToReflectionObjects * @dataProvider getLinesToBeCoveredProvider */ @@ -288,149 +289,150 @@ public function testGetLinesToBeCovered($test, $lines) $expected = array( TEST_FILES_PATH . 'NamespaceCoveredClass.php' => $lines ); - } - - else if ($test === 'CoverageNoneTest') { + } elseif ($test === 'CoverageNoneTest') { $expected = array(); - } - - else if ($test === 'CoverageNothingTest') { + } elseif ($test === 'CoverageNothingTest') { $expected = false; - } - - else if ($test === 'CoverageFunctionTest') { + } elseif ($test === 'CoverageFunctionTest') { $expected = array( TEST_FILES_PATH . 'CoveredFunction.php' => $lines ); - } - - else { + } else { $expected = array(TEST_FILES_PATH . 'CoveredClass.php' => $lines); } $this->assertEquals( - $expected, - PHPUnit_Util_Test::getLinesToBeCovered( - $test, 'testSomething' - ) + $expected, + PHPUnit_Util_Test::getLinesToBeCovered( + $test, 'testSomething' + ) ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed * @covers PHPUnit_Util_Test::resolveElementToReflectionObjects * @expectedException PHPUnit_Framework_CodeCoverageException */ public function testGetLinesToBeCovered2() { PHPUnit_Util_Test::getLinesToBeCovered( - 'NotExistingCoveredElementTest', 'testOne' + 'NotExistingCoveredElementTest', 'testOne' ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed * @covers PHPUnit_Util_Test::resolveElementToReflectionObjects * @expectedException PHPUnit_Framework_CodeCoverageException */ public function testGetLinesToBeCovered3() { PHPUnit_Util_Test::getLinesToBeCovered( - 'NotExistingCoveredElementTest', 'testTwo' + 'NotExistingCoveredElementTest', 'testTwo' ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed * @covers PHPUnit_Util_Test::resolveElementToReflectionObjects * @expectedException PHPUnit_Framework_CodeCoverageException */ public function testGetLinesToBeCovered4() { PHPUnit_Util_Test::getLinesToBeCovered( - 'NotExistingCoveredElementTest', 'testThree' + 'NotExistingCoveredElementTest', 'testThree' ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed */ public function testGetLinesToBeCoveredSkipsNonExistantMethods() { $this->assertSame( - array(), - PHPUnit_Util_Test::getLinesToBeCovered( - 'NotExistingCoveredElementTest', - 'methodDoesNotExist' - ) + array(), + PHPUnit_Util_Test::getLinesToBeCovered( + 'NotExistingCoveredElementTest', + 'methodDoesNotExist' + ) ); } /** - * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed * @expectedException PHPUnit_Framework_CodeCoverageException */ public function testTwoCoversDefaultClassAnnoationsAreNotAllowed() { PHPUnit_Util_Test::getLinesToBeCovered( - 'CoverageTwoDefaultClassAnnotations', - 'testSomething' + 'CoverageTwoDefaultClassAnnotations', + 'testSomething' ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed */ public function testFunctionParenthesesAreAllowed() { $this->assertSame( - array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)), - PHPUnit_Util_Test::getLinesToBeCovered( - 'CoverageFunctionParenthesesTest', - 'testSomething' - ) + array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)), + PHPUnit_Util_Test::getLinesToBeCovered( + 'CoverageFunctionParenthesesTest', + 'testSomething' + ) ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed */ public function testFunctionParenthesesAreAllowedWithWhitespace() { $this->assertSame( - array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)), - PHPUnit_Util_Test::getLinesToBeCovered( - 'CoverageFunctionParenthesesWhitespaceTest', - 'testSomething' - ) + array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)), + PHPUnit_Util_Test::getLinesToBeCovered( + 'CoverageFunctionParenthesesWhitespaceTest', + 'testSomething' + ) ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed */ public function testMethodParenthesesAreAllowed() { $this->assertSame( - array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)), - PHPUnit_Util_Test::getLinesToBeCovered( - 'CoverageMethodParenthesesTest', - 'testSomething' - ) + array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)), + PHPUnit_Util_Test::getLinesToBeCovered( + 'CoverageMethodParenthesesTest', + 'testSomething' + ) ); } /** * @covers PHPUnit_Util_Test::getLinesToBeCovered + * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed */ public function testMethodParenthesesAreAllowedWithWhitespace() { $this->assertSame( - array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)), - PHPUnit_Util_Test::getLinesToBeCovered( - 'CoverageMethodParenthesesWhitespaceTest', - 'testSomething' - ) + array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)), + PHPUnit_Util_Test::getLinesToBeCovered( + 'CoverageMethodParenthesesWhitespaceTest', + 'testSomething' + ) ); } diff --git a/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php b/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php index 8cf3072..f641a83 100644 --- a/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php +++ b/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php @@ -107,9 +107,7 @@ public function testAssertValidKeysInvalidKey() try { $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid); $this->fail(); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Unknown key(s): testD', $e->getMessage()); } } @@ -122,9 +120,7 @@ public function testAssertValidKeysInvalidKeys() try { $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid); $this->fail(); - } - - catch (PHPUnit_Framework_Exception $e) { + } catch (PHPUnit_Framework_Exception $e) { $this->assertEquals('Unknown key(s): testD, testE', $e->getMessage()); } } @@ -345,14 +341,12 @@ public function testPrepareString($char) try { $dom->loadXML($xml); - } - - catch (Exception $e) { + } catch (Exception $e) { } $this->assertNull($e, sprintf( - 'PHPUnit_Util_XML::prepareString("\x%02x") should not crash DomDocument', - ord($char) + 'PHPUnit_Util_XML::prepareString("\x%02x") should not crash DomDocument', + ord($char) )); } diff --git a/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php index e35831c..b12b41a 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php @@ -42,7 +42,9 @@ * @since File available since Release 2.3.0 */ -class BankAccountException extends RuntimeException {} +class BankAccountException extends RuntimeException +{ +} /** * A bank account. diff --git a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php index bfe8875..5e0096c 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php @@ -80,9 +80,7 @@ public function testBalanceCannotBecomeNegative() { try { $this->ba->withdrawMoney(1); - } - - catch (BankAccountException $e) { + } catch (BankAccountException $e) { $this->assertEquals(0, $this->ba->getBalance()); return; @@ -100,9 +98,7 @@ public function testBalanceCannotBecomeNegative2() { try { $this->ba->depositMoney(-1); - } - - catch (BankAccountException $e) { + } catch (BankAccountException $e) { $this->assertEquals(0, $this->ba->getBalance()); return; diff --git a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php index 4a9a55a..79aa954 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php @@ -80,9 +80,7 @@ public function testBalanceCannotBecomeNegative() { try { $this->ba->withdrawMoney(1); - } - - catch (BankAccountException $e) { + } catch (BankAccountException $e) { $this->assertEquals(0, $this->ba->getBalance()); return; @@ -100,9 +98,7 @@ public function testBalanceCannotBecomeNegative2() { try { $this->ba->depositMoney(-1); - } - - catch (BankAccountException $e) { + } catch (BankAccountException $e) { $this->assertEquals(0, $this->ba->getBalance()); return; diff --git a/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php b/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php index f90f307..7753b28 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php @@ -8,4 +8,4 @@ public function endTest(PHPUnit_Framework_Test $test, $time) { $this->endCount++; } -} \ No newline at end of file +} diff --git a/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php b/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php index 95a7484..a837ae8 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php @@ -26,6 +26,10 @@ public function finalTeardown() self::$afterWasRun++; } - public function test1() {} - public function test2() {} + public function test1() + { + } + public function test2() + { + } } diff --git a/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php index 27a8b9c..f3af8ac 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php @@ -26,6 +26,10 @@ public static function finalClassTeardown() self::$afterClassWasRun++; } - public function test1() {} - public function test2() {} + public function test1() + { + } + public function test2() + { + } } diff --git a/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php index 1a839a2..70fab0b 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php @@ -6,5 +6,4 @@ public function testSomethingThatChangesTheCwd() chdir('../'); $this->assertTrue(true); } - } diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php index d7f7848..becc6c8 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php @@ -2,7 +2,7 @@ class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase { /** - * @covers ::globalFunction ( ) + * @covers ::globalFunction ( ) */ public function testSomething() { diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php index 185cddf..55d7f57 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php @@ -9,4 +9,3 @@ public function testSomething() $o->publicMethod(); } } - diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php index 7f67f4b..d1be1c6 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php +++ b/core/vendor/phpunit/phpunit/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/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php index 7c743db..4f1ed65 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php +++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php @@ -15,5 +15,4 @@ public function testSomething() $o = new Foo\CoveredClass; $o->publicMethod(); } - } diff --git a/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php b/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php index 4cb66b7..0e5ddc3 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php +++ b/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php @@ -1,4 +1,4 @@ array(false) ); } -} \ No newline at end of file +} diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php index fd86c8c..89676e8 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php @@ -1,5 +1,8 @@ assertStringMatchesFormatFile(__DIR__ . '/expectedFileFormat.txt', '...BAR...'); } - } diff --git a/core/vendor/phpunit/phpunit/tests/_files/FatalTest.php b/core/vendor/phpunit/phpunit/tests/_files/FatalTest.php index 85bdb19..4e1e0b0 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/FatalTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/FatalTest.php @@ -4,11 +4,10 @@ class FatalTest extends PHPUnit_Framework_TestCase { public function testFatalError() { - if(extension_loaded('xdebug')) { + if (extension_loaded('xdebug')) { xdebug_disable(); } non_existing_function(); } - } diff --git a/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php b/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php new file mode 100644 index 0000000..2dd4c44 --- /dev/null +++ b/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php @@ -0,0 +1,8 @@ +publicMethod(); } } - diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php index 79d1010..b336745 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php @@ -18,4 +18,3 @@ public function testSomething() $o->publicMethod(); } } - diff --git a/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php index 537603e..1e934c8 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php @@ -7,7 +7,8 @@ * @requires function testFuncClass * @requires extension testExtClass */ -class RequirementsClassDocBlockTest { +class RequirementsClassDocBlockTest +{ /** * @requires PHP 5.4 @@ -19,7 +20,4 @@ class RequirementsClassDocBlockTest { public function testMethod() { } - } - - diff --git a/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php index 0b4002d..b2c975e 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php +++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php @@ -140,8 +140,8 @@ public function testAlwaysSkip3() } /** - * @requires extension spl - * @requires OS .* + * @requires extension spl + * @requires OS .* */ public function testSpace() { diff --git a/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php b/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php index 0d97d78..7f458fe 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php +++ b/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php @@ -10,23 +10,28 @@ class SampleArrayAccess implements ArrayAccess { private $container; - public function __construct() { + public function __construct() + { $this->container = array(); } - public function offsetSet($offset, $value) { + public function offsetSet($offset, $value) + { if (is_null($offset)) { $this->container[] = $value; } else { $this->container[$offset] = $value; } } - public function offsetExists($offset) { + public function offsetExists($offset) + { return isset($this->container[$offset]); } - public function offsetUnset($offset) { + public function offsetUnset($offset) + { unset($this->container[$offset]); } - public function offsetGet($offset) { + public function offsetGet($offset) + { return isset($this->container[$offset]) ? $this->container[$offset] : null; } } diff --git a/core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html b/core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html deleted file mode 100644 index 41256da..0000000 --- a/core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - Login - - - - -
        -
      • Test LI 1
        • -
      • Test LI 2
        • -
      • Test LI 3
        • -
      -
        -
      • Test LI 4
        • -
      -
      -
      - My Subchild - My Child -
      - - Test Id Text -
      -
      - My Children -
      1
      -
      2
      -
      3
      -
      4
      -
      - - Test Class Text - - Login Logo - -
      - My test tag content -
      more text
      -
      -
      test
      - - diff --git a/core/vendor/phpunit/phpunit/tests/_files/Singleton.php b/core/vendor/phpunit/phpunit/tests/_files/Singleton.php index 2509efb..24dd6bd 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/Singleton.php +++ b/core/vendor/phpunit/phpunit/tests/_files/Singleton.php @@ -7,7 +7,7 @@ protected function __construct() { } - private final function __clone() + final private function __clone() { } diff --git a/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php b/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php index bae3655..9ed59f9 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php +++ b/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php @@ -1,5 +1,6 @@ data); } -} \ No newline at end of file +} diff --git a/core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php index 0f8af55..1d2a769 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php +++ b/core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php @@ -3,6 +3,6 @@ class ThrowExceptionTestCase extends PHPUnit_Framework_TestCase { public function test() { - throw new RuntimeException; + throw new RuntimeException('A runtime error occurred'); } } diff --git a/core/vendor/phpunit/phpunit/tests/_files/configuration.xml b/core/vendor/phpunit/phpunit/tests/_files/configuration.xml index 32e232c..13f5ee9 100644 --- a/core/vendor/phpunit/phpunit/tests/_files/configuration.xml +++ b/core/vendor/phpunit/phpunit/tests/_files/configuration.xml @@ -20,6 +20,7 @@ beStrictAboutTestsThatDoNotTestAnything="false" beStrictAboutOutputDuringTests="false" beStrictAboutTestSize="false" + beStrictAboutTodoAnnotatedTests="false" checkForUnintentionallyCoveredCode="false" verbose="false"> diff --git a/core/vendor/phpunit/phpunit/tests/bootstrap.php b/core/vendor/phpunit/phpunit/tests/bootstrap.php index bde9269..b146d7d 100644 --- a/core/vendor/phpunit/phpunit/tests/bootstrap.php +++ b/core/vendor/phpunit/phpunit/tests/bootstrap.php @@ -2,8 +2,8 @@ require __DIR__ . '/../vendor/autoload.php'; if (!ini_get('date.timezone') && !defined('HHVM_VERSION')) { - echo PHP_EOL . 'Error: PHPUnit\'s test suite requires the "date.timezone" runtime configuration to be set. Please check your php.ini.' . PHP_EOL; - exit(1); + echo PHP_EOL . 'Error: PHPUnit\'s test suite requires the "date.timezone" runtime configuration to be set. Please check your php.ini.' . PHP_EOL; + exit(1); } ini_set('precision', 14);