diff --git a/core/composer.json b/core/composer.json
index 4c2e76fe003ed26cfd0a553345be9b8d36e31e1a..c3b9317d3d5e7fd04ca36aa6cfa9c3943686173b 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.4.*",
"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 fe5dc0ae4b94bad6234a348bcb9f401ddda5092e..e256f14d0af8a627f9e377cb17acfe05f4728ad8 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": "1f4fc5da6d6a4621e96ce7d576455f4c",
"packages": [
{
"name": "doctrine/annotations",
@@ -1015,16 +1015,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.1.4",
+ "version": "4.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26"
+ "reference": "e90575c2bb86290d57a262862dab1da125431576"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a71c4842c5fb836d8b200624583b859ec34e8a26",
- "reference": "a71c4842c5fb836d8b200624583b859ec34e8a26",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e90575c2bb86290d57a262862dab1da125431576",
+ "reference": "e90575c2bb86290d57a262862dab1da125431576",
"shasum": ""
},
"require": {
@@ -1035,14 +1035,15 @@
"ext-spl": "*",
"php": ">=5.3.3",
"phpunit/php-code-coverage": "~2.0",
- "phpunit/php-file-iterator": "~1.3.1",
+ "phpunit/php-file-iterator": "~1.3.2",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "~1.0.2",
- "phpunit/phpunit-mock-objects": "~2.1",
+ "phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.0",
"sebastian/diff": "~1.1",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "~1.1",
"sebastian/exporter": "~1.0",
+ "sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
"symfony/yaml": "~2.0"
},
@@ -1055,7 +1056,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1.x-dev"
+ "dev-master": "4.4.x-dev"
}
},
"autoload": {
@@ -1064,10 +1065,6 @@
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "",
- "../../symfony/yaml/"
- ],
"license": [
"BSD-3-Clause"
],
@@ -1079,13 +1076,13 @@
}
],
"description": "The PHP Unit Testing framework.",
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://phpunit.de/",
"keywords": [
"phpunit",
"testing",
"xunit"
],
- "time": "2014-07-18 07:15:58"
+ "time": "2015-01-17 11:24:41"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -1503,6 +1500,57 @@
],
"time": "2014-09-10 00:51:36"
},
+ {
+ "name": "sebastian/global-state",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/global-state.git",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.2"
+ },
+ "suggest": {
+ "ext-uopz": "*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Snapshotting of global state",
+ "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "keywords": [
+ "global state"
+ ],
+ "time": "2014-10-06 09:23:50"
+ },
{
"name": "sebastian/version",
"version": "1.0.3",
diff --git a/core/vendor/composer/autoload_classmap.php b/core/vendor/composer/autoload_classmap.php
index 9f66986c9cf5b6db905add7de1bfc67c260f9200..39826c50f4a9dbae4906d2e9d2ad3c3e30ffff06 100644
--- a/core/vendor/composer/autoload_classmap.php
+++ b/core/vendor/composer/autoload_classmap.php
@@ -23,6 +23,7 @@
'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint.php',
'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/And.php',
'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php',
+ 'PHPUnit_Framework_Constraint_ArraySubset' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php',
'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Attribute.php',
'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Callback.php',
'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php',
@@ -32,6 +33,7 @@
'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Exception.php',
'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php',
'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php',
+ 'PHPUnit_Framework_Constraint_ExceptionMessageRegExp' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php',
'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/FileExists.php',
'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php',
'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsAnything.php',
@@ -64,8 +66,10 @@
'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Notice.php',
'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Warning.php',
'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception.php',
+ 'PHPUnit_Framework_ExceptionWrapper' => $vendorDir . '/phpunit/phpunit/src/Framework/ExceptionWrapper.php',
'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/src/Framework/ExpectationFailedException.php',
'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTest.php',
+ 'PHPUnit_Framework_IncompleteTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestCase.php',
'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
'PHPUnit_Framework_InvalidCoversTargetError' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php',
'PHPUnit_Framework_InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
@@ -113,6 +117,7 @@
'PHPUnit_Framework_RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTest.php',
+ 'PHPUnit_Framework_SkippedTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestCase.php',
'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestError.php',
'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php',
'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/src/Framework/SyntheticError.php',
@@ -140,8 +145,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 +159,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',
@@ -396,6 +400,11 @@
'SebastianBergmann\\Exporter\\Context' => $vendorDir . '/sebastian/exporter/src/Context.php',
'SebastianBergmann\\Exporter\\Exception' => $vendorDir . '/sebastian/exporter/src/Exception.php',
'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
+ 'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
+ 'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/Exception.php',
+ 'SebastianBergmann\\GlobalState\\Restorer' => $vendorDir . '/sebastian/global-state/src/Restorer.php',
+ 'SebastianBergmann\\GlobalState\\RuntimeException' => $vendorDir . '/sebastian/global-state/src/RuntimeException.php',
+ 'SebastianBergmann\\GlobalState\\Snapshot' => $vendorDir . '/sebastian/global-state/src/Snapshot.php',
'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php',
'Text_Template' => $vendorDir . '/phpunit/php-text-template/Text/Template.php',
diff --git a/core/vendor/composer/include_paths.php b/core/vendor/composer/include_paths.php
index b3ec291e3e3088968c7837366ef9787f34d69b33..2cc5bccfbd879334878c6ada2e3860058a9feca3 100644
--- a/core/vendor/composer/include_paths.php
+++ b/core/vendor/composer/include_paths.php
@@ -10,6 +10,4 @@
$vendorDir . '/phpunit/php-timer',
$vendorDir . '/phpunit/php-file-iterator',
$vendorDir . '/phpunit/php-code-coverage',
- $vendorDir . '/phpunit/phpunit',
- $vendorDir . '/symfony/yaml',
);
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 6104e35036b1b0fb801c3807338abdda85f40ff0..bc37a1572a4d6856dc3528a4fc2afbf3bfc19ca1 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -1141,82 +1141,6 @@
"xunit"
]
},
- {
- "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",
@@ -2674,5 +2598,131 @@
"feed",
"zf2"
]
+ },
+ {
+ "name": "sebastian/global-state",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/global-state.git",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.2"
+ },
+ "suggest": {
+ "ext-uopz": "*"
+ },
+ "time": "2014-10-06 09:23:50",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "description": "Snapshotting of global state",
+ "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "keywords": [
+ "global state"
+ ]
+ },
+ {
+ "name": "phpunit/phpunit",
+ "version": "4.4.2",
+ "version_normalized": "4.4.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/phpunit.git",
+ "reference": "e90575c2bb86290d57a262862dab1da125431576"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e90575c2bb86290d57a262862dab1da125431576",
+ "reference": "e90575c2bb86290d57a262862dab1da125431576",
+ "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.2",
+ "phpunit/php-text-template": "~1.2",
+ "phpunit/php-timer": "~1.0.2",
+ "phpunit/phpunit-mock-objects": "~2.3",
+ "sebastian/comparator": "~1.0",
+ "sebastian/diff": "~1.1",
+ "sebastian/environment": "~1.1",
+ "sebastian/exporter": "~1.0",
+ "sebastian/global-state": "~1.0",
+ "sebastian/version": "~1.0",
+ "symfony/yaml": "~2.0"
+ },
+ "suggest": {
+ "phpunit/php-invoker": "~1.1"
+ },
+ "time": "2015-01-17 11:24:41",
+ "bin": [
+ "phpunit"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.4.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "The PHP Unit Testing framework.",
+ "homepage": "https://phpunit.de/",
+ "keywords": [
+ "phpunit",
+ "testing",
+ "xunit"
+ ]
}
]
diff --git a/core/vendor/phpunit/phpunit/.gitignore b/core/vendor/phpunit/phpunit/.gitignore
index 5ec1d538507fc7cff67675440aaa83d6fdd29d17..65a2321ef379cdc02049bf236f01c3e36b912b04 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 d5ea485b8ae55a183fe28816e124e5ca5705095d..79b5a5abda929878cfaedfac4852e461aa413840 100644
--- a/core/vendor/phpunit/phpunit/.travis.yml
+++ b/core/vendor/phpunit/phpunit/.travis.yml
@@ -10,14 +10,21 @@ php:
- hhvm-nightly
matrix:
- allow_failures:
- - php: hhvm
+ allow_failures:
+ - php: hhvm
+ - php: hhvm-nightly
-before_script:
- - composer self-update
- - composer install --no-interaction --prefer-source --dev
+install:
+ - travis_retry composer install --no-interaction --prefer-source
+ - 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
+script:
+ - ./phpunit
+ - ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; exit 1; else echo "fail checked"; fi;
+ - xmllint --noout --schema phpunit.xsd phpunit.xml.dist
+ - xmllint --noout --schema phpunit.xsd tests/_files/configuration.xml
+ - xmllint --noout --schema phpunit.xsd tests/_files/configuration_empty.xml
+ - xmllint --noout --schema phpunit.xsd tests/_files/configuration_xinclude.xml -xinclude
notifications:
email: false
diff --git a/core/vendor/phpunit/phpunit/LICENSE b/core/vendor/phpunit/phpunit/LICENSE
index fe178b08358d9908c890de96aed8022f41d8f94a..32ddc8e09baae745bf3c45a8f518f64349910946 100644
--- a/core/vendor/phpunit/phpunit/LICENSE
+++ b/core/vendor/phpunit/phpunit/LICENSE
@@ -1,6 +1,6 @@
PHPUnit
-Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2001-2015, Sebastian Bergmann <sebastian@phpunit.de>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/phpunit/README.md b/core/vendor/phpunit/phpunit/README.md
index 6c6aaf1e073a2739564e20973ef5c8d48a580dba..c0c0d7ab4b17c33dca9c8ba24e5390956368d1c6 100644
--- a/core/vendor/phpunit/phpunit/README.md
+++ b/core/vendor/phpunit/phpunit/README.md
@@ -5,6 +5,7 @@ PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of
[](https://packagist.org/packages/phpunit/phpunit)
[](https://travis-ci.org/sebastianbergmann/phpunit)
[](https://www.versioneye.com/php/phpunit:phpunit/dev-master)
+[](https://www.versioneye.com/php/phpunit:phpunit/references)
## Installation
@@ -19,7 +20,7 @@ You can also immediately use the PHAR after you have downloaded it, of course:
wget https://phar.phpunit.de/phpunit.phar
php phpunit.phar
-Alternatively, you may use [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](http://phpunit.de/documentation.html) for details on how to do this.
+Alternatively, you may use [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](https://phpunit.de/documentation.html) for details on how to do this.
## Contribute
diff --git a/core/vendor/phpunit/phpunit/build.xml b/core/vendor/phpunit/phpunit/build.xml
index 176d07a183b071eebb042b81de9d61630fb0f290..482e49915dc4d8f63e1c7b0e32ff2500ac9cd5ee 100644
--- a/core/vendor/phpunit/phpunit/build.xml
+++ b/core/vendor/phpunit/phpunit/build.xml
@@ -20,6 +20,7 @@
<delete>
<fileset dir="${basedir}/build">
<include name="**/*.phar" />
+ <include name="**/*.phar.asc" />
</fileset>
</delete>
</target>
@@ -152,6 +153,21 @@
<exec executable="phpdox" />
</target>
+ <target name="signed-phar"
+ description="Create signed PHAR archive of PHPUnit and all its dependencies (release)"
+ depends="phar">
+ <exec executable="bash" outputproperty="version">
+ <arg value="-c" />
+ <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = ""; } {print $2}'" />
+ </exec>
+
+ <exec executable="gpg" failonerror="true">
+ <arg value="--armor" />
+ <arg value="--detach-sign" />
+ <arg path="${basedir}/build/phpunit-${version}.phar" />
+ </exec>
+ </target>
+
<target name="phar"
description="Create PHAR archive of PHPUnit and all its dependencies (release)"
depends="phar-prepare">
@@ -188,23 +204,24 @@
<exec executable="php">
<arg value="composer.phar"/>
<arg value="require"/>
- <arg value="phpunit/dbunit:1.3.*"/>
- <arg value="phpunit/phpunit-selenium:1.3.*"/>
- <arg value="phpunit/php-invoker:1.1.*"/>
+ <arg value="phpunit/dbunit:~1.3"/>
+ <arg value="phpunit/phpunit-selenium:~1.4"/>
+ <arg value="phpunit/php-invoker:~1.1"/>
</exec>
<move file="${basedir}/composer.json.bak" tofile="${basedir}/composer.json"/>
<exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
+ <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
+ <copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>
<copy todir="${basedir}/build/phar/php-code-coverage">
<fileset dir="${basedir}/vendor/phpunit/php-code-coverage/src">
<include name="**/*" />
</fileset>
</copy>
- <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
-
+ <copy file="${basedir}/vendor/phpunit/php-file-iterator/LICENSE" tofile="${basedir}/build/phar/php-file-iterator/LICENSE"/>
<copy todir="${basedir}/build/phar/php-file-iterator">
<fileset dir="${basedir}/vendor/phpunit/php-file-iterator/File">
<include name="**/*.php" />
@@ -212,6 +229,7 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/phpunit/php-text-template/LICENSE" tofile="${basedir}/build/phar/php-text-template/LICENSE"/>
<copy todir="${basedir}/build/phar/php-text-template">
<fileset dir="${basedir}/vendor/phpunit/php-text-template/Text">
<include name="**/*.php" />
@@ -219,6 +237,7 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/phpunit/php-timer/LICENSE" tofile="${basedir}/build/phar/php-timer/LICENSE"/>
<copy todir="${basedir}/build/phar/php-timer">
<fileset dir="${basedir}/vendor/phpunit/php-timer/PHP">
<include name="**/*.php" />
@@ -226,25 +245,28 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/phpunit/php-token-stream/LICENSE" tofile="${basedir}/build/phar/php-token-stream/LICENSE"/>
<copy todir="${basedir}/build/phar/php-token-stream">
- <fileset dir="${basedir}/vendor/phpunit/php-token-stream/PHP">
+ <fileset dir="${basedir}/vendor/phpunit/php-token-stream/src">
<include name="**/*.php" />
- <exclude name="**/Autoload.*" />
</fileset>
</copy>
+ <copy file="${basedir}/vendor/phpunit/phpunit-mock-objects/LICENSE" tofile="${basedir}/build/phar/phpunit-mock-objects/LICENSE"/>
<copy todir="${basedir}/build/phar/phpunit-mock-objects">
<fileset dir="${basedir}/vendor/phpunit/phpunit-mock-objects/src">
<include name="**/*" />
</fileset>
</copy>
+ <copy file="${basedir}/vendor/sebastian/comparator/LICENSE" tofile="${basedir}/build/phar/sebastian-comparator/LICENSE"/>
<copy todir="${basedir}/build/phar/sebastian-comparator">
<fileset dir="${basedir}/vendor/sebastian/comparator/src">
<include name="**/*.php" />
</fileset>
</copy>
+ <copy file="${basedir}/vendor/sebastian/diff/LICENSE" tofile="${basedir}/build/phar/sebastian-diff/LICENSE"/>
<copy todir="${basedir}/build/phar/sebastian-diff">
<fileset dir="${basedir}/vendor/sebastian/diff/src">
<include name="**/*.php" />
@@ -252,12 +274,14 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/sebastian/environment/LICENSE" tofile="${basedir}/build/phar/sebastian-environment/LICENSE"/>
<copy todir="${basedir}/build/phar/sebastian-environment">
<fileset dir="${basedir}/vendor/sebastian/environment/src">
<include name="**/*.php" />
</fileset>
</copy>
+ <copy file="${basedir}/vendor/sebastian/exporter/LICENSE" tofile="${basedir}/build/phar/sebastian-exporter/LICENSE"/>
<copy todir="${basedir}/build/phar/sebastian-exporter">
<fileset dir="${basedir}/vendor/sebastian/exporter/src">
<include name="**/*.php" />
@@ -265,6 +289,14 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/sebastian/global-state/LICENSE" tofile="${basedir}/build/phar/sebastian-global-state/LICENSE"/>
+ <copy todir="${basedir}/build/phar/sebastian-global-state">
+ <fileset dir="${basedir}/vendor/sebastian/global-state/src">
+ <include name="**/*.php" />
+ </fileset>
+ </copy>
+
+ <copy file="${basedir}/vendor/sebastian/version/LICENSE" tofile="${basedir}/build/phar/sebastian-version/LICENSE"/>
<copy todir="${basedir}/build/phar/sebastian-version">
<fileset dir="${basedir}/vendor/sebastian/version/src">
<include name="**/*.php" />
@@ -272,6 +304,14 @@
</fileset>
</copy>
+ <copy file="${basedir}/vendor/doctrine/instantiator/LICENSE" tofile="${basedir}/build/phar/doctrine-instantiator/LICENSE"/>
+ <copy todir="${basedir}/build/phar/doctrine-instantiator">
+ <fileset dir="${basedir}/vendor/doctrine/instantiator/src">
+ <include name="**/*.php" />
+ </fileset>
+ </copy>
+
+ <copy file="${basedir}/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
<copy todir="${basedir}/build/phar/symfony">
<fileset dir="${basedir}/vendor/symfony">
<include name="**/*.php" />
diff --git a/core/vendor/phpunit/phpunit/build/phar-autoload.php.in b/core/vendor/phpunit/phpunit/build/phar-autoload.php.in
index 26660de64ac0ea3585b223a4348f33371055b19a..62d8f4966dc96d8da615b26f49d88a54a68a5442 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
<?php
-if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
- $phar = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
+if (__FILE__ == realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
+ $phar = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
+ $execute = true;
} else {
- $files = get_included_files();
- $phar = $files[0];
+ $files = get_included_files();
+ $phar = $files[0];
+ $execute = false;
}
define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', $phar));
@@ -31,12 +33,12 @@ spl_autoload_register(
Phar::mapPhar('___PHAR___');
-if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
- print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
- exit;
-}
+if ($execute) {
+ if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
+ print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
+ exit;
+ }
-if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
PHPUnit_TextUI_Command::main();
}
diff --git a/core/vendor/phpunit/phpunit/build/travis-ci-fail.xml b/core/vendor/phpunit/phpunit/build/travis-ci-fail.xml
new file mode 100644
index 0000000000000000000000000000000000000000..45869893bbfa640581c5341ce253a6c5920c31b1
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/build/travis-ci-fail.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
+ bootstrap="../tests/bootstrap.php"
+ backupGlobals="false"
+ verbose="true">
+ <testsuites>
+ <testsuite name="small">
+ <directory suffix=".phpt">../tests/Fail</directory>
+ </testsuite>
+ </testsuites>
+
+ <php>
+ <const name="PHPUNIT_TESTSUITE" value="true"/>
+ </php>
+</phpunit>
diff --git a/core/vendor/phpunit/phpunit/build/travis-ci.xml b/core/vendor/phpunit/phpunit/build/travis-ci.xml
deleted file mode 100644
index bf237feceace562834028de164e646e3c04a7f2d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/build/travis-ci.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
- bootstrap="../tests/bootstrap-travis.php"
- backupGlobals="false"
- verbose="true">
- <testsuites>
- <testsuite name="small">
- <directory suffix="Test.php">../tests/Framework</directory>
- <directory suffix="Test.php">../tests/Extensions</directory>
- <directory suffix="Test.php">../tests/Runner</directory>
- <directory suffix="Test.php">../tests/Util</directory>
- </testsuite>
-
- <testsuite name="large">
- <directory suffix=".phpt">../tests/TextUI</directory>
- <directory suffix=".phpt">../tests/Regression</directory>
- </testsuite>
- </testsuites>
-
- <php>
- <const name="PHPUNIT_TESTSUITE" value="true"/>
- </php>
-</phpunit>
-
diff --git a/core/vendor/phpunit/phpunit/composer.json b/core/vendor/phpunit/phpunit/composer.json
index bf04caf5b97a1b55f92d55e76c6f8ad60752fce5..756e1ff143ffe19c9401a8f134c497e0f7462def 100644
--- a/core/vendor/phpunit/phpunit/composer.json
+++ b/core/vendor/phpunit/phpunit/composer.json
@@ -7,7 +7,7 @@
"xunit",
"testing"
],
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://phpunit.de/",
"license": "BSD-3-Clause",
"authors": [
{
@@ -22,16 +22,17 @@
},
"require": {
"php": ">=5.3.3",
- "phpunit/php-file-iterator": "~1.3.1",
+ "phpunit/php-file-iterator": "~1.3.2",
"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.3",
"symfony/yaml": "~2.0",
"sebastian/comparator": "~1.0",
"sebastian/diff": "~1.1",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "~1.1",
"sebastian/exporter": "~1.0",
+ "sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
"ext-dom": "*",
"ext-json": "*",
@@ -64,11 +65,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "4.1.x-dev"
+ "dev-master": "4.4.x-dev"
}
- },
- "include-path": [
- "",
- "../../symfony/yaml/"
- ]
+ }
}
diff --git a/core/vendor/phpunit/phpunit/phpunit b/core/vendor/phpunit/phpunit/phpunit
index 44f3c6d931bb630fada89c61719d522758dfd18a..11f3cd5d8602ab3a39e5e0c10fd975c9c3fae408 100755
--- a/core/vendor/phpunit/phpunit/phpunit
+++ b/core/vendor/phpunit/phpunit/phpunit
@@ -1,53 +1,34 @@
#!/usr/bin/env php
<?php
-/* PHPUnit
+/*
+ * This file is part of PHPUnit.
*
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
-foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+if (!ini_get('date.timezone')) {
+ ini_set('date.timezone', 'UTC');
+}
+
+foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
if (file_exists($file)) {
define('PHPUNIT_COMPOSER_INSTALL', $file);
break;
}
}
+unset($file);
+
if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
- die(
+ fwrite(STDERR,
'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
);
+ 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 50966d7cb69a45895215ea81385f58346ac45db2..e07332e6a77a86d1f90b361c6008e2c2cf2f77b6 100644
--- a/core/vendor/phpunit/phpunit/phpunit.xml.dist
+++ b/core/vendor/phpunit/phpunit/phpunit.xml.dist
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
bootstrap="tests/bootstrap.php"
backupGlobals="false"
verbose="true">
@@ -18,10 +18,6 @@
</testsuite>
</testsuites>
- <logging>
- <log type="coverage-html" target="build/coverage"/>
- </logging>
-
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src</directory>
diff --git a/core/vendor/phpunit/phpunit/phpunit.xsd b/core/vendor/phpunit/phpunit/phpunit.xsd
index 0f46f111d08b52b5dfb6bf80e47985416a0655a3..63078222d25476a6af8a3ae3698a803be4bd18ae 100644
--- a/core/vendor/phpunit/phpunit/phpunit.xsd
+++ b/core/vendor/phpunit/phpunit/phpunit.xsd
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<xs:annotation>
- <xs:documentation source="http://www.phpunit.de/manual/4.1/en/appendixes.configuration.html">
- This Schema file defines the rules by which the XML configuration file of PHPUnit 4.1 may be structured.
+ <xs:documentation source="https://phpunit.de/manual/4.4/en/appendixes.configuration.html">
+ This Schema file defines the rules by which the XML configuration file of PHPUnit 4.4 may be structured.
</xs:documentation>
<xs:appinfo source="http://www.phpunit.de/manual/current/en/appendixes.configuration.html"/>
</xs:annotation>
@@ -35,6 +35,7 @@
<xs:complexType name="whiteListType">
<xs:complexContent>
<xs:extension base="filterType">
+ <xs:attribute name="addUncoveredFilesFromWhitelist" default="false" type="xs:boolean"/>
<xs:attribute name="processUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
</xs:extension>
</xs:complexContent>
@@ -116,6 +117,7 @@
<xs:enumeration value="coverage-html"/>
<xs:enumeration value="coverage-text"/>
<xs:enumeration value="coverage-clover"/>
+ <xs:enumeration value="coverage-crap4j"/>
<xs:enumeration value="json"/>
<xs:enumeration value="plain"/>
<xs:enumeration value="tap"/>
@@ -204,6 +206,7 @@
<xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="false"/>
<xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
<xs:attribute name="beStrictAboutTestSize" type="xs:boolean" default="false"/>
+ <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
<xs:attribute name="checkForUnintentionallyCoveredCode" type="xs:boolean" default="false"/>
<xs:attribute name="strict" type="xs:boolean" default="false"/>
<xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
@@ -212,6 +215,7 @@
<xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
<xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
<xs:attribute name="verbose" type="xs:boolean" default="false"/>
+ <xs:attribute name="stderr" type="xs:boolean" default="false"/>
</xs:attributeGroup>
<xs:group name="configGroup">
<xs:all>
@@ -241,7 +245,7 @@
<xs:element name="testsuites" type="testSuitesType" substitutionGroup="testSuiteFacet"/>
<xs:complexType name="testSuitesType">
<xs:sequence>
- <xs:element name="testsuite" type="testSuiteType"/>
+ <xs:element name="testsuite" type="testSuiteType" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="testSuiteType">
diff --git a/core/vendor/phpunit/phpunit/src/Exception.php b/core/vendor/phpunit/phpunit/src/Exception.php
index 9ea7dc29303d5588835cce8eb0dd3d57e94ce010..6ec587e88619654242968d66ec64528107651c60 100644
--- a/core/vendor/phpunit/phpunit/src/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Exception.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 4.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
index 9735a82924d338f068e121313e68d087bc408595..9cf23b2caf8ea74fc6d0f681c0bd4fce19bb4a49 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Extensions
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -58,7 +23,7 @@
* @package PHPUnit
* @subpackage Extensions
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -76,14 +41,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 49fbd96e19beda6101572c1fec7e6117b24cb460..7f074494182188c0b97e8bb4b081b4586b8a9398 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Extensions_PhptTestCase
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Extensions_PhptTestCase
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.4
@@ -102,10 +67,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
+ )
);
}
@@ -166,14 +131,17 @@ public function run(PHPUnit_Framework_TestResult $result = null)
if (isset($sections['EXPECT'])) {
$assertion = 'assertEquals';
- $expected = preg_replace('/\r\n/', "\n", trim($sections['EXPECT']));
+ $expected = $sections['EXPECT'];
} else {
$assertion = 'assertStringMatchesFormat';
- $expected = trim($sections['EXPECTF']);
+ $expected = $sections['EXPECTF'];
}
+ $output = preg_replace('/\r\n/', "\n", trim($jobResult['stdout']));
+ $expected = preg_replace('/\r\n/', "\n", trim($expected));
+
try {
- PHPUnit_Framework_Assert::$assertion($expected, trim($jobResult['stdout']));
+ PHPUnit_Framework_Assert::$assertion($expected, $output);
} catch (PHPUnit_Framework_AssertionFailedError $e) {
$result->addFailure($this, $e, $time);
} catch (Exception $e) {
@@ -242,15 +210,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/PhptTestSuite.php b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
index f0b4b3ff3204fb8a2038315467cc222b481e61f0..fc5aed69d1264d38649fdf5ead05cbb8343a1163 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Extensions_PhptTestCase
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Extensions_PhptTestCase
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.4
diff --git a/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
index 65efc6707b240e33d914c94e9529f399551873c0..0e05af7e28680333e173bfb0fc267b8e8de4a700 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -80,13 +46,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 +60,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/Extensions/TestDecorator.php b/core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
index e3ec809bd03600db31a6bf84a599f2afe7df5a42..e30b2a2227c8769c55941ee52b830520bb491328 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Extensions
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -53,7 +18,7 @@
* @package PHPUnit
* @subpackage Extensions
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php b/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
index 48782c7086313d91abecc966b8e3fe616aaa2f58..7f6f461825cd37324fe55304aacfc2576e9d2387 100644
--- a/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
@@ -1,48 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Extensions_TicketListener
- * @author Sean Coates <sean@caedmon.net>
- * @author Raphael Stolt <raphael.stolt@gmail.com>
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +15,7 @@
* @subpackage Extensions_TicketListener
* @author Sean Coates <sean@caedmon.net>
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Assert.php b/core/vendor/phpunit/phpunit/src/Framework/Assert.php
index 8b1b1f5ff244e360758dd778173e452eea80fc69..9543893d154f428113267c29337fd77ff9ec6e4e 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Assert.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Assert.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -67,19 +32,21 @@ abstract class PHPUnit_Framework_Assert
* @param mixed $key
* @param array|ArrayAccess $array
* @param string $message
- * @since Method available since Release 3.0.0
+ * @since Method available since Release 3.0.0
*/
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'
);
}
@@ -88,6 +55,34 @@ public static function assertArrayHasKey($key, $array, $message = '')
self::assertThat($array, $constraint, $message);
}
+ /**
+ * Asserts that an array has a specified subset.
+ *
+ * @param array|ArrayAccess $subset
+ * @param array|ArrayAccess $array
+ * @param boolean $strict Check for object identity
+ * @param string $message
+ * @since Method available since Release 4.4.0
+ */
+ public static function assertArraySubset($subset, $array, $strict = false, $message = '')
+ {
+ if (!is_array($subset)) {
+ throw PHPUnit_Util_InvalidArgumentHelper::factory(
+ 1, 'array or ArrayAccess'
+ );
+ }
+
+ if (!is_array($array)) {
+ throw PHPUnit_Util_InvalidArgumentHelper::factory(
+ 2, 'array or ArrayAccess'
+ );
+ }
+
+ $constraint = new PHPUnit_Framework_Constraint_ArraySubset($subset, $strict);
+
+ self::assertThat($array, $constraint, $message);
+ }
+
/**
* Asserts that an array does not have a specified key.
*
@@ -100,18 +95,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 +130,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 +165,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 +190,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 +229,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 +252,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 +262,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 +283,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 +312,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 +333,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 +343,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 +369,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 +396,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 +415,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 +441,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 +460,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 +480,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 +505,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 +530,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 +557,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 +591,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 +620,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 +650,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 +667,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 +685,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 +716,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 +747,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 +770,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 +797,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 +823,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 +849,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 +891,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 +990,7 @@ public static function assertClassHasAttribute($attributeName, $className, $mess
}
$constraint = new PHPUnit_Framework_Constraint_ClassHasAttribute(
- $attributeName
+ $attributeName
);
self::assertThat($className, $constraint, $message);
@@ -998,7 +1019,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 +1048,7 @@ public static function assertClassHasStaticAttribute($attributeName, $className,
}
$constraint = new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
- $attributeName
+ $attributeName
);
self::assertThat($className, $constraint, $message);
@@ -1056,9 +1077,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 +1108,7 @@ public static function assertObjectHasAttribute($attributeName, $object, $messag
}
$constraint = new PHPUnit_Framework_Constraint_ObjectHasAttribute(
- $attributeName
+ $attributeName
);
self::assertThat($object, $constraint, $message);
@@ -1116,7 +1137,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 +1158,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 +1177,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 +1198,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 +1217,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 +1256,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 +1295,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 +1334,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 +1373,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 +1420,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 +1449,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 +1478,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 +1526,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 +1549,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 +1572,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 +1599,7 @@ public static function assertStringStartsWith($prefix, $string, $message = '')
}
$constraint = new PHPUnit_Framework_Constraint_StringStartsWith(
- $prefix
+ $prefix
);
self::assertThat($string, $constraint, $message);
@@ -1603,7 +1624,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 +1672,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);
@@ -1805,39 +1826,42 @@ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXm
*/
public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
{
+ $expectedElement = clone $expectedElement;
+ $actualElement = clone $actualElement;
+
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 +1871,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 +1906,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 <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
+ * @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 +1934,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 <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
+ * @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 +1963,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 <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
+ * @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 +1998,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 +2160,12 @@ public static function assertSelectEquals($selector, $content, $count, $actual,
* @since Method available since Release 3.3.0
* @author Mike Naberezny <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
+ * @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 +2186,12 @@ public static function assertTag($matcher, $actual, $message = '', $isHtml = tru
* @since Method available since Release 3.3.0
* @author Mike Naberezny <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
+ * @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 +2283,7 @@ public static function assertJsonStringEqualsJsonFile($expectedFile, $actualJson
// call constraint
$constraint = new PHPUnit_Framework_Constraint_JsonMatches(
- $expectedJson
+ $expectedJson
);
self::assertThat($actualJson, $constraint, $message);
@@ -2258,7 +2306,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 +2332,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 +2361,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 +2507,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 +2578,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 +2603,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 +2660,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 +2675,7 @@ public static function greaterThanOrEqual($value)
public static function classHasAttribute($attributeName)
{
return new PHPUnit_Framework_Constraint_ClassHasAttribute(
- $attributeName
+ $attributeName
);
}
@@ -2633,7 +2690,7 @@ public static function classHasAttribute($attributeName)
public static function classHasStaticAttribute($attributeName)
{
return new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
- $attributeName
+ $attributeName
);
}
@@ -2647,7 +2704,7 @@ public static function classHasStaticAttribute($attributeName)
public static function objectHasAttribute($attributeName)
{
return new PHPUnit_Framework_Constraint_ObjectHasAttribute(
- $attributeName
+ $attributeName
);
}
@@ -2711,8 +2768,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 +2877,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 +2940,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 +2998,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 041ce201b5850a7b9a1af74bcd31845e2e5c2bb3..edc5f83fe9242f71bd1b2cf3668c90b8f50af050 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -53,8 +18,8 @@
function any()
{
return call_user_func_array(
- 'PHPUnit_Framework_TestCase::any',
- func_get_args()
+ 'PHPUnit_Framework_TestCase::any',
+ func_get_args()
);
}
@@ -67,8 +32,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 +47,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 +63,25 @@ 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()
+ );
+}
+
+/**
+ * Asserts that an array has a specified subset.
+ *
+ * @param array|ArrayAccess $subset
+ * @param array|ArrayAccess $array
+ * @param boolean $strict Check for object identity
+ * @param string $message
+ * @since Method available since Release 4.4.0
+ */
+function assertArraySubset($subset, $array, $strict = false, $message = '')
+{
+ return call_user_func_array(
+ 'PHPUnit_Framework_Assert::assertArraySubset',
+ func_get_args()
);
}
@@ -114,8 +96,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 +117,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 +136,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 +154,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 +171,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 +191,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 +208,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 +225,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 +242,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 +259,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 +276,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 +293,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 +314,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 +334,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 +352,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 +369,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 +389,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 +406,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 +423,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 +440,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 +457,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 +473,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 +489,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 +505,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 +521,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 +540,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 +557,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 +572,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 +587,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 +602,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 +620,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 +639,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 +654,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 +669,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 +688,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 +703,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 +722,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 +737,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 +753,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 +769,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 +785,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 +801,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 +816,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 +831,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 +846,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 +861,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 +876,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 +891,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 +906,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 +922,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 +938,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 +957,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 +974,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 +989,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 +1004,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 +1024,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 +1040,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 +1056,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 +1071,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 +1085,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 +1101,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 +1118,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 +1134,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 +1156,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 +1170,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 +1186,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 +1202,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 +1217,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 +1234,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 +1250,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 +1282,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 +1304,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 +1326,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 +1342,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 +1358,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 +1377,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 +1393,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 +1409,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 +1428,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 +1444,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 +1460,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 +1476,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 +1492,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 +1637,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 +1653,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 +1668,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 +1684,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 +1700,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 +1716,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 +1732,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 +1748,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 +1764,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 +1780,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 +1795,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 +1811,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 +1833,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 +1847,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 +1862,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 +1878,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 +1896,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 +1912,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 +1927,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 +1946,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 +1962,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 +1976,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 +1991,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 +2008,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 +2023,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 +2037,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 +2051,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 +2066,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 +2080,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 +2094,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 +2108,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 +2123,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 +2138,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 +2155,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 +2169,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 +2184,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 +2198,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 +2212,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 +2227,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 +2242,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 +2257,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 +2272,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 +2285,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 +2300,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 +2315,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 +2330,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 +2346,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 +2361,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 +2376,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 +2392,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 +2407,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 +2422,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 +2437,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/AssertionFailedError.php b/core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
index 27ca6c925805b27b4959865ea616535749aeb252..4c0d137145e6ca1eceed423a2df315ecd2198bb5 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
index c787d6d1c6c7d11e6deff4044429c0fdc6bf6676..4996386a586212c9737b5a19d5d9770b47df050d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Giorgio Sironi <info@giorgiosironi.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,28 +16,46 @@
* @package PHPUnit
* @subpackage Framework
* @author Giorgio Sironi<info@giorgiosironi.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
*/
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/CodeCoverageException.php b/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
index eee14645bece91c4404462ccb0e272caacd8c5ec..7019cca3dee6934e1729707a799f0bb5b23f142d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php
index 8e9a888e0553e7adcc9fd5227d6c38c54e877390..63d3b08121aa1c05fbb264d0770462b41d6ad07e 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
use SebastianBergmann\Exporter\Exporter;
@@ -53,7 +17,7 @@
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -136,8 +100,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 +115,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 28ecc958e096c40429602be99e2bc9c3a5dd2968..97dead46ac8edf81ada7712c1e48831d5a9f58f9 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -79,8 +43,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/ArrayHasKey.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
index 56b5b3b3c484424a0addbed91db8de2462835944..fc4a280ec6715f6ef74e6aa4ff7b0f7b1141d998 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -56,7 +20,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbf28ca6854720d9b4c1ace4512f283b459ab2d8
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Constraint that asserts that the array it is evaluated for has a specified subset.
+ *
+ * Uses array_replace_recursive() to check if a key value subset is part of the
+ * subject array.
+ *
+ * @package PHPUnit
+ * @subpackage Framework_Constraint
+ * @author Márcio Almada <marcio3w@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.4.0
+ */
+class PHPUnit_Framework_Constraint_ArraySubset extends PHPUnit_Framework_Constraint
+{
+ /**
+ * @var array|ArrayAccess
+ */
+ protected $subset;
+
+ /**
+ * @var boolean
+ */
+ protected $strict;
+
+ /**
+ * @param array|ArrayAccess $subset
+ * @param boolean $strict Check for object identity
+ */
+ public function __construct($subset, $strict = false)
+ {
+ parent::__construct();
+ $this->strict = $strict;
+ $this->subset = $subset;
+ }
+
+ /**
+ * Evaluates the constraint for parameter $other. Returns true if the
+ * constraint is met, false otherwise.
+ *
+ * @param array|ArrayAccess $other Array or ArrayAcess object to evaluate.
+ * @return bool
+ */
+ protected function matches($other)
+ {
+ $patched = array_replace_recursive($other, $this->subset);
+
+ if ($this->strict) {
+ return $other === $patched;
+ } else {
+ return $other == $patched;
+ }
+ }
+
+ /**
+ * Returns a string representation of the constraint.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'has the subset ' . $this->exporter->export($this->subset);
+ }
+
+ /**
+ * Returns the description of the failure
+ *
+ * The beginning of failure messages is "Failed asserting that" in most
+ * cases. This method should return the second part of that sentence.
+ *
+ * @param mixed $other Evaluated value or object.
+ * @return string
+ */
+ protected function failureDescription($other)
+ {
+ return 'an array ' . $this->toString();
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
index 822ed1885f4ef7d163b55e671a94cea8a1a83768..48f81949c6d81a02d6960923b82ff17d727d64d6 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
@@ -1,62 +1,23 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
- *
- *
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
*/
-
class PHPUnit_Framework_Constraint_Attribute extends PHPUnit_Framework_Constraint_Composite
{
/**
@@ -94,11 +55,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 e0f49760f573d47adf60e02cb061c89fdfc45249..690c58ceb474138d09f3d57179166382f531c965 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
- * @link http://www.phpunit.de/
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Timon Rapp <timon@zaeda.net>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
*/
@@ -65,7 +31,8 @@ public function __construct($callback)
{
if (!is_callable($callback)) {
throw PHPUnit_Util_InvalidArgumentHelper::factory(
- 1, 'callable'
+ 1,
+ 'callable'
);
}
@@ -95,22 +62,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 5f387f56790838759c0d4c9c74235798eca95321..54edf011715115aa27a49d711d1208eb90c10c4f 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +18,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
@@ -97,9 +61,8 @@ protected function matches($other)
public function toString()
{
return sprintf(
- 'has attribute "%s"',
-
- $this->attributeName
+ 'has attribute "%s"',
+ $this->attributeName
);
}
@@ -115,11 +78,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 5aa0f8943e35ba6f8e63a76c306262a6f5e6154e..47a982ae6100771bc9e8e7bc1ec85b7bdc9079dc 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +18,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
@@ -90,9 +54,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 d0aaa37ad1d4ccd8594414945c14f62fdc6ff76f..34f39e7cbe5b90c06eaaaa1ca0bd9a00e1999aab 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
@@ -1,60 +1,23 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
- *
- *
* @package PHPUnit
* @subpackage Framework_Constraint
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
+ * @since Class available since Release 3.1.0
*/
-
abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_Constraint
{
/**
@@ -64,7 +27,6 @@ abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_
/**
* @param PHPUnit_Framework_Constraint $innerConstraint
- * @param string $attributeName
*/
public function __construct(PHPUnit_Framework_Constraint $innerConstraint)
{
@@ -92,9 +54,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 943c3cb7daa87e7e8fad6c1abfdc2d36a26f8c74..d7c48b18dd953893ee9e9fe40e70529f0973ce1c 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
@@ -92,9 +56,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 +70,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 +91,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
);
}
@@ -141,6 +102,9 @@ protected function failureDescription($other)
*/
public function toString()
{
- return 'count matches ';
+ return sprintf(
+ 'count matches %d',
+ $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 dc6efdefccfff29f509ec1da4734917950954359..cc3e84db6dc0bf335a0bdec5e1f1525e73e554fd 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.6
@@ -101,18 +66,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 +87,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 8a4e7cc0fee6f1167597dc1ce81433a5166030e9..6fecf99abd3429c9db3e8acf0b28b098ff6acc91 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.6
@@ -94,9 +59,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 407a5f60a54761e07e33e698dfcc858d658d89f7..2382891447b68b41a4b6eedca3f0138a18df04af 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.6
@@ -94,9 +59,9 @@ protected function matches($other)
protected function failureDescription($other)
{
return sprintf(
- "exception message '%s' contains '%s'",
- $other->getMessage(),
- $this->expectedMessage
+ "exception message '%s' contains '%s'",
+ $other->getMessage(),
+ $this->expectedMessage
);
}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php
new file mode 100644
index 0000000000000000000000000000000000000000..f520c8e10152e09fa89eec734be5312c0e23a872
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package PHPUnit
+ * @subpackage Framework_Constraint
+ * @author Márcio Almada <marcio3w@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.3.0
+ */
+class PHPUnit_Framework_Constraint_ExceptionMessageRegExp extends PHPUnit_Framework_Constraint
+{
+ /**
+ * @var integer
+ */
+ protected $expectedMessageRegExp;
+
+ /**
+ * @param string $expected
+ */
+ public function __construct($expected)
+ {
+ parent::__construct();
+ $this->expectedMessageRegExp = $expected;
+ }
+
+ /**
+ * Evaluates the constraint for parameter $other. Returns true if the
+ * constraint is met, false otherwise.
+ *
+ * @param Exception $other
+ * @return boolean
+ */
+ protected function matches($other)
+ {
+ $match = PHPUnit_Util_Regex::pregMatchSafe($this->expectedMessageRegExp, $other->getMessage());
+
+ if (false === $match) {
+ throw new PHPUnit_Framework_Exception (
+ "Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'"
+ );
+ }
+
+ return 1 === $match;
+ }
+
+ /**
+ * Returns the description of the failure
+ *
+ * The beginning of failure messages is "Failed asserting that" in most
+ * cases. This method should return the second part of that sentence.
+ *
+ * @param mixed $other Evaluated value or object.
+ * @return string
+ */
+ protected function failureDescription($other)
+ {
+ return sprintf(
+ "exception message '%s' matches '%s'",
+ $other->getMessage(),
+ $this->expectedMessageRegExp
+ );
+ }
+
+ /**
+ * @return string
+ */
+ public function toString()
+ {
+ return "exception message matches ";
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
index 4e43e13daef1c4715d850dc602fd1524773b4aa0..ec32b9048d6a608097953b38d86ac1d6b943969d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -53,7 +17,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -84,9 +48,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/GreaterThan.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
index 628bf0b30c496f8914ec4b6831cb95d489094195..85a0ed74ee45238ed7d0210a21eb678a11d35a02 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
index c7a65e643974f14e5e17c8fbd2b37123514772a5..ea920f2a7c0a53d3fdb044c701c79b7c1d6440bc 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
index cbd9b860a4b0fc2d840416660e48a63376b343d5..9a7985bfded262ef52593afab92740a184d01dc1 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -98,11 +62,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 cd7a0c0b59081bd647044981a95abe299b816d4a..185b211871e51ad322094a18006fad2043e1f7c1 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
@@ -1,48 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Kore Nordmann <kn@ez.no>
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -59,7 +22,7 @@
* @author Kore Nordmann <kn@ez.no>
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -153,15 +116,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 +133,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 +155,22 @@ public function toString()
return 'is equal to <text>';
} else {
return sprintf(
- 'is equal to <string:%s>',
-
- $this->value
+ 'is equal to <string:%s>',
+ $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/IsFalse.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
index bd76c4523509a4e375192b2d6b41012ec421dd12..c6d441aaf9b638437b77ae26b1d98a0b7fabde87 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
index d96952c6da4d4bd6a897812af885488a4a5c7fa7..f8c8697cf04fce3112d97e9df7a2df64d857094b 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -59,7 +23,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -121,10 +85,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 d288338c670c1d2350f215c544a1775b81c47485..24aa2ff00bc4babfbf735a5302343e8ff2bd9e70 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +18,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -99,10 +63,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 +78,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 f5f25ed3bfeaee851f464bb7f3cf28dfc4f872b5..c541d3e8b4933e1c5c7e0bf82fa2a7dcc5ca386f 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.20
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.7.20
@@ -86,14 +51,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/IsNull.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
index 06654f7485ac221ecdda3c5fd01b41b58d65df6d..7ee492c50b5e39f8de44da45321802f7f57d0088 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
index c00e60e9fed4ee28af6fc29f043612c5b9965290..1d15fb2d80f15106fbe00af2126ae21a34efca4e 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
index 3f6f4d0bbfa81cc4819b1ec0a35691c2d84819f6..3355f9c5e92b03e81c78734397d9c344ee065ee7 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +18,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -65,7 +29,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';
@@ -80,6 +44,7 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
'array' => true,
'boolean' => true,
'bool' => true,
+ 'double' => true,
'float' => true,
'integer' => true,
'int' => true,
@@ -107,11 +72,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 +95,50 @@ protected function matches($other)
switch ($this->type) {
case 'numeric': {
return is_numeric($other);
- }
+ }
case 'integer':
case 'int': {
return is_integer($other);
- }
+ }
+ case 'double':
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 +150,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.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
index d9e7eedcba4adc83c5cd45c7fc0b84a00b5c632a..410ba47d15489bfe366890109753c2081ea88fde 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
- * @link http://www.phpunit.de/
- * @since File available since Release 3.7.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
* @link http://www.phpunit.de/
* @since Class available since Release 3.7.0
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 8606fc6f314f1ba7548b64c13f88d25e45a09254..fb9202edc7a5d9e89bc7eaf6546c446c1f220794 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
- * @link http://www.phpunit.de/
- * @since File available since Release 3.7.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_Constraint
* @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
* @link http://www.phpunit.de/
* @since Class available since Release 3.7.0
@@ -60,6 +25,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/LessThan.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
index a47a91ce9d7125c923013615af4ab9b2598ce744..2aa3806bc046d850d3db1a2eb161a9f254b92261 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
index d34ca78608ae207f565b364710719ee99398a399..2779ec5a5a63c9a3bc5dc6daa533fba8739999d8 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,12 +15,11 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
*/
-
class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
{
/**
@@ -85,7 +48,7 @@ public function __construct($constraint)
public static function negate($string)
{
return str_replace(
- array(
+ array(
'contains ',
'exists',
'has ',
@@ -96,8 +59,8 @@ public static function negate($string)
'ends with ',
'reference ',
'not not '
- ),
- array(
+ ),
+ array(
'does not contain ',
'does not exist',
'does not have ',
@@ -108,8 +71,8 @@ public static function negate($string)
'ends not with ',
'don\'t reference ',
'not '
- ),
- $string
+ ),
+ $string
);
}
@@ -158,14 +121,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 +144,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/ObjectHasAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
index 46fab024e67e4577c04945b7f93f58f1700624b8..fa56a931db43f859875e830d381d141cef7856d2 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +18,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
index 9d879223ea1b97a59269b93aa4a52f36f14f1969..5b30f6b5292af7146437991e9326d05da89f149d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -73,7 +37,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 ee7787126e5d9c97bcb6a0697a4f32bc1d88e065..28d8dfb4202a962fd4339b3675c37de68a2a7107 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -57,7 +21,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -98,9 +62,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/SameSize.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
index f0a478aec4b28ed195e350c1c3f9a136c3940c8d..c41b53f5c38e9da1366b009f8e2275674ccd3623 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
index bf628a1601a2fa56d3b0211585867149509176d0..cde1e5fa9f26f8e344fef05c235852a1b0a3018e 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -57,7 +21,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -116,9 +80,8 @@ public function toString()
}
return sprintf(
- 'contains "%s"',
-
- $string
+ 'contains "%s"',
+ $string
);
}
}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
index 5a77f8acee3a580264411b3cd561eeb4bc6c8bbf..271762e6e5c2b5dd879bb215bcc9b61abeed8c99 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
index 234cd36d9abb79cfa8f7eeec706b1ca78c39fdad..6ac5156c95b0217d2a5037036f08613602118ca3 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
use SebastianBergmann\Diff\Differ;
@@ -53,7 +17,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -110,7 +74,7 @@ protected function additionalFailureDescription($other)
protected function createPatternFromFormat($string)
{
$string = str_replace(
- array(
+ array(
'%e',
'%s',
'%S',
@@ -122,8 +86,8 @@ protected function createPatternFromFormat($string)
'%x',
'%f',
'%c'
- ),
- array(
+ ),
+ array(
'\\' . DIRECTORY_SEPARATOR,
'[^\r\n]+',
'[^\r\n]*',
@@ -135,11 +99,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/StringStartsWith.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
index 20276c486a9fd44548e83793567e81003f7d63c2..3998a34d33f171b9546c6af2ce9970a3794b25ac 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
index cb74e1d2b4dacd517dc8de8c3af69c19345135f7..5ea3c2ae7ebf0bbbdfbd5e8bdd9074c343b28e83 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -159,10 +123,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 1116cf781f9c5cedb34cfc9556c49e519db32f9c..702a7a4c942849143cae48645ce7fd7e60551ade 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -52,7 +16,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.4
@@ -81,7 +45,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 187621594d8acd6335d5fd4a5d81bef1acb55175..8466c2ad4d39d90c63c6a627077f9bf42e5ca742 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Constraint
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @subpackage Framework_Constraint
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -73,7 +37,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/Error.php b/core/vendor/phpunit/phpunit/src/Framework/Error.php
index 65ced265cfdb49845c7b485a17ffb62589b54658..e0ac27891b39f6cde8770c6595fc7b9823e819ea 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Error.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,12 +14,12 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.2.0
*/
-class PHPUnit_Framework_Error extends Exception
+class PHPUnit_Framework_Error extends PHPUnit_Framework_Exception
{
/**
* Constructor.
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
index 30ebe0d77b672110f61e4a707760986d5cad31d4..c3e74063d165eedf77ac9035ba9f946d2f54e53c 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Error
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +19,7 @@
* @package PHPUnit
* @subpackage Framework_Error
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
index 3ea050994c952d4e7f350cbb1b77fc3ecdbfeeea..f7bc91ddb374cea50ab383406a19c4caf6667de7 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Error
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +19,7 @@
* @package PHPUnit
* @subpackage Framework_Error
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
index 569ae5fcec1fc83b2b5724b5c65a606e985cf01e..220b5029b4c6b4e296a03b567614c110870fe1d2 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_Error
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -54,7 +19,7 @@
* @package PHPUnit
* @subpackage Framework_Error
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Exception.php b/core/vendor/phpunit/phpunit/src/Framework/Exception.php
index 832b3a19b4f77247b26f2c186309939b1cffa9cd..5c19c1dcdb7b0a583856641e343bd950efa99137 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Exception.php
@@ -1,57 +1,84 @@
<?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
*
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base class for all PHPUnit Framework exceptions.
*
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * Ensures that exceptions thrown during a test run do not leave stray
+ * references behind.
*
- * * 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.
+ * Every Exception contains a stack trace. Each stack frame contains the 'args'
+ * of the called function. The function arguments can contain references to
+ * instantiated objects. The references prevent the objects from being
+ * destructed (until test results are eventually printed), so memory cannot be
+ * freed up.
*
- * * 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.
+ * With enabled process isolation, test results are serialized in the child
+ * process and unserialized in the parent process. The stack trace of Exceptions
+ * may contain objects that cannot be serialized or unserialized (e.g., PDO
+ * connections). Unserializing user-space objects from the child process into
+ * the parent would break the intended encapsulation of process isolation.
*
- * 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.
+ * @see http://fabien.potencier.org/article/9/php-serialization-stack-traces-and-exceptions
*
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
- */
-
-/**
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
*/
class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception
{
+ /**
+ * @var array
+ */
+ protected $serializableTrace;
+
+ public function __construct($message = '', $code = 0, Exception $previous = null)
+ {
+ parent::__construct($message, $code, $previous);
+
+ $this->serializableTrace = $this->getTrace();
+ foreach ($this->serializableTrace as $i => $call) {
+ unset($this->serializableTrace[$i]['args']);
+ }
+ }
+
+ /**
+ * Returns the serializable trace (without 'args').
+ *
+ * @return array
+ */
+ public function getSerializableTrace()
+ {
+ return $this->serializableTrace;
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ $string = PHPUnit_Framework_TestFailure::exceptionToString($this);
+
+ if ($trace = PHPUnit_Util_Filter::getFilteredStacktrace($this)) {
+ $string .= "\n" . $trace;
+ }
+
+ return $string;
+ }
+
+ public function __sleep()
+ {
+ return array_keys(get_object_vars($this));
+ }
}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php b/core/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ac77b2e5dbe759b4ecb0a6bc79f5f98e5a24ae8
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Wraps Exceptions thrown by code under test.
+ *
+ * Re-instantiates Exceptions thrown by user-space code to retain their original
+ * class names, properties, and stack traces (but without arguments).
+ *
+ * Unlike PHPUnit_Framework_Exception, the complete stack of previous Exceptions
+ * is processed.
+ *
+ * @package PHPUnit
+ * @subpackage Framework
+ * @author Daniel F. Kudwien <sun@unleashedmind.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.3.0
+ */
+class PHPUnit_Framework_ExceptionWrapper extends PHPUnit_Framework_Exception
+{
+ /**
+ * @var string
+ */
+ protected $classname;
+
+ /**
+ * @var PHPUnit_Framework_ExceptionWrapper|null
+ */
+ protected $previous;
+
+ public function __construct(Exception $e)
+ {
+ // PDOException::getCode() is a string.
+ // @see http://php.net/manual/en/class.pdoexception.php#95812
+ parent::__construct($e->getMessage(), (int) $e->getCode());
+
+ $this->classname = get_class($e);
+ $this->file = $e->getFile();
+ $this->line = $e->getLine();
+
+ $this->serializableTrace = $e->getTrace();
+ foreach ($this->serializableTrace as $i => $call) {
+ unset($this->serializableTrace[$i]['args']);
+ }
+
+ if ($e->getPrevious()) {
+ $this->previous = new self($e->getPrevious());
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function getClassname()
+ {
+ return $this->classname;
+ }
+
+ /**
+ * @return PHPUnit_Framework_ExceptionWrapper
+ */
+ public function getPreviousWrapped()
+ {
+ return $this->previous;
+ }
+
+ /**
+ * @return string
+ */
+ public function __toString()
+ {
+ $string = PHPUnit_Framework_TestFailure::exceptionToString($this);
+
+ if ($trace = PHPUnit_Util_Filter::getFilteredStacktrace($this)) {
+ $string .= "\n" . $trace;
+ }
+
+ if ($this->previous) {
+ $string .= "\nCaused by\n" . $this->previous;
+ }
+
+ return $string;
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php b/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
index 84eda51ec51edbc6dec34cf50bc2d2922c35ba98..612d7f0c5ac787fb6c12201c86cdaacd793d33d2 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -53,7 +18,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
index ed92f8a2b4e8aff7c200a53e25aaf922004de7be..271a9058090dec62509d06b7afc6f792394b9aa0 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
new file mode 100644
index 0000000000000000000000000000000000000000..225acb61a8ea530f0b800941bcddf83bf11de44e
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An incomplete test case
+ *
+ * @package PHPUnit
+ * @subpackage Framework
+ * @author Davey Shafik <me@daveyshafik.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.3.0
+ */
+class PHPUnit_Framework_IncompleteTestCase extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @var string
+ */
+ protected $message = '';
+
+ /**
+ * @var boolean
+ */
+ protected $backupGlobals = false;
+
+ /**
+ * @var boolean
+ */
+ protected $backupStaticAttributes = false;
+
+ /**
+ * @var boolean
+ */
+ protected $runTestInSeparateProcess = false;
+
+ /**
+ * @var boolean
+ */
+ protected $useErrorHandler = false;
+
+ /**
+ * @var boolean
+ */
+ protected $useOutputBuffering = false;
+
+ /**
+ * @param string $message
+ */
+ public function __construct($className, $methodName, $message = '')
+ {
+ $this->message = $message;
+ parent::__construct($className . '::' . $methodName);
+ }
+
+ /**
+ * @throws PHPUnit_Framework_Exception
+ */
+ protected function runTest()
+ {
+ $this->markTestIncomplete($this->message);
+ }
+
+ /**
+ * @return string
+ */
+ public function getMessage()
+ {
+ return $this->message;
+ }
+
+ /**
+ * Returns a string representation of the test case.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return $this->getName();
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
index 838b9858b4780917e31a338264252ab86ad21f8d..3990377135f256e7fdbdd6c0a38ff97b74ec63c7 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
index 3babf2dea2d48f45372bafafc9885ecad2a7bf1c..35bfd75850bfab4e251b61d8ba7bc5541530c76e 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
index 86ee3557f4e60264e9fcc42bc7a7e14117d67b85..5e67af5eb9f093884a010121e8fa2aef277b087d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/OutputError.php b/core/vendor/phpunit/phpunit/src/Framework/OutputError.php
index e198887b96974c8ca84a69c4688477e5e8d341c1..f15edaff026860ac20d0ede30e22503f876c81d0 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/OutputError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/OutputError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php b/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
index c1538e021593b2ac5157a4e4a8622255321bc8a6..0c8b653afa21a74d505fb985ac13f5dad5efffe9 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 4.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php b/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
index 0d96ba445fd5857f7378cf77d998a6a2c06c26e3..4f165df768b5a8fb3d3cbf38b281139cb68c5e6a 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php b/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
index 033ae85ac9e4e7707284dc5fcb5abd08730c683a..903806118aa015770bd0de655990069b3aef444f 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
index fa75648e63e10cf67ac259990ea42f8c8fb228f0..cede762fcf81939b8f9f7b2c054310eb8a88a562 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
new file mode 100644
index 0000000000000000000000000000000000000000..c698f4bd95d37fa68e871ec61507b8e951838a60
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A skipped test case
+ *
+ * @package PHPUnit
+ * @subpackage Framework
+ * @author Davey Shafik <me@daveyshafik.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.3.0
+ */
+class PHPUnit_Framework_SkippedTestCase extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @var string
+ */
+ protected $message = '';
+
+ /**
+ * @var boolean
+ */
+ protected $backupGlobals = false;
+
+ /**
+ * @var boolean
+ */
+ protected $backupStaticAttributes = false;
+
+ /**
+ * @var boolean
+ */
+ protected $runTestInSeparateProcess = false;
+
+ /**
+ * @var boolean
+ */
+ protected $useErrorHandler = false;
+
+ /**
+ * @var boolean
+ */
+ protected $useOutputBuffering = false;
+
+ /**
+ * @param string $message
+ */
+ public function __construct($className, $methodName, $message = '')
+ {
+ $this->message = $message;
+ parent::__construct($className . '::' . $methodName);
+ }
+
+ /**
+ * @throws PHPUnit_Framework_Exception
+ */
+ protected function runTest()
+ {
+ $this->markTestSkipped($this->message);
+ }
+
+ /**
+ * @return string
+ */
+ public function getMessage()
+ {
+ return $this->message;
+ }
+
+ /**
+ * Returns a string representation of the test case.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return $this->getName();
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
index 1f75c7bd494139d79526d87753d36c610de88920..95520f19bed2310013608fa587f4df7e656d2ae7 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
index 7e8added81a85ec601bcd1ce87e60891f47d843b..cfae4e81b0c26a4241e119ab1c2de461116d6f4b 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php b/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
index 0bf01521731b209e8092792ceb05dc29a864a2b2..c292b53ac660e33d50808674b9086e7ae644b4a2 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Test.php b/core/vendor/phpunit/phpunit/src/Framework/Test.php
index e68314d82c19e698b82ec38edf91ecbeaaec5546..03bc44b5b78e1a0a3283552e9a9dcf7c3d8d561d 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Test.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Test.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestCase.php b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php
old mode 100755
new mode 100644
index 6cd872820c7cfd2d4e24652d1861c87b11d64440..dcec654b212d139bb719508d9af9ec46b8b636e2
--- a/core/vendor/phpunit/phpunit/src/Framework/TestCase.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php
@@ -1,48 +1,19 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+use SebastianBergmann\GlobalState\Snapshot;
+use SebastianBergmann\GlobalState\Restorer;
+use SebastianBergmann\GlobalState\Blacklist;
+use SebastianBergmann\Exporter\Context;
+use SebastianBergmann\Exporter\Exporter;
+
/**
* A TestCase defines the fixture to run multiple tests.
*
@@ -90,7 +61,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -177,24 +148,18 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
private $expectedExceptionMessage = '';
/**
- * The code of the expected Exception.
+ * The regex pattern to validate the expected Exception message.
*
- * @var integer
+ * @var string
*/
- private $expectedExceptionCode;
+ private $expectedExceptionMessageRegExp = '';
/**
- * The required preconditions for a test.
+ * The code of the expected Exception.
*
- * @var array
+ * @var integer
*/
- private $required = array(
- 'PHP' => null,
- 'PHPUnit' => null,
- 'OS' => null,
- 'functions' => array(),
- 'extensions' => array()
- );
+ private $expectedExceptionCode;
/**
* The name of the test case.
@@ -273,11 +238,6 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
*/
private $outputExpectedString = null;
- /**
- * @var bool
- */
- private $hasPerformedExpectationsOnOutput = false;
-
/**
* @var mixed
*/
@@ -288,6 +248,16 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
*/
private $outputBufferingActive = false;
+ /**
+ * @var integer
+ */
+ private $outputBufferingLevel;
+
+ /**
+ * @var SebastianBergmann\GlobalState\Snapshot
+ */
+ private $snapshot;
+
/**
* Constructs a test case with the given name.
*
@@ -315,10 +285,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 +312,8 @@ public function count()
public function getAnnotations()
{
return PHPUnit_Util_Test::parseTestMethodAnnotations(
- get_class($this), $this->name
+ get_class($this),
+ $this->name
);
}
@@ -371,7 +341,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)
);
}
@@ -398,9 +369,7 @@ public function hasOutput()
return false;
}
- if ($this->outputExpectedString !== null ||
- $this->outputExpectedRegex !== null ||
- $this->hasPerformedExpectationsOnOutput) {
+ if ($this->hasExpectationOnOutput()) {
return false;
}
@@ -441,10 +410,20 @@ public function expectOutputString($expectedString)
/**
* @return bool
* @since Method available since Release 3.6.5
+ * @deprecated
*/
public function hasPerformedExpectationsOnOutput()
{
- return $this->hasPerformedExpectationsOnOutput;
+ return $this->hasExpectationOnOutput();
+ }
+
+ /**
+ * @return bool
+ * @since Method available since Release 4.3.3
+ */
+ public function hasExpectationOnOutput()
+ {
+ return is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex);
}
/**
@@ -469,6 +448,19 @@ public function setExpectedException($exceptionName, $exceptionMessage = '', $ex
$this->expectedExceptionCode = $exceptionCode;
}
+ /**
+ * @param mixed $exceptionName
+ * @param string $exceptionMessageRegExp
+ * @param integer $exceptionCode
+ * @since Method available since Release 4.3.0
+ */
+ public function setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp = '', $exceptionCode = null)
+ {
+ $this->expectedException = $exceptionName;
+ $this->expectedExceptionMessageRegExp = $exceptionMessageRegExp;
+ $this->expectedExceptionCode = $exceptionCode;
+ }
+
/**
* @since Method available since Release 3.4.0
*/
@@ -476,15 +468,24 @@ 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']
);
+
+ if (!empty($expectedException['message_regex'])) {
+ $this->setExpectedExceptionRegExp(
+ $expectedException['class'],
+ $expectedException['message_regex'],
+ $expectedException['code']
+ );
+ }
}
} catch (ReflectionException $e) {
}
@@ -506,7 +507,8 @@ protected function setUseErrorHandlerFromAnnotation()
{
try {
$useErrorHandler = PHPUnit_Util_Test::getErrorHandlerSettings(
- get_class($this), $this->name
+ get_class($this),
+ $this->name
);
if ($useErrorHandler !== null) {
@@ -516,103 +518,22 @@ protected function setUseErrorHandlerFromAnnotation()
}
}
- /**
- * @since Method available since Release 3.6.0
- */
- protected function setRequirementsFromAnnotation()
- {
- try {
- $requirements = PHPUnit_Util_Test::getRequirements(
- get_class($this), $this->name
- );
-
- if (isset($requirements['PHP'])) {
- $this->required['PHP'] = $requirements['PHP'];
- }
-
- if (isset($requirements['PHPUnit'])) {
- $this->required['PHPUnit'] = $requirements['PHPUnit'];
- }
-
- if (isset($requirements['OS'])) {
- $this->required['OS'] = $requirements['OS'];
- }
-
- if (isset($requirements['extensions'])) {
- $this->required['extensions'] = $requirements['extensions'];
- }
-
- if (isset($requirements['functions'])) {
- $this->required['functions'] = $requirements['functions'];
- }
- } catch (ReflectionException $e) {
- }
- }
-
/**
* @since Method available since Release 3.6.0
*/
protected function checkRequirements()
{
- $this->setRequirementsFromAnnotation();
-
- $missingRequirements = array();
-
- if ($this->required['PHP'] &&
- version_compare(PHP_VERSION, $this->required['PHP'], '<')) {
- $missingRequirements[] = sprintf(
- 'PHP %s (or later) is required.',
- $this->required['PHP']
- );
- }
-
- $phpunitVersion = PHPUnit_Runner_Version::id();
- if ($this->required['PHPUnit'] &&
- version_compare($phpunitVersion, $this->required['PHPUnit'], '<')) {
- $missingRequirements[] = sprintf(
- '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']
- );
- }
-
- foreach ($this->required['functions'] as $function) {
- $pieces = explode('::', $function);
- if (2 === count($pieces) && method_exists($pieces[0], $pieces[1])) {
- continue;
- }
- if (function_exists($function)) {
- continue;
- }
- $missingRequirements[] = sprintf(
- 'Function %s is required.',
- $function
- );
+ if (!$this->name || !method_exists($this, $this->name)) {
+ return;
}
- foreach ($this->required['extensions'] as $extension) {
- if (!extension_loaded($extension)) {
- $missingRequirements[] = sprintf(
- 'Extension %s is required.',
- $extension
- );
- }
- }
+ $missingRequirements = PHPUnit_Util_Test::getMissingRequirements(
+ get_class($this),
+ $this->name
+ );
if ($missingRequirements) {
- $this->markTestSkipped(
- implode(
- PHP_EOL,
- $missingRequirements
- )
- );
+ $this->markTestSkipped(implode(PHP_EOL, $missingRequirements));
}
}
@@ -687,7 +608,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) {
@@ -697,7 +618,11 @@ public function run(PHPUnit_Framework_TestResult $result = null)
$iniSettings = PHPUnit_Util_GlobalState::getIniSettingsAsString();
} else {
$constants = '';
- $globals = '';
+ if (!empty($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
+ $globals = '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = ' . var_export($GLOBALS['__PHPUNIT_BOOTSTRAP'], true) . ";\n";
+ } else {
+ $globals = '';
+ }
$includedFiles = '';
$iniSettings = '';
}
@@ -706,6 +631,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 +646,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 +665,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 +674,9 @@ public function run(PHPUnit_Framework_TestResult $result = null)
'iniSettings' => $iniSettings,
'isStrictAboutTestsThatDoNotTestAnything' => $isStrictAboutTestsThatDoNotTestAnything,
'isStrictAboutOutputDuringTests' => $isStrictAboutOutputDuringTests,
- 'isStrictAboutTestSize' => $isStrictAboutTestSize
- )
+ 'isStrictAboutTestSize' => $isStrictAboutTestSize,
+ 'isStrictAboutTodoAnnotatedTests' => $isStrictAboutTodoAnnotatedTests
+ )
);
$this->prepareTemplate($template);
@@ -774,37 +703,17 @@ public function runBare()
{
$this->numAssertions = 0;
- // Backup the $GLOBALS array and static attributes.
- if ($this->runTestInSeparateProcess !== true &&
- $this->inIsolation !== true) {
- if ($this->backupGlobals === null ||
- $this->backupGlobals === true) {
- PHPUnit_Util_GlobalState::backupGlobals(
- $this->backupGlobalsBlacklist
- );
- }
-
- if ($this->backupStaticAttributes === true) {
- PHPUnit_Util_GlobalState::backupStaticAttributes(
- $this->backupStaticAttributesBlacklist
- );
- }
- }
-
- // Start output buffering.
- ob_start();
- $this->outputBufferingActive = true;
-
- // Clean up stat cache.
+ $this->snapshotGlobalState();
+ $this->startOutputBuffering();
clearstatcache();
-
- // Backup the cwd
$currentWorkingDirectory = getcwd();
$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 +731,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 +753,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,40 +770,21 @@ 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())
- );
+ try {
+ $this->stopOutputBuffering();
+ } catch (PHPUnit_Framework_RiskyTestError $_e) {
+ if (!isset($e)) {
+ $e = $_e;
+ }
}
- ob_end_clean();
- $this->outputBufferingActive = false;
-
- // Clean up stat cache.
clearstatcache();
- // Restore the cwd if it was changed by the test
if ($currentWorkingDirectory != getcwd()) {
chdir($currentWorkingDirectory);
}
- // Restore the $GLOBALS array and static attributes.
- if ($this->runTestInSeparateProcess !== true &&
- $this->inIsolation !== true) {
- if ($this->backupGlobals === null ||
- $this->backupGlobals === true) {
- PHPUnit_Util_GlobalState::restoreGlobals(
- $this->backupGlobalsBlacklist
- );
- }
-
- if ($this->backupStaticAttributes === true) {
- PHPUnit_Util_GlobalState::restoreStaticAttributes();
- }
- }
+ $this->restoreGlobalState();
// Clean up INI settings.
foreach ($this->iniSettings as $varName => $oldValue) {
@@ -909,13 +802,9 @@ public function runBare()
if (!isset($e)) {
try {
if ($this->outputExpectedRegex !== null) {
- $this->hasPerformedExpectationsOnOutput = true;
$this->assertRegExp($this->outputExpectedRegex, $this->output);
- $this->outputExpectedRegex = null;
} elseif ($this->outputExpectedString !== null) {
- $this->hasPerformedExpectationsOnOutput = true;
$this->assertEquals($this->outputExpectedString, $this->output);
- $this->outputExpectedString = null;
}
} catch (Exception $_e) {
$e = $_e;
@@ -939,7 +828,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 +841,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 +864,38 @@ 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 (is_string($this->expectedExceptionMessageRegExp) &&
+ !empty($this->expectedExceptionMessageRegExp)) {
+ $this->assertThat(
+ $e,
+ new PHPUnit_Framework_Constraint_ExceptionMessageRegExp(
+ $this->expectedExceptionMessageRegExp
+ )
);
}
if ($this->expectedExceptionCode !== null) {
$this->assertThat(
- $e,
- new PHPUnit_Framework_Constraint_ExceptionCode(
- $this->expectedExceptionCode
- )
+ $e,
+ new PHPUnit_Framework_Constraint_ExceptionCode(
+ $this->expectedExceptionCode
+ )
);
}
@@ -1007,10 +907,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
+ )
);
}
@@ -1147,6 +1047,15 @@ public function setInIsolation($inIsolation)
}
}
+ /**
+ * @return boolean
+ * @since Method available since Release 4.3.0
+ */
+ public function isInIsolation()
+ {
+ return $this->inIsolation;
+ }
+
/**
* @return mixed
* @since Method available since Release 3.4.0
@@ -1219,11 +1128,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
+ )
);
}
}
@@ -1270,9 +1179,9 @@ protected function setLocale()
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 +1208,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;
@@ -1324,9 +1233,7 @@ public function getMock($originalClassName, $methods = array(), array $arguments
*/
public function getMockBuilder($className)
{
- return new PHPUnit_Framework_MockObject_MockBuilder(
- $this, $className
- );
+ return new PHPUnit_Framework_MockObject_MockBuilder($this, $className);
}
/**
@@ -1347,14 +1254,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 +1269,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 +1287,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;
@@ -1410,27 +1317,28 @@ public function getMockForAbstractClass($originalClassName, array $arguments = a
protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array())
{
if ($originalClassName === '') {
- $originalClassName = str_replace(
- '.wsdl', '', basename($wsdlFile)
- );
+ $originalClassName = str_replace('.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 +1362,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 +1394,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
);
}
@@ -1542,6 +1450,21 @@ public static function never()
return new PHPUnit_Framework_MockObject_Matcher_InvokedCount(0);
}
+ /**
+ * 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.
@@ -1579,6 +1502,21 @@ public static function exactly($count)
return new PHPUnit_Framework_MockObject_Matcher_InvokedCount($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.
@@ -1626,7 +1564,7 @@ public static function returnValueMap(array $valueMap)
public static function returnArgument($argumentIndex)
{
return new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
- $argumentIndex
+ $argumentIndex
);
}
@@ -1680,45 +1618,40 @@ public static function onConsecutiveCalls()
}
/**
- * @param mixed $data
+ * @param mixed $data The data to export as a string
+ * @param SebastianBergmann\Exporter\Context $processed Contains all objects and arrays that have previously been processed
* @return string
* @since Method available since Release 3.2.1
*/
- protected function dataToString($data)
+ protected function dataToString(&$data, $processed = null)
{
$result = array();
+ $exporter = new Exporter();
- set_error_handler(function ($errno, $errstr, $errfile, $errline) {
- throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
- }, E_WARNING);
+ if (!$processed) {
+ $processed = new Context();
+ }
- foreach ($data as $key => $_data) {
- try {
- // Detect array-recursions by using count
- // http://php.net/manual/en/function.count.php
- $iRecursiveCheck = count($_data, COUNT_RECURSIVE);
-
- if (is_array($_data)) {
- $result[] = 'array(' . $this->dataToString($_data) . ')';
- } elseif (is_object($_data)) {
- $object = new ReflectionObject($_data);
-
- if ($object->hasMethod('__toString')) {
- $result[] = (string) $_data;
- } else {
- $result[] = get_class($_data);
- }
- } elseif (is_resource($_data)) {
- $result[] = '<resource>';
- } else {
- $result[] = var_export($_data, true);
+ $processed->add($data);
+
+ foreach ($data as $key => $value) {
+ if (is_array($value)) {
+ if ($processed->contains($data[$key]) !== false) {
+ $result[] = '*RECURSION*';
+ }
+
+ else {
+ $result[] = sprintf(
+ 'array(%s)',
+ $this->dataToString($data[$key], $processed)
+ );
}
- } catch (ErrorException $e) {
- $result[] = '*RECURSION*';
}
- }
- restore_error_handler();
+ else {
+ $result[] = $exporter->shortenedExport($value);
+ }
+ }
return join(', ', $result);
}
@@ -1787,13 +1720,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,19 +1736,19 @@ 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;
}
- $this->dependencyInput[] = $passed[$dependency]['result'];
+ $this->dependencyInput[$dependency] = $passed[$dependency]['result'];
} else {
- $this->dependencyInput[] = null;
+ $this->dependencyInput[$dependency] = null;
}
}
}
@@ -1916,4 +1850,120 @@ 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();
+ }
+
+ private function snapshotGlobalState()
+ {
+ if ($this->runTestInSeparateProcess || $this->inIsolation) {
+ return;
+ }
+
+ $backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true;
+
+ if ($backupGlobals || $this->backupStaticAttributes) {
+ $blacklist = new Blacklist;
+
+ if ($backupGlobals) {
+ foreach ($this->backupGlobalsBlacklist as $globalVariable) {
+ $blacklist->addGlobalVariable($globalVariable);
+ }
+ }
+
+ if ($this->backupStaticAttributes && !defined('PHPUNIT_TESTSUITE')) {
+ $blacklist->addClassNamePrefix('PHPUnit');
+ $blacklist->addClassNamePrefix('File_Iterator');
+ $blacklist->addClassNamePrefix('PHP_CodeCoverage');
+ $blacklist->addClassNamePrefix('PHP_Invoker');
+ $blacklist->addClassNamePrefix('PHP_Timer');
+ $blacklist->addClassNamePrefix('PHP_Token');
+ $blacklist->addClassNamePrefix('Symfony');
+ $blacklist->addClassNamePrefix('Text_Template');
+ $blacklist->addClassNamePrefix('Doctrine\Instantiator');
+
+ foreach ($this->backupStaticAttributesBlacklist as $class => $attributes) {
+ foreach ($attributes as $attribute) {
+ $blacklist->addStaticAttribute($class, $attribute);
+ }
+ }
+ }
+
+ $this->snapshot = new Snapshot(
+ $blacklist,
+ $backupGlobals,
+ $this->backupStaticAttributes,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false
+ );
+ }
+ }
+
+ private function restoreGlobalState()
+ {
+ if (!$this->snapshot instanceof Snapshot) {
+ return;
+ }
+
+ $restorer = new Restorer;
+
+ if ($this->backupGlobals === null || $this->backupGlobals === true) {
+ $restorer->restoreGlobalVariables($this->snapshot);
+ }
+
+ if ($this->backupStaticAttributes) {
+ $restorer->restoreStaticAttributes($this->snapshot);
+ }
+
+ $this->snapshot = null;
+ }
}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
index 9da0b739efe4d054bcef6be8db42ba292d2eeb66..19604b1a77205b3b66739e92e45519974464f2a2 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -57,7 +22,12 @@
class PHPUnit_Framework_TestFailure
{
/**
- * @var PHPUnit_Framework_Test
+ * @var string
+ */
+ private $testName;
+
+ /**
+ * @var PHPUnit_Framework_Test|null
*/
protected $failedTest;
@@ -74,7 +44,14 @@ class PHPUnit_Framework_TestFailure
*/
public function __construct(PHPUnit_Framework_Test $failedTest, Exception $thrownException)
{
- $this->failedTest = $failedTest;
+ if ($failedTest instanceof PHPUnit_Framework_SelfDescribing) {
+ $this->testName = $failedTest->toString();
+ } else {
+ $this->testName = get_class($failedTest);
+ }
+ if (!$failedTest instanceof PHPUnit_Framework_TestCase || !$failedTest->isInIsolation()) {
+ $this->failedTest = $failedTest;
+ }
$this->thrownException = $thrownException;
}
@@ -86,10 +63,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->testName,
+ $this->thrownException->getMessage()
);
}
@@ -125,6 +101,8 @@ public static function exceptionToString(Exception $e)
}
} elseif ($e instanceof PHPUnit_Framework_Error) {
$buffer = $e->getMessage() . "\n";
+ } elseif ($e instanceof PHPUnit_Framework_ExceptionWrapper) {
+ $buffer = $e->getClassname() . ': ' . $e->getMessage() . "\n";
} else {
$buffer = get_class($e) . ': ' . $e->getMessage() . "\n";
}
@@ -133,9 +111,25 @@ public static function exceptionToString(Exception $e)
}
/**
- * Gets the failed test.
+ * Returns the name of the failing test (including data set, if any).
+ *
+ * @return string
+ * @since Method available since Release 4.3.0
+ */
+ public function getTestName()
+ {
+ return $this->testName;
+ }
+
+ /**
+ * Returns the failing test.
+ *
+ * Note: The test object is not set when the test is executed in process
+ * isolation.
+ *
+ * @see PHPUnit_Framework_Exception
*
- * @return PHPUnit_Framework_Test
+ * @return PHPUnit_Framework_Test|null
*/
public function failedTest()
{
diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestListener.php b/core/vendor/phpunit/phpunit/src/Framework/TestListener.php
index 8a4a604b47bc3bb689f028d72980bd1ab2c61fcd..8bb7dd305de985add07bac21cb37b6259cea178b 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/TestListener.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestListener.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestResult.php b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php
index f373b082f83a314f17af684dbab8160aeebf2155..6d882ad6e4204e4dfabd52ca26705facd6bc0562 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/TestResult.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -66,11 +31,6 @@ class PHPUnit_Framework_TestResult implements Countable
*/
protected $errors = array();
- /**
- * @var array
- */
- protected $deprecatedFeatures = array();
-
/**
* @var array
*/
@@ -153,6 +113,11 @@ class PHPUnit_Framework_TestResult implements Countable
*/
protected $beStrictAboutTestSize = false;
+ /**
+ * @var boolean
+ */
+ protected $beStrictAboutTodoAnnotatedTests = false;
+
/**
* @var boolean
*/
@@ -236,21 +201,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();
@@ -289,22 +248,17 @@ 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';
+ if ($e instanceof PHPUnit_Framework_RiskyTest ||
+ $e instanceof PHPUnit_Framework_OutputError) {
+ $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();
@@ -333,16 +287,6 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
$this->time += $time;
}
- /**
- * 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.
*
@@ -407,8 +351,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;
@@ -531,28 +476,6 @@ public function errors()
return $this->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.
*
@@ -627,8 +550,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 +572,7 @@ public function run(PHPUnit_Framework_Test $test)
foreach ($classes as $class) {
$this->codeCoverage->filter()->addFileToBlacklist(
- $class->getFileName()
+ $class->getFileName()
);
}
}
@@ -666,17 +589,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;
}
@@ -695,7 +618,10 @@ public function run(PHPUnit_Framework_Test $test)
} elseif ($e instanceof PHPUnit_Framework_SkippedTestError) {
$skipped = true;
}
+ } catch (PHPUnit_Framework_Exception $e) {
+ $error = true;
} catch (Exception $e) {
+ $e = new PHPUnit_Framework_ExceptionWrapper($e);
$error = true;
}
@@ -714,34 +640,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;
@@ -763,23 +693,35 @@ 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
);
+ } elseif ($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
+ );
+ }
}
$this->endTest($test, $time);
@@ -964,6 +906,29 @@ public function isStrictAboutTestSize()
return $this->beStrictAboutTestSize;
}
+ /**
+ * @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.
*
@@ -1100,7 +1065,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 03f36cd260ae2c10f801f1b401016b66a445e30e..1588a2c483eb3e367b30bf7a8ae1a562a8dfa726 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -74,7 +39,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -133,6 +98,11 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra
*/
protected $testCase = false;
+ /**
+ * @var array
+ */
+ protected $foundClasses = array();
+
/**
* @var PHPUnit_Runner_Filter_Factory
*/
@@ -188,7 +158,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 +173,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 +190,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 +259,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 +272,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 +317,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 +364,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 +391,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 +429,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,48 +456,79 @@ 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
- );
+ if (!($e instanceof PHPUnit_Framework_SkippedTestError || $e instanceof PHPUnit_Framework_IncompleteTestError)) {
+ $message = sprintf(
+ 'The data provider specified for %s::%s is invalid.',
+ $className,
+ $name
+ );
- $_message = $e->getMessage();
+ $_message = $e->getMessage();
- if (!empty($_message)) {
- $message .= "\n" . $_message;
- }
+ if (!empty($_message)) {
+ $message .= "\n" . $_message;
+ }
+
+ $data = self::warning($message);
+ } elseif ($e instanceof PHPUnit_Framework_SkippedTestError) {
+ $message = sprintf(
+ 'Test for %s::%s skipped by data provider',
+ $className,
+ $name
+ );
+
+ $_message = $e->getMessage();
+
+ if (!empty($_message)) {
+ $message .= "\n" . $_message;
+ }
- $data = self::warning($message);
+ $data = self::skipTest($className, $name, $message);
+ } elseif ($e instanceof PHPUnit_Framework_IncompleteTestError) {
+ $message = sprintf(
+ 'Test for %s::%s marked incomplete by data provider',
+ $className,
+ $name
+ );
+
+ $_message = $e->getMessage();
+
+ if (!empty($_message)) {
+ $message .= "\n" . $_message;
+ }
+
+ $data = self::incompleteTest($className, $name, $message);
+ }
}
// 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()
+ )
);
}
$groups = PHPUnit_Util_Test::getGroups($className, $name);
- if ($data instanceof PHPUnit_Framework_Warning) {
+ if ($data instanceof PHPUnit_Framework_Warning ||
+ $data instanceof PHPUnit_Framework_SkippedTestCase ||
+ $data instanceof PHPUnit_Framework_IncompleteTestCase) {
$test->addTest($data, $groups);
} else {
foreach ($data as $_dataName => $_data) {
@@ -519,13 +544,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 +584,7 @@ public static function createTest(ReflectionClass $theClass, $name)
if ($backupSettings['backupStaticAttributes'] !== null) {
$test->setBackupStaticAttributes(
- $backupSettings['backupStaticAttributes']
+ $backupSettings['backupStaticAttributes']
);
}
}
@@ -638,7 +663,13 @@ public function run(PHPUnit_Framework_TestResult $result = null)
$this->setUp();
foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
- if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $beforeClassMethod)) {
+ if ($this->testCase === true &&
+ class_exists($this->name, false) &&
+ method_exists($this->name, $beforeClassMethod)) {
+ if ($missingRequirements = PHPUnit_Util_Test::getMissingRequirements($this->name, $beforeClassMethod)) {
+ $this->markTestSuiteSkipped(implode(PHP_EOL, $missingRequirements));
+ }
+
call_user_func(array($this->name, $beforeClassMethod));
}
}
@@ -646,17 +677,27 @@ public function run(PHPUnit_Framework_TestResult $result = null)
$numTests = count($this);
for ($i = 0; $i < $numTests; $i++) {
+ $result->startTest($this);
$result->addFailure($this, $e, 0);
+ $result->endTest($this, 0);
}
+ $this->tearDown();
+ $result->endTestSuite($this);
+
return $result;
} catch (Exception $e) {
$numTests = count($this);
for ($i = 0; $i < $numTests; $i++) {
+ $result->startTest($this);
$result->addError($this, $e, 0);
+ $result->endTest($this, 0);
}
+ $this->tearDown();
+ $result->endTestSuite($this);
+
return $result;
}
@@ -778,8 +819,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 +832,9 @@ protected function addTestMethod(ReflectionClass $class, ReflectionMethod $metho
'Test method "%s" in test class "%s" is not public.',
$name,
$class->getName()
- )
)
- );
+ )
+ );
return;
}
@@ -839,6 +881,30 @@ protected static function warning($message)
return new PHPUnit_Framework_Warning($message);
}
+ /**
+ * @param string $class
+ * @param string $methodName
+ * @param string $message
+ * @return PHPUnit_Framework_SkippedTestCase
+ * @since Method available since Release 4.3.0
+ */
+ protected static function skipTest($class, $methodName, $message)
+ {
+ return new PHPUnit_Framework_SkippedTestCase($class, $methodName, $message);
+ }
+
+ /**
+ * @param string $class
+ * @param string $methodName
+ * @param string $message
+ * @return PHPUnit_Framework_IncompleteTestCase
+ * @since Method available since Release 4.3.0
+ */
+ protected static function incompleteTest($class, $methodName, $message)
+ {
+ return new PHPUnit_Framework_IncompleteTestCase($class, $methodName, $message);
+ }
+
/**
* @param boolean $backupGlobals
* @since Method available since Release 3.3.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php b/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
index a8e28a9472bbcaf609e3c3a52e14640dedddc70c..d5bfcf12a92c07ffcafb4dbd28e3964741698beb 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework_TestSuite
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework_TestSuite
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php b/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
index 6e0954d58c903586d87be64b47397ce92742fffa..32b0c067ddbef338d2f9e7402e7f8aa16899ad87 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/Warning.php b/core/vendor/phpunit/phpunit/src/Framework/Warning.php
index 0fcb9316963b56a201d9a89c2f6555d45baf419c..96e26d05f96642add5b4c8d36351a38472d89527 100644
--- a/core/vendor/phpunit/phpunit/src/Framework/Warning.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Warning.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Framework
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Framework
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
index d92b200fd1c09002f4fd8f20eb82766da25749f3..47c636e8f58895463163d0994dd13e734fa8f036 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -90,7 +55,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 +66,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 +79,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 +89,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 +122,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/Exception.php b/core/vendor/phpunit/phpunit/src/Runner/Exception.php
index bce04aec667d1985a2e7f1ea3ee2ccbb6975f00e..b353aa0ba7386a2274e4f89113e5a7ef7f749a82 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Exception.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
index 0b2abf1f36d9b06abdd392564d375dac27d957d5..c3f7730a12a71d6634357ec9e28b4ff45c81bf00 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -67,10 +32,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 ee097ce73297570b1bdf88250e8646feb8893310..422c2ca8b73dc49bd28921b85a20b3e02aad2622 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -71,8 +36,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/Group/Exclude.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
index e2a22d0656c38af80b98ab4940d1cfb2365e9904..232c2770571023d23d4b1d47240d842b07587035 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
index ce8cd826ceadbe2805b6ee706458c3b1abb0f053..a1ad691341c8e72f18ed11cbbc244277f0fba623 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
index 106b8a98be91eadaaa5f25a88b82ee7230bd9139..d9f5ee50073be761b212e4e93545a2d8403be4a2 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
@@ -1,53 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -83,45 +48,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 9de65a8c49934e21b672395bf7d58786380cc07c..04d22c3f9b74605d2348665aed4ece15e06b5850 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -68,7 +33,7 @@ public function load($suiteClassName, $suiteClassFile = '')
if (empty($suiteClassFile)) {
$suiteClassFile = PHPUnit_Util_Filesystem::classNameToFilename(
- $suiteClassName
+ $suiteClassName
);
}
@@ -78,7 +43,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 +102,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/TestSuiteLoader.php b/core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
index 37001c6fef5145931e4e6ad9cb07121845ce250a..c049e7eab9fa7adf84efbf537bf9ef4fa625fc6d 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://www.phpunit.de/
* @since Interface available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Version.php b/core/vendor/phpunit/phpunit/src/Runner/Version.php
index cd39538d4e96aa4a80b19627779d56569bd13cc5..1680c1538d4cbab22c3752d19bf5a19cae4dc89a 100644
--- a/core/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Runner
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Runner
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -71,7 +36,7 @@ public static function id()
}
if (self::$version === null) {
- $version = new SebastianBergmann\Version('4.1.4', dirname(dirname(__DIR__)));
+ $version = new SebastianBergmann\Version('4.4.2', 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 cd62882fd6f7133f53f11ade6366c9359ec6cba6..d69b9250b9ad5924cf8dc9313da18f0f969527d3 100644
--- a/core/vendor/phpunit/phpunit/src/TextUI/Command.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage TextUI
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage TextUI
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -108,6 +73,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,
@@ -122,6 +88,11 @@ class PHPUnit_TextUI_Command
'version' => null
);
+ /**
+ * @var boolean
+ */
+ private $versionStringPrinted = false;
+
/**
* @param boolean $exit
*/
@@ -133,8 +104,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 +119,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 +233,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 +287,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 +305,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;
- }
+ $this->arguments['printer'] = 'PHPUnit_Util_Log_TAP';
+ }
break;
case '--testdox': {
- $this->arguments['printer'] = new PHPUnit_Util_TestDox_ResultPrinter_Text;
- }
+ $this->arguments['printer'] = '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 +523,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,20 +554,11 @@ 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')
);
}
- if (isset($this->arguments['bootstrap'])) {
- $this->handleBootstrap($this->arguments['bootstrap']);
- }
-
- if (isset($this->arguments['printer']) &&
- is_string($this->arguments['printer'])) {
- $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
- }
-
if ($this->arguments['loader'] !== null) {
$this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
}
@@ -602,11 +570,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 +583,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 +591,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";
@@ -634,18 +602,20 @@ protected function handleArguments(array $argv)
$configuration->handlePHPConfiguration();
- if (!isset($this->arguments['bootstrap']) && isset($phpunit['bootstrap'])) {
+ /**
+ * Issue #1216
+ */
+ if (isset($this->arguments['bootstrap'])) {
+ $this->handleBootstrap($this->arguments['bootstrap']);
+ } elseif (isset($phpunit['bootstrap'])) {
$this->handleBootstrap($phpunit['bootstrap']);
}
/**
* Issue #657
*/
- if (isset($phpunit['stderr']) && $phpunit['stderr'] == true) {
- $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter(
- 'php://stderr',
- isset($this->arguments['verbose']) ? $this->arguments['verbose'] : FALSE
- );
+ if (isset($phpunit['stderr']) && ! isset($this->arguments['stderr'])) {
+ $this->arguments['stderr'] = $phpunit['stderr'];
}
if (isset($phpunit['printerClass'])) {
@@ -656,7 +626,7 @@ protected function handleArguments(array $argv)
}
$this->arguments['printer'] = $this->handlePrinter(
- $phpunit['printerClass'], $file
+ $phpunit['printerClass'], $file
);
}
@@ -668,7 +638,7 @@ protected function handleArguments(array $argv)
}
$this->arguments['loader'] = $this->handleLoader(
- $phpunit['testSuiteLoaderClass'], $file
+ $phpunit['testSuiteLoaderClass'], $file
);
}
@@ -686,6 +656,13 @@ class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
$this->arguments['test'] = $testSuite;
}
}
+ } elseif (isset($this->arguments['bootstrap'])) {
+ $this->handleBootstrap($this->arguments['bootstrap']);
+ }
+
+ if (isset($this->arguments['printer']) &&
+ is_string($this->arguments['printer'])) {
+ $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
}
if (isset($this->arguments['test']) && is_string($this->arguments['test']) && substr($this->arguments['test'], -5, 5) == '.phpt') {
@@ -714,7 +691,7 @@ protected function handleLoader($loaderClass, $loaderFile = '')
if (!class_exists($loaderClass, false)) {
if ($loaderFile == '') {
$loaderFile = PHPUnit_Util_Filesystem::classNameToFilename(
- $loaderClass
+ $loaderClass
);
}
@@ -730,25 +707,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 +735,7 @@ protected function handlePrinter($printerClass, $printerFile = '')
if (!class_exists($printerClass, false)) {
if ($printerFile == '') {
$printerFile = PHPUnit_Util_Filesystem::classNameToFilename(
- $printerClass
+ $printerClass
);
}
@@ -784,21 +756,18 @@ protected function handlePrinter($printerClass, $printerFile = '')
return $printerClass;
}
- $printer = $class->newInstance();
+ $outputStream = isset($this->arguments['stderr']) ? 'php://stderr' : null;
+
+ return $class->newInstance($outputStream);
}
}
- if (!isset($printer)) {
- PHPUnit_TextUI_TestRunner::showError(
- sprintf(
+ $this->showError(
+ sprintf(
'Could not use "%s" as printer.',
-
$printerClass
- )
- );
- }
-
- return $printer;
+ )
+ );
}
/**
@@ -811,7 +780,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 +789,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 +797,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 +824,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 +843,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 +855,7 @@ protected function handleSelfUpdate()
*/
protected function showHelp()
{
- PHPUnit_TextUI_TestRunner::printVersionString();
+ $this->printVersionString();
print <<<EOT
Usage: phpunit [options] UnitTest [UnitTest.php]
@@ -926,6 +895,7 @@ protected function showHelp()
--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.
@@ -946,7 +916,7 @@ protected function showHelp()
--repeat <times> Runs the test(s) repeatedly.
--tap Report test execution progress in TAP format.
--testdox Report test execution progress in TestDox format.
- --printer <printer> TestSuiteListener implementation to use.
+ --printer <printer> TestListener implementation to use.
Configuration Options:
@@ -974,4 +944,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 3a316c19bed1a856b37414b03b4e1d1da7d8c159..2cf5300e6155679fd995609bce0d47241f723228 100644
--- a/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
@@ -1,55 +1,22 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 TextUI
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+use SebastianBergmann\Environment\Console;
+
/**
* Prints the result of a TextUI TestRunner run.
*
* @package PHPUnit
* @subpackage TextUI
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -147,7 +114,9 @@ public function __construct($out = null, $verbose = false, $colors = false, $deb
}
if (is_bool($colors)) {
- $this->colors = $colors;
+ $console = new Console;
+
+ $this->colors = $colors && $console->hasColorSupport();
} else {
throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
}
@@ -177,15 +146,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 +187,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;
@@ -260,21 +219,12 @@ protected function printDefect(PHPUnit_Framework_TestFailure $defect, $count)
*/
protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $count)
{
- $failedTest = $defect->failedTest();
-
- if ($failedTest instanceof PHPUnit_Framework_SelfDescribing) {
- $testName = $failedTest->toString();
- } else {
- $testName = get_class($failedTest);
- }
-
$this->write(
- sprintf(
- "\n%d) %s\n",
-
- $count,
- $testName
- )
+ sprintf(
+ "\n%d) %s\n",
+ $count,
+ $defect->getTestName()
+ )
);
}
@@ -283,26 +233,11 @@ protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $cou
*/
protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect)
{
- $this->write($defect->getExceptionAsString());
+ $e = $defect->thrownException();
+ $this->write((string) $e);
- $trace = PHPUnit_Util_Filter::getFilteredStacktrace(
- $defect->thrownException()
- );
-
- if (!empty($trace)) {
- $this->write("\n" . $trace);
- }
-
- $e = $defect->thrownException()->getPrevious();
-
- while ($e) {
- $this->write(
- "\nCaused by\n" .
- PHPUnit_Framework_TestFailure::exceptionToString($e). "\n" .
- PHPUnit_Util_Filter::getFilteredStacktrace($e)
- );
-
- $e = $e->getPrevious();
+ while ($e = $e->getPrevious()) {
+ $this->write("\nCaused by\n" . $e);
}
}
@@ -348,44 +283,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 +295,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 +366,9 @@ protected function getCountString($count, $name)
if ($count > 0) {
$string = sprintf(
- ', %s: %d',
-
- $name,
- $count
+ ', %s: %d',
+ $name,
+ $count
);
}
@@ -606,9 +483,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)
+ )
);
}
}
@@ -634,7 +511,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
$this->lastTestFailed = false;
if ($test instanceof PHPUnit_Framework_TestCase) {
- if (!$test->hasPerformedExpectationsOnOutput()) {
+ if (!$test->hasExpectationOnOutput()) {
$this->write($test->getActualOutput());
}
}
@@ -651,14 +528,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 73f0383f445c192dac3f2d4e55274e08269d8cd2..5ad6b671ee367f64339fbcd5690370a773964b86 100644
--- a/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 TextUI
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
use SebastianBergmann\Environment\Runtime;
@@ -52,7 +17,7 @@
* @package PHPUnit
* @subpackage TextUI
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -127,12 +92,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 +168,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 +238,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 +259,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 +317,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 +355,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 +397,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 +409,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 +421,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 <a href="http://phpunit.de/">PHPUnit %s</a>',
- PHPUnit_Runner_Version::id()
- )
+ $arguments['reportLowUpperBound'],
+ $arguments['reportHighLowerBound'],
+ sprintf(
+ ' and <a href="http://phpunit.de/">PHPUnit %s</a>',
+ PHPUnit_Runner_Version::id()
+ )
);
$writer->process($codeCoverage, $arguments['coverageHtml']);
@@ -479,7 +441,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 +461,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 +504,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 +512,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;
+ }
}
/**
@@ -575,26 +540,6 @@ public function getLoader()
return $this->loader;
}
- /**
- */
- 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 +549,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 +647,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 +695,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 +767,7 @@ protected function handleConfiguration(array &$arguments)
if (isset($loggingConfiguration['plain'])) {
$arguments['listeners'][] = new PHPUnit_TextUI_ResultPrinter(
- $loggingConfiguration['plain'], true
+ $loggingConfiguration['plain'], true
);
}
@@ -849,10 +799,10 @@ protected function handleConfiguration(array &$arguments)
if ((isset($arguments['coverageClover']) ||
isset($arguments['coverageCrap4J']) ||
isset($arguments['coverageHtml']) ||
- isset($arguments['coveragePHP'])) ||
- isset($arguments['coverageText']) &&
+ isset($arguments['coveragePHP']) ||
+ isset($arguments['coverageText']) ||
+ isset($arguments['coverageXml'])) &&
$this->canCollectCodeCoverage) {
-
$filterConfiguration = $arguments['configuration']->getFilterConfiguration();
$arguments['addUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['addUncoveredFilesFromWhitelist'];
$arguments['processUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['processUncoveredFilesFromWhitelist'];
@@ -892,7 +842,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 +852,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 +890,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 +910,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 +925,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 40f978812e692291cd1b003e8a3ee0eaf46e6224..4aaeed06848191b6dd87314142855e757f256dba 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Blacklist.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Blacklist.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
@@ -77,7 +42,8 @@ class PHPUnit_Util_Blacklist
'SebastianBergmann\Comparator\Comparator' => 1,
'SebastianBergmann\Exporter\Exporter' => 1,
'SebastianBergmann\Version' => 1,
- 'Composer\Autoload\ClassLoader' => 1
+ 'Composer\Autoload\ClassLoader' => 1,
+ 'Doctrine\Instantiator\Instantiator' => 1
);
/**
@@ -136,6 +102,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 844135a28bcf239432001f1b6eedbba0edd0c687..7af6f6eb28d8aaa7c53f1f026843dfdf88bdcb4c 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Configuration.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Configuration.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -75,6 +40,7 @@
* beStrictAboutTestsThatDoNotTestAnything="false"
* beStrictAboutOutputDuringTests="false"
* beStrictAboutTestSize="false"
+ * beStrictAboutTodoAnnotatedTests="false"
* checkForUnintentionallyCoveredCode="false"
* verbose="false">
* <testsuites>
@@ -172,7 +138,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.2.0
@@ -193,7 +159,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 +183,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 +224,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 +245,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 +265,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 +324,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 +383,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 +474,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 +539,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 +554,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 +709,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 +758,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 +766,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 +790,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 +807,7 @@ public function getTestSuiteConfiguration($testSuiteFilter=null)
foreach ($testSuiteNodes as $testSuiteNode) {
$suite->addTestSuite(
- $this->getTestSuite($testSuiteNode, $testSuiteFilter)
+ $this->getTestSuite($testSuiteNode, $testSuiteFilter)
);
}
@@ -847,11 +820,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 +881,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 +902,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/Logger.php b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
deleted file mode 100644
index d77a87a5410488476ff93bcc04138f5257ab3f0c..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 <ralph.schindler@zend.com>
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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 <ralph.schindler@zend.com>
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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 c97ad095be8ce49949111d655bff4f5fba3d31ec..d56a37d7742fb67f4dda52c11cfb781017681518 100644
--- a/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
+++ b/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
// Workaround for http://bugs.php.net/bug.php?id=47987,
@@ -56,7 +21,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -123,4 +88,33 @@ public static function handleError($errno, $errstr, $errfile, $errline)
throw new $exception($errstr, $errno, $errfile, $errline);
}
+
+ /**
+ * Registers an error handler and returns a function that will restore
+ * the previous handler when invoked
+ * @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) {
+ if ($errno === $severity) {
+ 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 e2dcb52e16749bbc5aec986aec32ba186715fad1..c41e1243850e691b88f50dbf65c837c79486d815 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Fileloader.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Fileloader.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -70,7 +35,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 +59,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 d5f8feefaf68b30797d688dcf01eb0f5abd71eb8..31d98f5652d14e2e7fc9b939ec8cfe9af7d6920c 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Filesystem.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Filesystem.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -73,9 +38,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 b36ce7d75e7fe7edfebb5db2c8b8e10927b281e7..8606e95084875d201e9c46039b674750f15381bb 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Filter.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Filter.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -82,19 +47,22 @@ public static function getFilteredStacktrace(Exception $e, $asString = true)
$eTrace = $e->getSyntheticTrace();
$eFile = $e->getSyntheticFile();
$eLine = $e->getSyntheticLine();
+ } elseif ($e instanceof PHPUnit_Framework_Exception) {
+ $eTrace = $e->getSerializableTrace();
+ $eFile = $e->getFile();
+ $eLine = $e->getLine();
} else {
if ($e->getPrevious()) {
- $eTrace = $e->getPrevious()->getTrace();
- } else {
- $eTrace = $e->getTrace();
+ $e = $e->getPrevious();
}
+ $eTrace = $e->getTrace();
$eFile = $e->getFile();
$eLine = $e->getLine();
}
if (!self::frameExists($eTrace, $eFile, $eLine)) {
array_unshift(
- $eTrace, array('file' => $eFile, 'line' => $eLine)
+ $eTrace, array('file' => $eFile, 'line' => $eLine)
);
}
@@ -107,10 +75,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 0606406cb2b7230cb8ca41a0f9e31e82e8796ed7..56d62d4981062ba4e12f75e989890215a50e6203 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Getopt.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Getopt.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @subpackage Util
* @author Andrei Zmievski <andrei@php.net>
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -93,11 +58,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 +81,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 +98,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 +134,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 +143,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 ab7b72b34f425d85fd9e9f0814dda2e60c403bfc..10766deb35339a69aa55ed7e74a2e32367f1b23d 100644
--- a/core/vendor/phpunit/phpunit/src/Util/GlobalState.php
+++ b/core/vendor/phpunit/phpunit/src/Util/GlobalState.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,23 +14,13 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
*/
class PHPUnit_Util_GlobalState
{
- /**
- * @var array
- */
- protected static $globals = array();
-
- /**
- * @var array
- */
- protected static $staticAttributes = array();
-
/**
* @var array
*/
@@ -91,101 +46,14 @@ class PHPUnit_Util_GlobalState
'HTTP_POST_FILES'
);
- public static function backupGlobals(array $blacklist)
- {
- self::$globals = array();
- $superGlobalArrays = self::getSuperGlobalArrays();
-
- foreach ($superGlobalArrays as $superGlobalArray) {
- if (!in_array($superGlobalArray, $blacklist)) {
- self::backupSuperGlobalArray($superGlobalArray);
- }
- }
-
- foreach (array_keys($GLOBALS) as $key) {
- if ($key != 'GLOBALS' &&
- !in_array($key, $superGlobalArrays) &&
- !in_array($key, $blacklist) &&
- !$GLOBALS[$key] instanceof Closure) {
- self::$globals['GLOBALS'][$key] = serialize($GLOBALS[$key]);
- }
- }
- }
-
- public static function restoreGlobals(array $blacklist)
- {
- if (ini_get('register_long_arrays') == '1') {
- $superGlobalArrays = array_merge(
- self::$superGlobalArrays, self::$superGlobalArraysLong
- );
- } else {
- $superGlobalArrays = self::$superGlobalArrays;
- }
-
- foreach ($superGlobalArrays as $superGlobalArray) {
- if (!in_array($superGlobalArray, $blacklist)) {
- self::restoreSuperGlobalArray($superGlobalArray);
- }
- }
-
- foreach (array_keys($GLOBALS) as $key) {
- if ($key != 'GLOBALS' &&
- !in_array($key, $superGlobalArrays) &&
- !in_array($key, $blacklist)) {
- if (isset(self::$globals['GLOBALS'][$key])) {
- $GLOBALS[$key] = unserialize(
- self::$globals['GLOBALS'][$key]
- );
- } else {
- unset($GLOBALS[$key]);
- }
- }
- }
-
- self::$globals = array();
- }
-
- protected static function backupSuperGlobalArray($superGlobalArray)
+ public static function getIncludedFilesAsString()
{
- self::$globals[$superGlobalArray] = array();
-
- if (isset($GLOBALS[$superGlobalArray]) &&
- is_array($GLOBALS[$superGlobalArray])) {
- foreach ($GLOBALS[$superGlobalArray] as $key => $value) {
- self::$globals[$superGlobalArray][$key] = serialize($value);
- }
- }
+ return static::processIncludedFilesAsString(get_included_files());
}
- protected static function restoreSuperGlobalArray($superGlobalArray)
- {
- if (isset($GLOBALS[$superGlobalArray]) &&
- is_array($GLOBALS[$superGlobalArray]) &&
- isset(self::$globals[$superGlobalArray])) {
- $keys = array_keys(
- 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]
- );
- } else {
- unset($GLOBALS[$superGlobalArray][$key]);
- }
- }
- }
-
- self::$globals[$superGlobalArray] = array();
- }
-
- public static function getIncludedFilesAsString()
+ public static function processIncludedFilesAsString(array $files)
{
$blacklist = new PHPUnit_Util_Blacklist;
- $files = get_included_files();
$prefix = false;
$result = '';
@@ -200,6 +68,11 @@ public static function getIncludedFilesAsString()
continue;
}
+ // Skip virtual file system protocols
+ if (preg_match('/^(vfs|phpvfs[a-z0-9]+):/', $file)) {
+ continue;
+ }
+
if (!$blacklist->isBlacklisted($file) && is_file($file)) {
$result = 'require_once \'' . $file . "';\n" . $result;
}
@@ -215,9 +88,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 +105,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 +130,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 +145,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,86 +159,22 @@ 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;
}
}
- public static function backupStaticAttributes(array $blacklist)
- {
- self::$staticAttributes = array();
- $declaredClasses = get_declared_classes();
- $declaredClassesNum = count($declaredClasses);
-
- for ($i = $declaredClassesNum - 1; $i >= 0; $i--) {
- if (strpos($declaredClasses[$i], 'PHPUnit') !== 0 &&
- strpos($declaredClasses[$i], 'File_Iterator') !== 0 &&
- strpos($declaredClasses[$i], 'PHP_CodeCoverage') !== 0 &&
- strpos($declaredClasses[$i], 'PHP_Invoker') !== 0 &&
- strpos($declaredClasses[$i], 'PHP_Timer') !== 0 &&
- strpos($declaredClasses[$i], 'PHP_Token_Stream') !== 0 &&
- strpos($declaredClasses[$i], 'Symfony') !== 0 &&
- strpos($declaredClasses[$i], 'Text_Template') !== 0) {
- $class = new ReflectionClass($declaredClasses[$i]);
-
- if ($class->isSubclassOf('PHPUnit_Framework_Test')) {
- continue;
- }
-
- if (!$class->isUserDefined()) {
- break;
- }
-
- $backup = array();
-
- foreach ($class->getProperties() as $attribute) {
- if ($attribute->isStatic()) {
- $name = $attribute->getName();
-
- if (!isset($blacklist[$declaredClasses[$i]]) ||
- !in_array($name, $blacklist[$declaredClasses[$i]])) {
- $attribute->setAccessible(true);
- $value = $attribute->getValue();
-
- if (!$value instanceof Closure) {
- $backup[$name] = serialize($value);
- }
- }
- }
- }
-
- if (!empty($backup)) {
- self::$staticAttributes[$declaredClasses[$i]] = $backup;
- }
- }
- }
- }
-
- public static function restoreStaticAttributes()
- {
- foreach (self::$staticAttributes as $className => $staticAttributes) {
- foreach ($staticAttributes as $name => $value) {
- $reflector = new ReflectionProperty($className, $name);
- $reflector->setAccessible(true);
- $reflector->setValue(unserialize($value));
- }
- }
-
- self::$staticAttributes = array();
- }
-
protected static function exportVariable($variable)
{
if (is_scalar($variable) || is_null($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 94f3cf4913cf845cb791d35b9e5cfb5fca0208df..ea722fbfe56cbfeb9e0d702aa6c3e24f5deb8c1d 100644
--- a/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
+++ b/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
@@ -68,14 +33,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 dfb3163db7b1c618d56b474f1a2e9e92a762476f..981b562e451b87a3bd3ff7f5de728e72299a3a68 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_Log
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
if (!defined('JSON_PRETTY_PRINT')) {
@@ -53,7 +18,7 @@
* @package PHPUnit
* @subpackage Util_Log
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -86,11 +51,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 +71,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 +91,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 +112,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 +132,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 +153,11 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
$this->currentTestName = '';
$this->write(
- array(
+ array(
'event' => 'suiteStart',
'suite' => $this->currentTestSuiteName,
'tests' => count($suite)
- )
+ )
);
}
@@ -218,11 +183,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 +209,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 +219,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 +228,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 13fe0ec487e658059f61252008dab66024bf4de5..d50bcb6896656c210d07f541decc3fbbcb46ef1d 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_Log
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +16,7 @@
* @package PHPUnit
* @subpackage Util_Log
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
@@ -176,7 +141,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 +174,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 +197,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 +226,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 +255,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 +316,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 +389,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 +407,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 8fc924ca6f1c44d285cffc01b0c2420975924eb2..d54c187bcd401dbc571b07d6656c61dc0b81af5e 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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_Log
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -50,7 +15,7 @@
* @package PHPUnit
* @subpackage Util_Log
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -109,7 +74,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 +96,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 +126,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 +147,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 +202,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 +219,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 95399c0b403917a7af250906992fdaecd500b8b6..146e1545c340c7919579c965f5aef2a30a4eebcf 100644
--- a/core/vendor/phpunit/phpunit/src/Util/PHP.php
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.4.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.4.0
@@ -84,7 +49,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 +94,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 +113,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 +129,7 @@ private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framew
if ($result->getCollectCodeCoverageInformation()) {
$result->getCodeCoverage()->merge(
- $childResult->getCodeCoverage()
+ $childResult->getCodeCoverage()
);
}
@@ -177,29 +142,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 +191,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 af228fc5488606b8e75a33cbc1e1d8e7b6d6f82f..45e004e1dc9be8b161250eddda690307dc936eec 100644
--- a/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.12
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
use SebastianBergmann\Environment\Runtime;
@@ -51,7 +16,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.12
@@ -71,18 +36,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 8d714b52a3646b6edd62ee01ad6d629d78ba94be..9be59f4839c6107a163d3e69a1ea4675b1bc2235 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
@@ -1,4 +1,11 @@
<?php
+if (!defined('STDOUT')) {
+ // php://stdout does not obey output buffering. Any output would break
+ // unserialization of child process results in the parent process.
+ define('STDOUT', fopen('php://temp', 'w+b'));
+ define('STDERR', fopen('php://stderr', 'wb'));
+}
+
{iniSettings}
ini_set('display_errors', 'stderr');
set_include_path('{include_path}');
@@ -30,15 +37,23 @@ 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 = '';
+ if (!$test->hasExpectationOnOutput()) {
+ $output = $test->getActualOutput();
+ }
+
+ rewind(STDOUT);
+ if ($stdout = stream_get_contents(STDOUT)) {
+ $output = $stdout . $output;
+ }
print serialize(
array(
@@ -48,8 +63,6 @@ function __phpunit_run_isolated_test()
'output' => $output
)
);
-
- ob_start();
}
{constants}
@@ -62,4 +75,3 @@ if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
}
__phpunit_run_isolated_test();
-ob_end_clean();
diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
index 17d97687563f4c742d875b8c51138b3f9713efcc..77520422adabbe8255a79d93137cc0dc76d52340 100644
--- a/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
@@ -1,55 +1,22 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.12
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
+use SebastianBergmann\Environment\Runtime;
+
/**
* Windows utility for PHP sub-processes.
*
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.12
@@ -61,6 +28,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
@@ -72,13 +90,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,
- "<?php require_once " . var_export($this->tempFile, true) . "; ?>"
+ $pipe,
+ "<?php require_once " . var_export($this->tempFile, true) . "; ?>"
);
}
diff --git a/core/vendor/phpunit/phpunit/src/Util/Printer.php b/core/vendor/phpunit/phpunit/src/Util/Printer.php
index 9d67ad30a23b572a9307af37920834118d80848a..e46003d8dfe6b0a010a6b73fe52a98e5194605aa 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Printer.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Printer.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -127,10 +92,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 0000000000000000000000000000000000000000..09cb3cc43cb3d232729760d06fd9f4c00ac60d88
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Util/Regex.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Error handler that converts PHP errors and warnings to exceptions.
+ *
+ * @package PHPUnit
+ * @subpackage Util
+ * @author Márcio Almada <marcio3w@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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/String.php b/core/vendor/phpunit/phpunit/src/Util/String.php
index a526bf4365fcae72b2a6761a21a3a82c4a61662b..e81666e550b7fa62207150ca44cd428ec0788ee4 100644
--- a/core/vendor/phpunit/phpunit/src/Util/String.php
+++ b/core/vendor/phpunit/phpunit/src/Util/String.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/src/Util/Test.php b/core/vendor/phpunit/phpunit/src/Util/Test.php
index 95c2298db11b8a44595952b8211dd46882c0453f..ff449c14d65c310500eb097a58d4831f3293e93f 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Test.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Test.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
if (!function_exists('trait_exists')) {
@@ -56,7 +21,7 @@ function trait_exists($traitname, $autoload = true)
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -116,61 +81,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<coveredClass>[^\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<coveredElement>[^\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');
}
/**
@@ -182,32 +102,67 @@ public static function getLinesToBeCovered($className, $methodName)
* @since Method available since Release 4.0.0
*/
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 +183,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)) {
@@ -254,6 +209,58 @@ public static function getRequirements($className, $methodName)
return $requires;
}
+ /**
+ * Returns the missing requirements for a test.
+ *
+ * @param string $className
+ * @param string $methodName
+ * @return array
+ * @since Method available since Release 4.3.0
+ */
+ public static function getMissingRequirements($className, $methodName)
+ {
+ $required = static::getRequirements($className, $methodName);
+ $missing = array();
+
+ if (!empty($required['PHP']) && version_compare(PHP_VERSION, $required['PHP'], '<')) {
+ $missing[] = sprintf('PHP %s (or later) is required.', $required['PHP']);
+ }
+
+ if (!empty($required['PHPUnit'])) {
+ $phpunitVersion = PHPUnit_Runner_Version::id();
+ if (version_compare($phpunitVersion, $required['PHPUnit'], '<')) {
+ $missing[] = sprintf('PHPUnit %s (or later) is required.', $required['PHPUnit']);
+ }
+ }
+
+ if (!empty($required['OS']) && !preg_match($required['OS'], PHP_OS)) {
+ $missing[] = sprintf('Operating system matching %s is required.', $required['OS']);
+ }
+
+ if (!empty($required['functions'])) {
+ foreach ($required['functions'] as $function) {
+ $pieces = explode('::', $function);
+ if (2 === count($pieces) && method_exists($pieces[0], $pieces[1])) {
+ continue;
+ }
+ if (function_exists($function)) {
+ continue;
+ }
+ $missing[] = sprintf('Function %s is required.', $function);
+ }
+ }
+
+ if (!empty($required['extensions'])) {
+ foreach ($required['extensions'] as $extension) {
+ if (!extension_loaded($extension)) {
+ $missing[] = sprintf('Extension %s is required.', $extension);
+ }
+ }
+ }
+
+ return $missing;
+ }
+
/**
* Returns the expected exception for a test.
*
@@ -270,12 +277,14 @@ 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];
$code = null;
$message = '';
+ $messageRegExp = '';
if (isset($matches[2])) {
$message = trim($matches[2]);
@@ -285,6 +294,12 @@ public static function getExpectedException($className, $methodName)
);
}
+ if (isset($annotations['method']['expectedExceptionMessageRegExp'])) {
+ $messageRegExp = self::parseAnnotationContent(
+ $annotations['method']['expectedExceptionMessageRegExp'][0]
+ );
+ }
+
if (isset($matches[3])) {
$code = $matches[3];
} elseif (isset($annotations['method']['expectedExceptionCode'])) {
@@ -300,7 +315,7 @@ public static function getExpectedException($className, $methodName)
}
return array(
- 'class' => $class, 'code' => $code, 'message' => $message
+ 'class' => $class, 'code' => $code, 'message' => $message, 'message_regex' => $messageRegExp
);
}
@@ -364,7 +379,7 @@ public static function getProvidedData($className, $methodName)
$dataProviderClass = new ReflectionClass($dataProviderClassName);
$dataProviderMethod = $dataProviderClass->getMethod(
- $dataProviderMethodName
+ $dataProviderMethodName
);
if ($dataProviderMethod->isStatic()) {
@@ -388,10 +403,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 +479,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 +502,8 @@ public static function getBackupSettings($className, $methodName)
public static function getDependencies($className, $methodName)
{
$annotations = self::parseTestMethodAnnotations(
- $className, $methodName
+ $className,
+ $methodName
);
$dependencies = array();
@@ -494,7 +514,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 +533,9 @@ public static function getDependencies($className, $methodName)
public static function getErrorHandlerSettings($className, $methodName)
{
return self::getBooleanAnnotationSetting(
- $className, $methodName, 'errorHandler'
+ $className,
+ $methodName,
+ 'errorHandler'
);
}
@@ -527,7 +550,8 @@ public static function getErrorHandlerSettings($className, $methodName)
public static function getGroups($className, $methodName = '')
{
$annotations = self::parseTestMethodAnnotations(
- $className, $methodName
+ $className,
+ $methodName
);
$groups = array();
@@ -604,7 +628,8 @@ public static function getSize($className, $methodName)
public static function getTickets($className, $methodName)
{
$annotations = self::parseTestMethodAnnotations(
- $className, $methodName
+ $className,
+ $methodName
);
$tickets = array();
@@ -631,7 +656,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 +679,9 @@ public static function getProcessIsolationSettings($className, $methodName)
public static function getPreserveGlobalStateSettings($className, $methodName)
{
return self::getBooleanAnnotationSetting(
- $className, $methodName, 'preserveGlobalState'
+ $className,
+ $methodName,
+ 'preserveGlobalState'
);
}
@@ -726,7 +754,8 @@ private static function emptyHookMethodsArray()
private static function getBooleanAnnotationSetting($className, $methodName, $settingName)
{
$annotations = self::parseTestMethodAnnotations(
- $className, $methodName
+ $className,
+ $methodName
);
$result = null;
@@ -770,11 +799,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 +833,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 +841,17 @@ interface_exists($className) ||
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 +860,7 @@ trait_exists($className)) &&
$extended = false;
if (strpos($element, '<extended>') !== false) {
- $element = str_replace(
- '<extended>', '', $element
- );
-
+ $element = str_replace('<extended>', '', $element);
$extended = true;
}
@@ -841,9 +868,9 @@ trait_exists($className)) &&
if ($extended) {
$classes = array_merge(
- $classes,
- class_implements($element),
- class_parents($element)
+ $classes,
+ class_implements($element),
+ class_parents($element)
);
}
@@ -852,11 +879,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,38 +910,16 @@ 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())
)
- )
);
}
return $result;
}
- /**
- * @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
diff --git a/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
index 8e599b4e711c82ce409bc6a80ff2d9b4129679e8..d1c59504107548f89cd810fe017cb44bba12f478 100644
--- a/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_TestDox
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util_TestDox
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
diff --git a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
index b227f24ff5dd8e31663f5c103b5e5e5760e8f298..8963be60cff5afa0d77926ca1c5df4a85b094c3b 100644
--- a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_TestDox
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util_TestDox
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
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 c501dc723f10e9119bf1e5426b8e9d2ef7841c87..b4676fc570f7b3e293b8da482dffdad905f2f758 100644
--- a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_TestDox
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util_TestDox
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
@@ -78,8 +43,8 @@ protected function startRun()
protected function startClass($name)
{
$this->write(
- '<h2 id="' . $name . '">' . $this->currentTestClassPrettified .
- '</h2><ul>'
+ '<h2 id="' . $name . '">' . $this->currentTestClassPrettified .
+ '</h2><ul>'
);
}
diff --git a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
index 6a76c314b32f2df98f798fde27a58b591b02fbc8..29c925b3b43e7b666e53bbed445084320349b3e6 100644
--- a/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util_TestDox
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util_TestDox
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
diff --git a/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
index dc4979071b291609dd6cd5b6f7ad0ddaa73d588c..df5ae911b70c91b921ae629a5870abbd13fbecfe 100644
--- a/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
@@ -67,9 +32,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 +95,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 d48d4c2b0c7884b9d833ccae4d4cd13bc5a0f1fd..e616c7a7eabd4f315a99b967cc4331efceebd24f 100644
--- a/core/vendor/phpunit/phpunit/src/Util/Type.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Type.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @subpackage Util
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
@@ -59,8 +24,8 @@ class PHPUnit_Util_Type
public static function isType($type)
{
return in_array(
- $type,
- array(
+ $type,
+ array(
'numeric',
'integer',
'int',
@@ -73,7 +38,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 e4ac534ddb1e365bdf53b373a98a6e2a7645177a..6ac0b7b705b4f41924c98fc12c0c38b9d3935540 100644
--- a/core/vendor/phpunit/phpunit/src/Util/XML.php
+++ b/core/vendor/phpunit/phpunit/src/Util/XML.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @subpackage Util
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.2.0
@@ -70,11 +35,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 +49,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 +61,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 +89,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 <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
* @author Tobias Schlitt <toby@php.net>
*/
- 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 +221,7 @@ public static function xmlToVariable(DOMElement $element)
$variable[] = $value;
}
}
- }
+ }
break;
case 'object': {
@@ -266,12 +242,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 +256,7 @@ public static function xmlToVariable(DOMElement $element)
$variable = $element->nodeValue;
settype($variable, $element->tagName);
- }
+ }
break;
}
@@ -319,7 +295,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 +327,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 +366,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 +377,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 +390,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 +499,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 +512,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 +537,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 +564,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 +582,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 +614,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 +765,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 +785,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 +807,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 e934e9ba347a523912d968ec7f086935782f31d9..1dcf4acc94f40ab0749a4ae4155bd5e6614d761b 100644
--- a/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -96,9 +62,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/Fail/fail.phpt b/core/vendor/phpunit/phpunit/tests/Fail/fail.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..b88454fdf99cc4e63076f0f0e904850aaf02dfec
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Fail/fail.phpt
@@ -0,0 +1,5 @@
+--TEST--
+// This test intentionally fails and it is checked by Travis.
+--FILE--
+--EXPECTF--
+unexpected
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
index 1736520861a4e24227968c4eddc9cdda339c57ab..db7be62886cf97c9cbc38ea957f21840932a75a7 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -70,9 +35,7 @@ public function testFail()
{
try {
$this->fail();
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -93,9 +56,7 @@ public function testAssertSplObjectStorageContainsObject()
try {
$this->assertContains($b, $c);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -114,9 +75,7 @@ public function testAssertArrayContainsObject()
try {
$this->assertContains($a, array($b));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -132,9 +91,7 @@ public function testAssertArrayContainsString()
try {
$this->assertContains('foo', array('bar'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -150,9 +107,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,15 +164,128 @@ public function testAssertArrayHasIntegerKey()
try {
$this->assertArrayHasKey(1, array('foo'));
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ return;
}
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ $this->fail();
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertArraySubset
+ * @covers PHPUnit_Framework_Constraint_ArraySubset
+ */
+ public function testassertArraySubset()
+ {
+ $array = array(
+ 'a' => 'item a',
+ 'b' => 'item b',
+ 'c' => array('a2' => 'item a2', 'b2' => 'item b2'),
+ 'd' => array('a2' => array('a3' => 'item a3', 'b3' => 'item b3'))
+ );
+
+ $this->assertArraySubset(array('a' => 'item a', 'c' => array('a2' => 'item a2')), $array);
+ $this->assertArraySubset(array('a' => 'item a', 'd' => array('a2' => array('b3' => 'item b3'))), $array);
+
+ try {
+ $this->assertArraySubset(array('a' => 'bad value'), $array);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ }
+
+ try {
+ $this->assertArraySubset(array('d' => array('a2' => array('bad index' => 'item b3'))), $array);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
$this->fail();
}
+ /**
+ * @covers PHPUnit_Framework_Assert::assertArraySubset
+ * @covers PHPUnit_Framework_Constraint_ArraySubset
+ */
+ public function testassertArraySubsetWithDeepNestedArrays()
+ {
+ $array = array(
+ 'path' => array(
+ 'to' => array(
+ 'the' => array(
+ 'cake' => 'is a lie'
+ )
+ )
+ )
+ );
+
+ $this->assertArraySubset(array('path' => array()), $array);
+ $this->assertArraySubset(array('path' => array('to' => array())), $array);
+ $this->assertArraySubset(array('path' => array('to' => array('the' => array()))), $array);
+ $this->assertArraySubset(array('path' => array('to' => array('the' => array('cake' => 'is a lie')))), $array);
+
+ try {
+ $this->assertArraySubset(array('path' => array('to' => array('the' => array('cake' => 'is not a lie')))), $array);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ return;
+ }
+
+ $this->fail();
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertArraySubset
+ * @covers PHPUnit_Framework_Constraint_ArraySubset
+ */
+ public function testassertArraySubsetWithNoStrictCheckAndObjects()
+ {
+ $obj = new \stdClass;
+ $reference = &$obj;
+ $array = array('a' => $obj);
+
+ $this->assertArraySubset(array('a' => $reference), $array);
+ $this->assertArraySubset(array('a' => new \stdClass), $array);
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertArraySubset
+ * @covers PHPUnit_Framework_Constraint_ArraySubset
+ */
+ public function testassertArraySubsetWithStrictCheckAndObjects()
+ {
+ $obj = new \stdClass;
+ $reference = &$obj;
+ $array = array('a' => $obj);
+
+ $this->assertArraySubset(array('a' => $reference), $array, true);
+
+ try {
+ $this->assertArraySubset(array('a' => new \stdClass), $array, true);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ return;
+ }
+
+ $this->fail('Strict recursive array check fail.');
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertArraySubset
+ * @covers PHPUnit_Framework_Constraint_ArraySubset
+ * @expectedException PHPUnit_Framework_Exception
+ * @expectedExceptionMessage array or ArrayAccess
+ * @dataProvider assertArraySubsetInvalidArgumentProvider
+ */
+ public function testassertArraySubsetRaisesExceptionForInvalidArguments($partial, $subject)
+ {
+ $this->assertArraySubset($partial, $subject);
+ }
+
+ public function assertArraySubsetInvalidArgumentProvider()
+ {
+ return array(
+ array(false, array()),
+ array(array(), false),
+ );
+ }
+
/**
* @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
* @expectedException PHPUnit_Framework_Exception
@@ -245,9 +313,7 @@ public function testAssertArrayNotHasIntegerKey()
try {
$this->assertArrayNotHasKey(0, array('foo'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -263,9 +329,7 @@ public function testAssertArrayHasStringKey()
try {
$this->assertArrayHasKey('bar', array('foo' => 'bar'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -281,9 +345,7 @@ public function testAssertArrayNotHasStringKey()
try {
$this->assertArrayNotHasKey('foo', array('foo' => 'bar'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -373,9 +435,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 +451,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 +467,7 @@ public function testAssertStringContainsString()
try {
$this->assertContains('foo', 'bar');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -441,9 +497,7 @@ public function testAssertSplObjectStorageNotContainsObject()
try {
$this->assertNotContains($a, $c);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -462,9 +516,7 @@ public function testAssertArrayNotContainsObject()
try {
$this->assertNotContains($a, array($a));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -480,9 +532,7 @@ public function testAssertArrayNotContainsString()
try {
$this->assertNotContains('foo', array('foo'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -498,9 +548,7 @@ public function testAssertArrayNotContainsNonObject()
try {
$this->assertNotContains('foo', array(true));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -516,9 +564,7 @@ public function testAssertStringNotContainsString()
try {
$this->assertNotContains('foo', 'foo');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -561,9 +607,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 +623,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 +639,7 @@ public function testAssertArrayContainsOnlyStdClass()
try {
$this->assertContainsOnly('StdClass', array('StdClass'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -615,9 +655,7 @@ public function testAssertArrayNotContainsOnlyStdClass()
try {
$this->assertNotContainsOnly('StdClass', array(new StdClass));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -679,9 +717,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 +997,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 +1021,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 +1045,7 @@ public function testAssertSameFails($a, $b)
{
try {
$this->assertSame($a, $b);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1037,9 +1069,7 @@ public function testAssertNotSameFails($a, $b)
{
try {
$this->assertNotSame($a, $b);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1052,18 +1082,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 +1104,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 +1126,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 +1148,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 +1173,7 @@ public function testAssertXmlStringEqualsXmlString()
try {
$this->assertXmlStringEqualsXmlString('<foo/>', '<bar/>');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1169,9 +1189,7 @@ public function testAssertXmlStringNotEqualsXmlString()
try {
$this->assertXmlStringNotEqualsXmlString('<root/>', '<root/>');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1190,7 +1208,7 @@ public function testXMLStructureIsSame()
$actual->load($this->filesDirectory . 'structureExpected.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1207,7 +1225,7 @@ public function testXMLStructureWrongNumberOfAttributes()
$actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1224,7 +1242,7 @@ public function testXMLStructureWrongNumberOfNodes()
$actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1240,7 +1258,7 @@ public function testXMLStructureIsSameButDataIsNot()
$actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1256,7 +1274,7 @@ public function testXMLStructureAttributesAreSameButValuesAreNot()
$actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1272,7 +1290,7 @@ public function testXMLStructureIgnoreTextNodes()
$actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml');
$this->assertEqualXMLStructure(
- $expected->firstChild, $actual->firstChild, true
+ $expected->firstChild, $actual->firstChild, true
);
}
@@ -1285,9 +1303,7 @@ public function testAssertStringEqualsNumeric()
try {
$this->assertEquals('0', 1);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1320,9 +1336,7 @@ public function testAssertFileExists()
try {
$this->assertFileExists(__DIR__ . DIRECTORY_SEPARATOR . 'NotExisting');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1347,9 +1361,7 @@ public function testAssertFileNotExists()
try {
$this->assertFileNotExists(__FILE__);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1367,9 +1379,7 @@ public function testAssertObjectHasAttribute()
try {
$this->assertObjectHasAttribute('foo', $o);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1387,9 +1397,7 @@ public function testAssertObjectNotHasAttribute()
try {
$this->assertObjectNotHasAttribute('name', $o);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1405,9 +1413,7 @@ public function testAssertNull()
try {
$this->assertNull(new stdClass);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1423,9 +1429,7 @@ public function testAssertNotNull()
try {
$this->assertNotNull(null);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1441,9 +1445,7 @@ public function testAssertTrue()
try {
$this->assertTrue(false);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1461,9 +1463,7 @@ public function testAssertNotTrue()
try {
$this->assertNotTrue(true);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1479,9 +1479,7 @@ public function testAssertFalse()
try {
$this->assertFalse(true);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1499,9 +1497,7 @@ public function testAssertNotFalse()
try {
$this->assertNotFalse(false);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1553,9 +1549,7 @@ public function testAssertRegExp()
try {
$this->assertRegExp('/foo/', 'bar');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1571,9 +1565,7 @@ public function testAssertNotRegExp()
try {
$this->assertNotRegExp('/foo/', 'foobar');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1591,12 +1583,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 +1603,7 @@ public function testAssertSame2()
try {
$this->assertSame(true, false);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1628,27 +1616,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 +1651,7 @@ public function testAssertNotSame2()
try {
$this->assertNotSame(true, true);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1681,9 +1665,7 @@ public function testAssertNotSameFailsNull()
{
try {
$this->assertNotSame(null, null);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1699,9 +1681,7 @@ public function testGreaterThan()
try {
$this->assertGreaterThan(2, 1);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1714,16 +1694,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 +1717,7 @@ public function testGreaterThanOrEqual()
try {
$this->assertGreaterThanOrEqual(2, 1);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1754,16 +1730,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 +1753,7 @@ public function testLessThan()
try {
$this->assertLessThan(1, 2);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1794,16 +1766,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 +1789,7 @@ public function testLessThanOrEqual()
try {
$this->assertLessThanOrEqual(1, 2);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -1834,16 +1802,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 +1977,8 @@ public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument3()
public function testGetObjectAttributeWorksForInheritedAttributes()
{
$this->assertEquals(
- 'bar',
- $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute')
+ 'bar',
+ $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute')
);
}
@@ -2027,9 +1993,7 @@ public function testAssertPublicAttributeContains()
try {
$this->assertAttributeContains('bar', 'publicArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2047,9 +2011,7 @@ public function testAssertPublicAttributeContainsOnly()
try {
$this->assertAttributeContainsOnly('integer', 'publicArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2067,9 +2029,7 @@ public function testAssertPublicAttributeNotContains()
try {
$this->assertAttributeNotContains('foo', 'publicArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2087,9 +2047,7 @@ public function testAssertPublicAttributeNotContainsOnly()
try {
$this->assertAttributeNotContainsOnly('string', 'publicArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2107,9 +2065,7 @@ public function testAssertProtectedAttributeContains()
try {
$this->assertAttributeContains('foo', 'protectedArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2127,9 +2083,7 @@ public function testAssertProtectedAttributeNotContains()
try {
$this->assertAttributeNotContains('bar', 'protectedArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2147,9 +2101,7 @@ public function testAssertPrivateAttributeContains()
try {
$this->assertAttributeContains('foo', 'privateArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2167,9 +2119,7 @@ public function testAssertPrivateAttributeNotContains()
try {
$this->assertAttributeNotContains('baz', 'privateArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2187,9 +2137,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 +2155,7 @@ public function testAssertAttributeNotContainsNonObject()
try {
$this->assertAttributeNotContains(true, 'privateArray', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2227,9 +2173,7 @@ public function testAssertPublicAttributeEquals()
try {
$this->assertAttributeEquals('bar', 'publicAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2247,9 +2191,7 @@ public function testAssertPublicAttributeNotEquals()
try {
$this->assertAttributeNotEquals('foo', 'publicAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2267,9 +2209,7 @@ public function testAssertPublicAttributeSame()
try {
$this->assertAttributeSame('bar', 'publicAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2287,9 +2227,7 @@ public function testAssertPublicAttributeNotSame()
try {
$this->assertAttributeNotSame('foo', 'publicAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2307,9 +2245,7 @@ public function testAssertProtectedAttributeEquals()
try {
$this->assertAttributeEquals('foo', 'protectedAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2327,9 +2263,7 @@ public function testAssertProtectedAttributeNotEquals()
try {
$this->assertAttributeNotEquals('bar', 'protectedAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2347,9 +2281,7 @@ public function testAssertPrivateAttributeEquals()
try {
$this->assertAttributeEquals('foo', 'privateAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2367,9 +2299,7 @@ public function testAssertPrivateAttributeNotEquals()
try {
$this->assertAttributeNotEquals('baz', 'privateAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2385,9 +2315,7 @@ public function testAssertPublicStaticAttributeEquals()
try {
$this->assertAttributeEquals('bar', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2403,9 +2331,7 @@ public function testAssertPublicStaticAttributeNotEquals()
try {
$this->assertAttributeNotEquals('foo', 'publicStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2421,9 +2347,7 @@ public function testAssertProtectedStaticAttributeEquals()
try {
$this->assertAttributeEquals('foo', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2439,9 +2363,7 @@ public function testAssertProtectedStaticAttributeNotEquals()
try {
$this->assertAttributeNotEquals('bar', 'protectedStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2457,9 +2379,7 @@ public function testAssertPrivateStaticAttributeEquals()
try {
$this->assertAttributeEquals('foo', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2475,9 +2395,7 @@ public function testAssertPrivateStaticAttributeNotEquals()
try {
$this->assertAttributeNotEquals('baz', 'privateStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2655,9 +2573,7 @@ public function testClassHasPublicAttribute()
try {
$this->assertClassHasAttribute('attribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2673,9 +2589,7 @@ public function testClassNotHasPublicAttribute()
try {
$this->assertClassNotHasAttribute('publicAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2691,9 +2605,7 @@ public function testClassHasPublicStaticAttribute()
try {
$this->assertClassHasStaticAttribute('attribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2709,9 +2621,7 @@ public function testClassNotHasPublicStaticAttribute()
try {
$this->assertClassNotHasStaticAttribute('publicStaticAttribute', 'ClassWithNonPublicAttributes');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2729,9 +2639,7 @@ public function testObjectHasPublicAttribute()
try {
$this->assertObjectHasAttribute('attribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2749,9 +2657,7 @@ public function testObjectNotHasPublicAttribute()
try {
$this->assertObjectNotHasAttribute('publicAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2770,9 +2676,7 @@ public function testObjectHasOnTheFlyAttribute()
try {
$this->assertObjectHasAttribute('bar', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2791,9 +2695,7 @@ public function testObjectNotHasOnTheFlyAttribute()
try {
$this->assertObjectNotHasAttribute('foo', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2811,9 +2713,7 @@ public function testObjectHasProtectedAttribute()
try {
$this->assertObjectHasAttribute('attribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2831,9 +2731,7 @@ public function testObjectNotHasProtectedAttribute()
try {
$this->assertObjectNotHasAttribute('protectedAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2851,9 +2749,7 @@ public function testObjectHasPrivateAttribute()
try {
$this->assertObjectHasAttribute('attribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2871,9 +2767,7 @@ public function testObjectNotHasPrivateAttribute()
try {
$this->assertObjectNotHasAttribute('privateAttribute', $obj);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -2888,11 +2782,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 +2799,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 +2815,8 @@ public function testAssertThatAttributeEquals2()
public function testAssertThatAttributeEqualTo()
{
$this->assertThat(
- new ClassWithNonPublicAttributes,
- $this->attributeEqualTo('publicAttribute', 'foo')
+ new ClassWithNonPublicAttributes,
+ $this->attributeEqualTo('publicAttribute', 'foo')
);
}
@@ -2943,10 +2837,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 +2852,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 +2868,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 +2927,8 @@ public function testAssertThatArrayHasKey()
public function testAssertThatClassHasAttribute()
{
$this->assertThat(
- new ClassWithNonPublicAttributes,
- $this->classHasAttribute('publicAttribute')
+ new ClassWithNonPublicAttributes,
+ $this->classHasAttribute('publicAttribute')
);
}
@@ -3045,8 +2939,8 @@ public function testAssertThatClassHasAttribute()
public function testAssertThatClassHasStaticAttribute()
{
$this->assertThat(
- new ClassWithNonPublicAttributes,
- $this->classHasStaticAttribute('publicStaticAttribute')
+ new ClassWithNonPublicAttributes,
+ $this->classHasStaticAttribute('publicStaticAttribute')
);
}
@@ -3057,8 +2951,8 @@ public function testAssertThatClassHasStaticAttribute()
public function testAssertThatObjectHasAttribute()
{
$this->assertThat(
- new ClassWithNonPublicAttributes,
- $this->objectHasAttribute('publicAttribute')
+ new ClassWithNonPublicAttributes,
+ $this->objectHasAttribute('publicAttribute')
);
}
@@ -3170,7 +3064,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 +3083,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 +3105,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 +3127,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 +3149,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 +3246,7 @@ public function testAssertStringStartsWith()
try {
$this->assertStringStartsWith('prefix', 'foo');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3377,9 +3262,7 @@ public function testAssertStringStartsNotWith()
try {
$this->assertStringStartsNotWith('prefix', 'prefixfoo');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3395,9 +3278,7 @@ public function testAssertStringEndsWith()
try {
$this->assertStringEndsWith('suffix', 'foo');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3413,9 +3294,7 @@ public function testAssertStringEndsNotWith()
try {
$this->assertStringEndsNotWith('suffix', 'foosuffix');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3484,9 +3363,7 @@ public function testAssertStringNotMatchesFormat()
try {
$this->assertStringMatchesFormat('*%s*', '**');
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3502,9 +3379,7 @@ public function testAssertEmpty()
try {
$this->assertEmpty(array('foo'));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3520,9 +3395,7 @@ public function testAssertNotEmpty()
try {
$this->assertNotEmpty(array());
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3542,9 +3415,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 +3435,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 +3449,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 +3465,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 +3483,23 @@ public function testAssertCount()
try {
$this->assertCount(2, array(1,2,3));
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ return;
}
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ $this->fail();
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertCount
+ */
+ public function testAssertCountTraversable()
+ {
+ $this->assertCount(2, new ArrayIterator(array(1,2)));
+
+ try {
+ $this->assertCount(2, new ArrayIterator(array(1,2,3)));
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3634,9 +3513,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 +3530,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 +3559,7 @@ public function testAssertNotCount()
try {
$this->assertNotCount(2, array(1,2));
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -3731,9 +3604,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 +3618,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 +3634,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 +3652,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 +3743,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 +3754,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 +3775,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 +3789,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 +3800,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 +3814,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 +3825,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 +3839,7 @@ public function testAssertInstanceOf()
try {
$this->assertInstanceOf('Exception', new stdClass);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -4012,9 +3875,7 @@ public function testAssertNotInstanceOf()
try {
$this->assertNotInstanceOf('stdClass', new stdClass);
- }
-
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -4050,9 +3911,23 @@ public function testAssertInternalType()
try {
$this->assertInternalType('string', 1);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
+ return;
}
- catch (PHPUnit_Framework_AssertionFailedError $e) {
+ $this->fail();
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Assert::assertInternalType
+ */
+ public function testAssertInternalTypeDouble()
+ {
+ $this->assertInternalType('double', 1.0);
+
+ try {
+ $this->assertInternalType('double', 1);
+ } catch (PHPUnit_Framework_AssertionFailedError $e) {
return;
}
@@ -4088,9 +3963,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/BaseTestListenerTest.php b/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
index 5e46c0fbeda9571b633456bb12f49c1db0c6dcea..2193af4b4043bdd2d49043ea17c0426ef4ae78c6 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Giorgio Sironi <info@giorgiosironi.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Giorgio Sironi <info@giorgiosironi.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
index 326b6c3c829c2220d0bcb75b2be7c0068853c210..b309318dbb5278ccd0da5863f48d0055b3cc8206 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Jeroen Versteeg <jversteeg@gmail.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Jeroen Versteeg <jversteeg@gmail.com>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.7.30
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageRegExpTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageRegExpTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d6414aa1c3e08fb1eab5cce9fbe626e1b4a98189
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageRegExpTest.php
@@ -0,0 +1,64 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package PHPUnit
+ * @author Márcio Almada <marcio3w@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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.3.0
+ * @covers PHPUnit_Framework_Constraint_ExceptionMessageRegExp
+ */
+class ExceptionMessageRegExpTest extends PHPUnit_Framework_TestCase
+{
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessageRegExp /^A polymorphic \w+ message/
+ */
+ public function testRegexMessage()
+ {
+ throw new Exception("A polymorphic exception message");
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessageRegExp /^a poly[a-z]+ [a-zA-Z0-9_]+ me(s){2}age$/i
+ */
+ public function testRegexMessageExtreme()
+ {
+ throw new Exception("A polymorphic exception message");
+ }
+
+ /**
+ * @runInSeparateProcess
+ * @requires extension xdebug
+ * @expectedException \Exception
+ * @expectedExceptionMessageRegExp #Screaming preg_match#
+ */
+ public function testMessageXdebugScreamCompatibility()
+ {
+ ini_set('xdebug.scream', '1');
+ throw new Exception("Screaming preg_match");
+ }
+
+ /**
+ * @coversNothing
+ * @expectedException \Exception variadic
+ * @expectedExceptionMessageRegExp /^A variadic \w+ message/
+ */
+ public function testSimultaneousLiteralAndRegExpExceptionMessage()
+ {
+ throw new Exception("A variadic exception message");
+ }
+}
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 0000000000000000000000000000000000000000..9f59813cf370a982d96c47a873d6ed79020bf894
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/ExceptionMessageTest.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package PHPUnit
+ * @author Márcio Almada <marcio3w@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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");
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
index 929afad7fb13f8c50d1cf96e3c0451405974eafb..76e611be1ab1ccaf7d2a2bab1d8f737f3b6607c5 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
@@ -1,51 +1,17 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
- * @link http://www.phpunit.de/
- * @since File available since Release 3.7.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
* @link http://www.phpunit.de/
* @since File available since Release 3.7.0
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
index 08e74c4145c349b51bde5fd79f5e1325b009b0c2..ed535778690dd8b75048502783af4163a6537af5 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
@@ -1,51 +1,17 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
- * @link http://www.phpunit.de/
- * @since File available since Release 3.7.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
* @package PHPUnit
* @author Bastian Feder <php@bastian-feder.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause
* @link http://www.phpunit.de/
* @since File available since Release 3.7.0
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php b/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
index 7151146d8bfc1e8de6da44872f63edae447d1177..18364ab0684484bdba278d0365ac1c68c407bcee 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
@@ -1,46 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -49,7 +14,7 @@
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.0.0
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 17a20837d3ca42f684e7e13e1a9c4317858a4c64..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
+++ /dev/null
@@ -1,977 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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 <sebastian@phpunit.de>
- * @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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 61e141c5220381967c80ee736e5e9a7689058efc..c1899ddc96962e2ac4dbd891248afad96f32a659 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
@@ -1,68 +1,38 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeAndAfterTest.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeClassAndAfterClassTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'DataProviderSkippedTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'DataProviderIncompleteTest.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'InheritedTestCase.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCaseClass.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCases.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotPublicTestCase.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotVoidTestCase.php';
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'OverrideTestCase.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'RequirementsClassBeforeClassHookTest.php';
/**
*
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
* @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 +55,10 @@ 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('testSkippedTestDataProvider'));
+ $suite->addTest(new Framework_SuiteTest('testIncompleteTestDataProvider'));
+ $suite->addTest(new Framework_SuiteTest('testRequirementsBeforeClassHook'));
+ $suite->addTest(new Framework_SuiteTest('testDontSkipInheritedClass'));
return $suite;
}
@@ -92,7 +66,7 @@ public static function suite()
public function testAddTestSuite()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'OneTestCase'
+ 'OneTestCase'
);
$suite->run($this->result);
@@ -103,7 +77,7 @@ public function testAddTestSuite()
public function testInheritedTests()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'InheritedTestCase'
+ 'InheritedTestCase'
);
$suite->run($this->result);
@@ -115,7 +89,7 @@ public function testInheritedTests()
public function testNoTestCases()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'NoTestCases'
+ 'NoTestCases'
);
$suite->run($this->result);
@@ -147,7 +121,7 @@ public function testNotExistingTestCase()
public function testNotPublicTestCase()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'NotPublicTestCase'
+ 'NotPublicTestCase'
);
$this->assertEquals(2, count($suite));
@@ -156,7 +130,7 @@ public function testNotPublicTestCase()
public function testNotVoidTestCase()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'NotVoidTestCase'
+ 'NotVoidTestCase'
);
$this->assertEquals(1, count($suite));
@@ -165,7 +139,7 @@ public function testNotVoidTestCase()
public function testOneTestCase()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'OneTestCase'
+ 'OneTestCase'
);
$suite->run($this->result);
@@ -179,7 +153,7 @@ public function testOneTestCase()
public function testShadowedTests()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'OverrideTestCase'
+ 'OverrideTestCase'
);
$suite->run($this->result);
@@ -190,7 +164,7 @@ public function testShadowedTests()
public function testBeforeClassAndAfterClassAnnotations()
{
$suite = new PHPUnit_Framework_TestSuite(
- 'BeforeClassAndAfterClassTest'
+ 'BeforeClassAndAfterClassTest'
);
BeforeClassAndAfterClassTest::resetProperties();
@@ -213,4 +187,50 @@ public function testBeforeAnnotation()
$this->assertEquals(2, BeforeAndAfterTest::$afterWasRun);
}
+ public function testSkippedTestDataProvider()
+ {
+ $suite = new PHPUnit_Framework_TestSuite('DataProviderSkippedTest');
+
+ $suite->run($this->result);
+
+ $this->assertEquals(3, $this->result->count());
+ $this->assertEquals(1, $this->result->skippedCount());
+ }
+
+ public function testIncompleteTestDataProvider()
+ {
+ $suite = new PHPUnit_Framework_TestSuite('DataProviderIncompleteTest');
+
+ $suite->run($this->result);
+
+ $this->assertEquals(3, $this->result->count());
+ $this->assertEquals(1, $this->result->notImplementedCount());
+ }
+
+ public function testRequirementsBeforeClassHook()
+ {
+ $suite = new PHPUnit_Framework_TestSuite(
+ 'RequirementsClassBeforeClassHookTest'
+ );
+
+ $suite->run($this->result);
+
+ $this->assertEquals(0, $this->result->errorCount());
+ $this->assertEquals(1, $this->result->skippedCount());
+ }
+
+ 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 b660ec6635ed558f41966ea8355ce18645fb57ad..477f68ad20a63f42b39864977f1e897bb5b53f60 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoArgTestCaseTest.php';
@@ -60,7 +26,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
@@ -78,8 +44,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 +170,74 @@ 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->setExpectedExceptionRegExp('RuntimeException', '/runtime .*? occurred/');
+
+ $result = $test->run();
+
+ $this->assertEquals(1, count($result));
+ $this->assertTrue($result->wasSuccessful());
+ }
+
+ public function testExceptionWithWrongRegexpMessage()
+ {
+ $test = new ThrowExceptionTestCase('test');
+ $test->setExpectedExceptionRegExp('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()
+ );
+ }
+
+ /**
+ * @covers PHPUnit_Framework_Constraint_ExceptionMessageRegExp
+ */
+ public function testExceptionWithInvalidRegexpMessage()
+ {
+ $test = new ThrowExceptionTestCase('test');
+ $test->setExpectedExceptionRegExp('RuntimeException', '#runtime .*? occurred/'); // wrong delimiter
+
+ $result = $test->run();
+
+ $this->assertEquals(
+ "Invalid expected exception message regex given: '#runtime .*? occurred/'",
+ $test->getStatusMessage()
+ );
+ }
+
public function testNoException()
{
$test = new ThrowNoExceptionTestCase('test');
@@ -307,7 +341,26 @@ public function testStaticAttributesBackupPre()
public function testStaticAttributesBackupPost()
{
$this->assertNotSame($GLOBALS['singleton'], Singleton::getInstance());
- $this->assertSame(123, self::$_testStatic);
+ $this->assertSame(0, self::$_testStatic);
+ }
+
+ public function testIsInIsolationReturnsFalse()
+ {
+ $test = new IsolationTest('testIsInIsolationReturnsFalse');
+ $result = $test->run();
+
+ $this->assertEquals(1, count($result));
+ $this->assertTrue($result->wasSuccessful());
+ }
+
+ public function testIsInIsolationReturnsTrue()
+ {
+ $test = new IsolationTest('testIsInIsolationReturnsTrue');
+ $test->setRunTestInSeparateProcess(true);
+ $result = $test->run();
+
+ $this->assertEquals(1, count($result));
+ $this->assertTrue($result->wasSuccessful());
}
public function testExpectOutputStringFooActualFoo()
@@ -353,8 +406,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 +418,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 +430,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 +442,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 +453,8 @@ public function testSkipsIfRequiresNonExistingExtension()
$result = $test->run();
$this->assertEquals(
- 'Extension testExt is required.',
- $test->getStatusMessage()
+ 'Extension testExt is required.',
+ $test->getStatusMessage()
);
}
@@ -411,14 +464,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 +512,4 @@ public function testCurrentWorkingDirectoryIsRestored()
$this->assertSame($expectedCwd, getcwd());
}
-
}
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
index 4b8805ae5983e534a23e16e42be5e2159f3e44c2..2ac01b41155860633ad03176f75952f9aeb49532 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.20
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.20
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
index f2d33a837421dac647e1117c71014da61ee9abf7..a882fe027bff101a7253755121016c62a9dc66b0 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
index 30d184b54fe1e7e248a8b26bacea667fb34245b6..f683ac262d9d5a887ed8fcdddd70355c6bae5707 100644
--- a/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/578.phpt b/core/vendor/phpunit/phpunit/tests/Regression/578.phpt
index dfbf855b395d7a02b14b1e99a4a711af0adb8c42..4a4d3e07fbc93cc5c11a95c814a9990509016280 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 0000000000000000000000000000000000000000..7d9dfcf28000a36a799707904a8ebce5ccc32fa8
--- /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--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1149Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1149/Issue1149Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..01ac870a01d56594b4bd51b128bc08991b7340bd
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1149/Issue1149Test.php
@@ -0,0 +1,18 @@
+<?php
+class Issue1149Test extends PHPUnit_Framework_TestCase
+{
+ public function testOne()
+ {
+ $this->assertTrue(true);
+ print '1';
+ }
+
+ /**
+ * @runInSeparateProcess
+ */
+ public function testTwo()
+ {
+ $this->assertTrue(true);
+ print '2';
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..c269f36ef1a336d3d1d78b18cf6cb13a22a92176
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216.phpt
@@ -0,0 +1,27 @@
+--TEST--
+GH-1216: PHPUnit bootstrap must take globals vars even when the file is specified in command line
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--configuration';
+$_SERVER['argv'][2] = dirname(__FILE__).'/1216/phpunit1216.xml';
+$_SERVER['argv'][3] = '--debug';
+$_SERVER['argv'][4] = '--bootstrap';
+$_SERVER['argv'][5] = dirname(__FILE__).'/1216/bootstrap1216.php';
+$_SERVER['argv'][6] = dirname(__FILE__) . '/1216/Issue1216Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s
+
+
+Starting test 'Issue1216Test::testConfigAvailableInBootstrap'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/Issue1216Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/Issue1216Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..cfceaf582da09df54ef9d744cdd0a6d2fac5b548
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/Issue1216Test.php
@@ -0,0 +1,8 @@
+<?php
+class Issue1216Test extends PHPUnit_Framework_TestCase
+{
+ public function testConfigAvailableInBootstrap()
+ {
+ $this->assertTrue($_ENV['configAvailableInBootstrap']);
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/bootstrap1216.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/bootstrap1216.php
new file mode 100644
index 0000000000000000000000000000000000000000..cec2724aa6f804c81a50efa5b39be6ba6d7fedd1
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/bootstrap1216.php
@@ -0,0 +1,2 @@
+<?php
+$_ENV['configAvailableInBootstrap'] = isset($_ENV['loadedFromConfig']);
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/phpunit1216.xml b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/phpunit1216.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1cc9bd63a67f88f5e22cafbd13b9410cc140715
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1216/phpunit1216.xml
@@ -0,0 +1,8 @@
+<phpunit>
+ <testsuite name="Github issue 1216">
+ <file>Issue1216Test.php</file>
+ </testsuite>
+ <php>
+ <env name="loadedFromConfig" value="1"/>
+ </php>
+</phpunit>
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 0000000000000000000000000000000000000000..af02df1c49fdf70ba30bdce61c1367991240ecf0
--- /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--
+<?php
+
+$_SERVER['argv'][1] = '--deb';
+$_SERVER['argv'][2] = '--config';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1330/phpunit1330.xml';
+$_SERVER['argv'][4] = 'Issue1330Test';
+$_SERVER['argv'][5] = dirname(__FILE__).'/1330/Issue1330Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..0829cb95b36f54eae0ad92f9b681368bd07d2191
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/Issue1330Test.php
@@ -0,0 +1,8 @@
+<?php
+class Issue1330Test extends PHPUnit_Framework_TestCase
+{
+ public function testTrue()
+ {
+ $this->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 0000000000000000000000000000000000000000..a61e0cc1022d35e47c51e99468bbc27d4fa13b4d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1330/phpunit1330.xml
@@ -0,0 +1,5 @@
+<phpunit>
+ <php>
+ <const name="PHPUNIT_1330" value="true"/>
+ </php>
+</phpunit>
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 0000000000000000000000000000000000000000..de467f6a2c584e5fd42d65953684dd213e6f287b
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335.phpt
@@ -0,0 +1,21 @@
+--TEST--
+GH-1335: exportVariable multiple backslash problem
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--bootstrap';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1335/bootstrap1335.php';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1335/Issue1335Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..307ef66a7d0aec16253fd36e211f673d718c326b
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/Issue1335Test.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState enabled
+ */
+class Issue1335Test extends PHPUnit_Framework_TestCase
+{
+ function testGlobalString()
+ {
+ $this->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 0000000000000000000000000000000000000000..6435677b2d077438c0976cda731658a4c45c3b66
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1335/bootstrap1335.php
@@ -0,0 +1,13 @@
+<?php
+$globalString = "Hello";
+$globalIntTruthy = 1;
+$globalIntFalsey = 0;
+$globalFloat = 1.123;
+$globalBoolTrue = true;
+$globalBoolFalse = false;
+$globalNull = null;
+$globalArray = array("foo");
+$globalNestedArray = array(array("foo"));
+$globalObject = (object)array("foo"=>"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 0000000000000000000000000000000000000000..17ee08e3c7fbd1a60553cd9d3e4d4cb43fc42e96
--- /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--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'Issue1337Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1337/Issue1337Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..44a2fceb889af8d8a34e9493a30782aefabb8553
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1337/Issue1337Test.php
@@ -0,0 +1,19 @@
+<?php
+class Issue1337Test extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider dataProvider
+ */
+ public function testProvider($a)
+ {
+ $this->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 0000000000000000000000000000000000000000..4e1cd1fe466474b2375435da64329c19f6d21d11
--- /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--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][3] = 'Issue1340Test';
+$_SERVER['argv'][4] = dirname(__FILE__).'/1340/Issue1340Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..f00312501ca64b204fe7ecc00afb1609421488e3
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1340/Issue1340Test.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @see https://bugs.php.net/bug.php?id=51800
+ */
+class Issue1340Test extends PHPUnit_Framework_TestCase
+{
+ private static function get4KB()
+ {
+ return str_repeat('1', 4096 + 1);
+ }
+
+ /**
+ * Also fails despite no isolation, because a phpt test is executed in
+ * subprocess on its own.
+ */
+ public function testLargeStderrOutputDoesNotBlock()
+ {
+ // STDERR of a phpt test is not caught/validated at this point, so this
+ // error output does not cause this test to fail.
+ // @see https://github.com/sebastianbergmann/phpunit/issues/1169
+ error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n", 4);
+ $this->assertTrue(true);
+ }
+
+ /**
+ * @runInSeparateProcess
+ */
+ public function testLargeStderrOutputDoesNotBlockInIsolation()
+ {
+ error_log("\n" . __FUNCTION__ . ": stderr:" . self::get4KB() . "\n", 4);
+ $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(), 4);
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..eae3c22d8ccafeb3016314bcb143d4b6e905e5d2
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348.phpt
@@ -0,0 +1,35 @@
+--TEST--
+GH-1348: STDOUT/STDERR IO streams should exist in process isolation
+--SKIPIF--
+<?php
+if (defined('HHVM_VERSION'))
+ print "skip: PHP runtime required";
+?>
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][] = '--strict';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = 'Issue1348Test';
+$_SERVER['argv'][] = __DIR__ . '/1348/Issue1348Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+STDOUT does not break test result
+E
+
+Time: %s, Memory: %sMb
+
+There was 1 error:
+
+1) Issue1348Test::testSTDERR
+PHPUnit_Framework_Exception: STDERR works as usual.
+
+FAILURES!
+Tests: 2, Assertions: 1, Errors: 1.
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348/Issue1348Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348/Issue1348Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..d3c82f0e8984fc881abfbfcd6db2095b55854837
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1348/Issue1348Test.php
@@ -0,0 +1,14 @@
+<?php
+class Issue1348Test extends PHPUnit_Framework_TestCase
+{
+ public function testSTDOUT()
+ {
+ fwrite(STDOUT, "\nSTDOUT does not break test result\n");
+ $this->assertTrue(true);
+ }
+
+ public function testSTDERR()
+ {
+ fwrite(STDERR, 'STDERR works as usual.');
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..ab96268efd519f03a9c317fedf5fb0d67974434e
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351.phpt
@@ -0,0 +1,48 @@
+--TEST--
+GH-1351: Test result does not serialize test class in process isolation
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo') || !in_array('sqlite', PDO::getAvailableDrivers())) {
+ print 'skip: PDO_SQLITE is required';
+}
+?>
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = 'Issue1351Test';
+$_SERVER['argv'][4] = __DIR__ . '/1351/Issue1351Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F.E.E
+
+Time: %s, Memory: %sMb
+
+There were 2 errors:
+
+1) Issue1351Test::testExceptionPre
+RuntimeException: Expected rethrown exception.
+%A
+Caused by
+LogicException: Expected exception.
+%A
+
+2) Issue1351Test::testPhpCoreLanguageException
+PDOException: SQLSTATE[HY000]: General error: 1 no such table: php_wtf
+%A
+
+--
+
+There was 1 failure:
+
+1) Issue1351Test::testFailurePre
+Expected failure.
+%A
+FAILURES!
+Tests: 5, Assertions: 5, Failures: 1, Errors: 2.
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/ChildProcessClass1351.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/ChildProcessClass1351.php
new file mode 100644
index 0000000000000000000000000000000000000000..24c05376667e82fda5e241f20cccb0c0375cddb9
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/ChildProcessClass1351.php
@@ -0,0 +1,4 @@
+<?php
+class ChildProcessClass1351
+{
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..f688c554785292309f3a302ff73b0f70c2937909
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1351/Issue1351Test.php
@@ -0,0 +1,48 @@
+<?php
+class Issue1351Test extends PHPUnit_Framework_TestCase
+{
+ protected $instance;
+
+ /**
+ * @runInSeparateProcess
+ */
+ public function testFailurePre()
+ {
+ $this->instance = new ChildProcessClass1351();
+ $this->assertFalse(true, 'Expected failure.');
+ }
+
+ public function testFailurePost()
+ {
+ $this->assertNull($this->instance);
+ $this->assertFalse(class_exists('ChildProcessClass1351', false), 'ChildProcessClass1351 is not loaded.');
+ }
+
+ /**
+ * @runInSeparateProcess
+ */
+ public function testExceptionPre()
+ {
+ $this->instance = new ChildProcessClass1351();
+ try {
+ throw new LogicException('Expected exception.');
+ } catch (LogicException $e) {
+ throw new RuntimeException('Expected rethrown exception.', 0, $e);
+ }
+ }
+
+ public function testExceptionPost()
+ {
+ $this->assertNull($this->instance);
+ $this->assertFalse(class_exists('ChildProcessClass1351', false), 'ChildProcessClass1351 is not loaded.');
+ }
+
+ public function testPhpCoreLanguageException()
+ {
+ // User-space code cannot instantiate a PDOException with a string code,
+ // so trigger a real one.
+ $connection = new PDO('sqlite::memory:');
+ $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ $connection->query("DELETE FROM php_wtf WHERE exception_code = 'STRING'");
+ }
+}
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 0000000000000000000000000000000000000000..9ec7e3c7961381471dc65c60dbc83c082ae39f28
--- /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--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1374Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1374/Issue1374Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..ad6a3bf090e300994431388920e00459e9fed6eb
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1374/Issue1374Test.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @requires extension I_DO_NOT_EXIST
+ */
+class Issue1374Test extends PHPUnit_Framework_TestCase
+{
+ protected function setUp()
+ {
+ print __FUNCTION__;
+ }
+
+ public function testSomething()
+ {
+ $this->fail('This should not be reached');
+ }
+
+ protected function tearDown()
+ {
+ print __FUNCTION__;
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..08f51070b7f6d8a94ab8540f9db0793dda6ca3a1
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437.phpt
@@ -0,0 +1,28 @@
+--TEST--
+GH-1437: Risky test messages mask failures
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1437Test';
+$_SERVER['argv'][3] = dirname(__FILE__).'/1437/Issue1437Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue1437Test::testFailure
+Failed asserting that false is true.
+
+%sIssue1437Test.php:%i
+
+FAILURES!
+Tests: 1, Assertions: 1, Failures: 1.
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437/Issue1437Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437/Issue1437Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..bff4b205ac7eaab230cef4f8167e0af995709a92
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1437/Issue1437Test.php
@@ -0,0 +1,9 @@
+<?php
+class Issue1437Test extends PHPUnit_Framework_TestCase
+{
+ public function testFailure()
+ {
+ ob_start();
+ $this->assertTrue(false);
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..b0b32e1a07583a11946b43d49684aa781f192fd2
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468.phpt
@@ -0,0 +1,22 @@
+--TEST--
+GH-1468: Incomplete and @todo annotated tests are counted twice
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--disallow-todo-tests';
+$_SERVER['argv'][3] = 'Issue1468Test';
+$_SERVER['argv'][4] = __DIR__ . '/1468/Issue1468Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+I
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Incomplete: 1.
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468/Issue1468Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468/Issue1468Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..93be777077cef6ca7707f6c66e499cf6231b1c69
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1468/Issue1468Test.php
@@ -0,0 +1,12 @@
+<?php
+class Issue1468Test extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @todo Implement this test
+ */
+ public function testFailure()
+ {
+ $this->markTestIncomplete();
+ }
+}
+
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..bc1d585438c72fdbc4e8a2506e91d47bf94c6d0f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471.phpt
@@ -0,0 +1,28 @@
+--TEST--
+GH-1471: Output made while test is running is printed although expectOutputString() is used when an assertion fails
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1471Test';
+$_SERVER['argv'][3] = __DIR__ . '/1471/Issue1471Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+F
+
+Time: %s, Memory: %sMb
+
+There was 1 failure:
+
+1) Issue1471Test::testFailure
+Failed asserting that false is true.
+
+%s/Issue1471Test.php:10
+
+FAILURES!
+Tests: 1, Assertions: 1, Failures: 1.
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471/Issue1471Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471/Issue1471Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0cdcbcd8f7a87a2d70139e85fc3d3f1cdcb53ba
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1471/Issue1471Test.php
@@ -0,0 +1,13 @@
+<?php
+class Issue1471Test extends PHPUnit_Framework_TestCase
+{
+ public function testFailure()
+ {
+ $this->expectOutputString('*');
+
+ print "*";
+
+ $this->assertTrue(false);
+ }
+}
+
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..fd62adb91e3d7b0ca84b611bed8d625191b05932
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472.phpt
@@ -0,0 +1,19 @@
+--TEST--
+GH-1472: assertEqualXMLStructure modifies the tested elements
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue1472Test';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/1472/Issue1472Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 4 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472/Issue1472Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472/Issue1472Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..a392773a93d880315900bafa3a5314b237f69bdf
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1472/Issue1472Test.php
@@ -0,0 +1,21 @@
+<?php
+class Issue1472Test extends PHPUnit_Framework_TestCase
+{
+ public function testAssertEqualXMLStructure()
+ {
+ $doc = new DOMDocument;
+ $doc->loadXML('<root><label>text content</label></root>');
+
+ $xpath = new DOMXPath($doc);
+
+ $labelElement = $doc->getElementsByTagName('label')->item(0);
+
+ $this->assertEquals(1, $xpath->evaluate('count(//label[text() = "text content"])'));
+
+ $expectedElmt = $doc->createElement('label', 'text content');
+ $this->assertEqualXMLStructure($expectedElmt, $labelElement);
+
+ // the following assertion fails, even though it passed before - which is due to the assertEqualXMLStructure() has modified the $labelElement
+ $this->assertEquals(1, $xpath->evaluate('count(//label[text() = "text content"])'));
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..35117a9912579ab97959ca26872d753f2a123155
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570.phpt
@@ -0,0 +1,21 @@
+--TEST--
+GH-1570: Test that prints output is marked as failure and not as risky when --disallow-test-output is used
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--disallow-test-output';
+$_SERVER['argv'][3] = 'Issue1570Test';
+$_SERVER['argv'][4] = dirname(__FILE__) . '/1570/Issue1570Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+R*
+
+Time: %s, Memory: %sMb
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Risky: 1.
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..f310363e835999216c92d2e0206b59e7e739162d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/1570/Issue1570Test.php
@@ -0,0 +1,8 @@
+<?php
+class Issue1570Test extends PHPUnit_Framework_TestCase
+{
+ public function testOne()
+ {
+ print "*";
+ }
+}
\ No newline at end of file
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 201780cd68b54ea93741ab9065cd411d61ff316b..43ddcb422226d09863adca1dff7e136b405a1be9 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 @@
<?php
class Issue581Test extends PHPUnit_Framework_TestCase
{
- public function testExportingObjectsDoesNotBreakWindowsLineFeeds() {
+ public function testExportingObjectsDoesNotBreakWindowsLineFeeds()
+ {
$this->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 79b33a4a1f37f85ab66d48337f71d57a51e09c26..7005b41f4eb6c479025985c539dfad2e417731e9 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/797.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..3a3cef001eaea1442350f5fdd331bf57f6eea287
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797.phpt
@@ -0,0 +1,22 @@
+--TEST--
+GH-797: Disabled $preserveGlobalState does not load bootstrap.php.
+--FILE--
+<?php
+
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/797/bootstrap797.php';
+$_SERVER['argv'][] = __DIR__ . '/797/Issue797Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/Issue797Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/Issue797Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1c1b8f92ad72bca426e61af33a1ef4246c7e956
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/Issue797Test.php
@@ -0,0 +1,10 @@
+<?php
+class Issue797Test extends PHPUnit_Framework_TestCase
+{
+ protected $preserveGlobalState = false;
+
+ public function testBootstrapPhpIsExecutedInIsolation()
+ {
+ $this->assertEquals(GITHUB_ISSUE, 797);
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php
new file mode 100644
index 0000000000000000000000000000000000000000..03890a35a89366caf7e0e580e9c18948c77f823c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/797/bootstrap797.php
@@ -0,0 +1,6 @@
+<?php
+// If process isolation fails to include this file, then
+// PHPUnit_Framework_TestCase itself does not exist. :-)
+require __DIR__ . '/../../../bootstrap.php';
+
+const GITHUB_ISSUE = 797;
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 70ef27d1a6e5773dd556ac352b1b64f0329661e8..70fd9046403aae422cdc83c85f294112ff24fb03 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 @@
<?php
- if (extension_loaded('xdebug')) {
- xdebug_disable();
- }
+if (extension_loaded('xdebug')) {
+ xdebug_disable();
+}
throw new Exception(
- 'PHPUnit suppresses exceptions thrown outside of test case function'
- );
\ No newline at end of file
+ 'PHPUnit suppresses exceptions thrown outside of test case function'
+ );
diff --git a/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php b/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
index 77e3854568ba74b69677bff3506f7acdb0787c6d..e8336f8021237b130421024d6c60cfd4a4c8b5bb 100644
--- a/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
index a73d0ac9b5fa3fd00c08cb6e1ce806cca432bd8b..fcbd3a4705af80d8d6a3284ce3a3af29b2e868a3 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
@@ -14,7 +14,7 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann.
-Configuration read from %s/configuration.custom-printer.xml
+Configuration read from %sconfiguration.custom-printer.xml
Starting test 'BankAccountTest::testBalanceIsInitiallyZero'.
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
index 4528e397d6fc5ee233c9ce858bfad8aac6d70541..fc5f9f481b8e425ea8f4b61ff04dc6db00677a5d 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
@@ -14,7 +14,7 @@ PHPUnit_TextUI_Command::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann.
-Configuration read from %s/configuration.custom-printer.xml
+Configuration read from %sconfiguration.custom-printer.xml
I
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..8fc4c347d16ff2fcfc08f0262944dfe9ae723ad7
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-debug.phpt
@@ -0,0 +1,34 @@
+--TEST--
+phpunit --debug DataProviderDebugTest ../_files/DataProviderDebugTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--debug';
+$_SERVER['argv'][3] = 'DataProviderDebugTest';
+$_SERVER['argv'][4] = dirname(__FILE__).'/../_files/DataProviderDebugTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+
+Starting test 'DataProviderDebugTest::testProvider with data set #0 (null, true, 1, 1.0)'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #1 (1.2, resource(%d) of type (stream), '1')'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #2 (array(array(1, 2, 3), array(3, 4, 5)))'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #3 ('this\nis\na\nvery\nvery\nvery\nvery...g\ntext')'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #4 (stdClass Object (), stdClass Object (...), array(), SplObjectStorage Object (...), stdClass Object (...))'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #5 (Binary String: 0x000102030405, Binary String: 0x0e0f101112131...c1d1e1f)'.
+.
+Starting test 'DataProviderDebugTest::testProvider with data set #6 (Binary String: 0x0009)'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (7 tests, 7 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
index bb8c55f14995dd574d6e4139e637caa2cead3803..5154f42260705a74c2d1c750150852ca76acd63a 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
..F.<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite name="DataProviderTest" file="%s/DataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
+ <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
<testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" failures="1" errors="0" time="%f">
<testcase name="testAdd with data set #0" assertions="1" time="%f"/>
<testcase name="testAdd with data set #1" assertions="1" time="%f"/>
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 fa7287c3bb0fd5192b257c8a2717486371e88961..9854e2f16a5fa7e991b9dd0f587f726e806cc68b 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.<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite name="DataProviderTest" file="%s/DataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
+ <testsuite name="DataProviderTest" file="%sDataProviderTest.php" tests="4" assertions="4" failures="1" errors="0" time="%f">
<testsuite name="DataProviderTest::testAdd" tests="4" assertions="4" failures="1" errors="0" time="%f">
<testcase name="testAdd with data set #0" assertions="1" time="%f"/>
<testcase name="testAdd with data set #1" assertions="1" time="%f"/>
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
index 9d81da414f2114c9ef4ec53626433404564c4741..6a078c353fc0f08e0d262dadcbdc487d976e8d5c 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
@@ -19,7 +19,7 @@ Time: %s, Memory: %sMb
There were 2 errors:
1) ExceptionStackTest::testPrintingChildException
-ExceptionStackTestException: Child exception
+PHPUnit_Framework_Exception: Child exception
message
Failed asserting that two arrays are equal.
--- Expected
@@ -31,7 +31,6 @@ Failed asserting that two arrays are equal.
)
-%s:%i
%s:%i
Caused by
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 0000000000000000000000000000000000000000..9183bf4399371aa99baf8b0481913d2d907deeba
--- /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--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '/balanceIsInitiallyZero/i';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 0000000000000000000000000000000000000000..0f4aedb403d627152fda9e171f88d764ea67c191
--- /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--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '/balanceIsInitiallyZero/';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--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 b917f5c28a9e753b4821d69fc4347b9d765f0149..853a87a553c029571a7f75913f6ec33a5cd5f4a5 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--
<?php
$_SERVER['argv'][1] = '--no-configuration';
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
index e0a0ec800d82aaae3dd79010cc72b375832a6927..9290205e2a9387034ebbb7c5732eab8014045099 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
@@ -47,6 +47,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.
@@ -67,7 +68,7 @@ Test Execution Options:
--repeat <times> Runs the test(s) repeatedly.
--tap Report test execution progress in TAP format.
--testdox Report test execution progress in TestDox format.
- --printer <printer> TestSuiteListener implementation to use.
+ --printer <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 0e1297a1f4c0fb6a8069e4c2d627cc6883baacf4..1615e293720816ffc65afadf0906f2eef9dbc874 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 <times> Runs the test(s) repeatedly.
--tap Report test execution progress in TAP format.
--testdox Report test execution progress in TestDox format.
- --printer <printer> TestSuiteListener implementation to use.
+ --printer <printer> TestListener implementation to use.
Configuration Options:
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-no-pretty-print.phpt
similarity index 93%
rename from core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/log-json-no-pretty-print.phpt
index 24181aef4a3ec8afea9af48f0a59f1f8d735ac50..c00af022791744e79082f243cc560f08111081ee 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-no-pretty-print.phpt
@@ -2,7 +2,9 @@
phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
--SKIPIF--
<?php
-if (version_compare(PHP_VERSION, '5.4.0') >= 0) print 'skip: PHP < 5.4 required';
+if (defined('JSON_PRETTY_PRINT')) {
+ print 'skip: PHP without JSON_PRETTY_PRINT is required';
+}
?>
--FILE--
<?php
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
index 326cc34713cc78d323cb330d971c0cc9ab08534a..e04f2c79ba5bdb26d16bb7a79c50dcf3abd1f608 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
@@ -2,11 +2,11 @@
phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
--SKIPIF--
<?php
-if (!((version_compare(PHP_VERSION, '5.4.28', '>=') && version_compare(PHP_VERSION, '5.5', '<')) ||
- (version_compare(PHP_VERSION, '5.5.12', '>=') && version_compare(PHP_VERSION, '5.6', '<')) ||
- version_compare(PHP_VERSION, '5.6.0beta2', '>=') || PHP_VERSION == '5.6.0-dev') ||
- (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.2.0-dev', '<')))
- print "skip: PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ or HHVM 3.(2+) required";
+if (!defined('JSON_PRETTY_PRINT')) {
+ print "skip: JSON_PRETTY_PRINT is required";
+} else if (json_encode(array(), JSON_PRETTY_PRINT) != '[]') {
+ print "skip: Does not have PHP #66021 (Blank line inside empty JSON array/object)";
+}
?>
--FILE--
<?php
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
index 9fed9883672b4065ecb5bd13fca28679246d9305..e1d1173fd9ca343f7a66f11853d44f0874560e53 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
@@ -2,11 +2,11 @@
phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
--SKIPIF--
<?php
-if (!((version_compare(PHP_VERSION, '5.4', '>=') && version_compare(PHP_VERSION, '5.4.27', '<=')) ||
- (version_compare(PHP_VERSION, '5.5', '>=') && version_compare(PHP_VERSION, '5.5.11', '<=')) ||
- (version_compare(PHP_VERSION, '5.6', '>=') && version_compare(PHP_VERSION, '5.6.0beta1', '<=') && PHP_VERSION != '5.6.0-dev') ||
- (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.2.0-dev', '<'))))
- print "skip: PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM < 3.2 required";
+if (!defined('JSON_PRETTY_PRINT')) {
+ print "skip: JSON_PRETTY_PRINT is required";
+} else if (json_encode(array(), JSON_PRETTY_PRINT) == '[]') {
+ print "skip: Has PHP #66021 (Blank line inside empty JSON array/object)";
+}
?>
--FILE--
<?php
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
index c1f83fbcc305cce367e7d944c4d34a0c634d6bc9..cce87bc7061601ffcc145455b8466379cb9eadca 100644
--- a/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
@@ -17,9 +17,9 @@ PHPUnit %s by Sebastian Bergmann.
...<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
<testsuite name="BankAccountTest" file="%sBankAccountTest.php" tests="3" assertions="3" failures="0" errors="0" time="%f">
- <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="69" assertions="1" time="%f"/>
- <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="79" assertions="1" time="%f"/>
- <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="99" assertions="1" time="%f"/>
+ <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="35" assertions="1" time="%f"/>
+ <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="45" assertions="1" time="%f"/>
+ <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="63" assertions="1" time="%f"/>
</testsuite>
</testsuites>
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..b4879104a8542885153ea77f1d20c3a2a5edd523
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/output-isolation.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --process-isolation --filter testExpectOutputStringFooActualFoo ../_files/OutputTestCase.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testExpectOutputStringFooActualFoo';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/OutputTestCase.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
index a1d3f1df8c3d23c42ff5de8426ef5f07ac1fc767..0d4a242302e902b7769bf896be4fa6597fd9ef6d 100644
--- a/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -59,7 +25,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 +44,7 @@ public function testExceptionIsThrownForNotExistingConfigurationFile()
public function testFilterConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
'blacklist' =>
array(
'include' =>
@@ -155,8 +121,8 @@ public function testFilterConfigurationIsReadCorrectly()
),
),
),
- ),
- $this->configuration->getFilterConfiguration()
+ ),
+ $this->configuration->getFilterConfiguration()
);
}
@@ -166,7 +132,7 @@ public function testFilterConfigurationIsReadCorrectly()
public function testGroupConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
'include' =>
array(
0 => 'name',
@@ -175,8 +141,8 @@ public function testGroupConfigurationIsReadCorrectly()
array(
0 => 'name',
),
- ),
- $this->configuration->getGroupConfiguration()
+ ),
+ $this->configuration->getGroupConfiguration()
);
}
@@ -191,7 +157,7 @@ public function testListenerConfigurationIsReadCorrectly()
ini_set('include_path', $dir . PATH_SEPARATOR . $includePath);
$this->assertEquals(
- array(
+ array(
0 =>
array(
'class' => 'MyListener',
@@ -224,8 +190,8 @@ public function testListenerConfigurationIsReadCorrectly()
0 => 42
),
),
- ),
- $this->configuration->getListenerConfiguration()
+ ),
+ $this->configuration->getListenerConfiguration()
);
ini_set('include_path', $includePath);
@@ -237,7 +203,7 @@ public function testListenerConfigurationIsReadCorrectly()
public function testLoggingConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
'lowUpperBound' => '50',
'highLowerBound' => '90',
'coverage-html' => '/tmp/report',
@@ -249,8 +215,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 +226,7 @@ public function testLoggingConfigurationIsReadCorrectly()
public function testPHPConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
'include_path' =>
array(
dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.',
@@ -276,8 +242,8 @@ public function testPHPConfigurationIsReadCorrectly()
'server'=> array('foo' => 'bar'),
'files'=> array('foo' => 'bar'),
'request'=> array('foo' => 'bar'),
- ),
- $this->configuration->getPHPConfiguration()
+ ),
+ $this->configuration->getPHPConfiguration()
);
}
@@ -336,7 +302,7 @@ public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv()
public function testPHPUnitConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
'backupGlobals' => true,
'backupStaticAttributes' => false,
'bootstrap' => '/path/to/bootstrap.php',
@@ -354,13 +320,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 +337,7 @@ public function testPHPUnitConfigurationIsReadCorrectly()
public function testSeleniumBrowserConfigurationIsReadCorrectly()
{
$this->assertEquals(
- array(
+ array(
0 =>
array(
'name' => 'Firefox on Linux',
@@ -379,8 +346,8 @@ public function testSeleniumBrowserConfigurationIsReadCorrectly()
'port' => 4444,
'timeout' => 30000,
),
- ),
- $this->configuration->getSeleniumBrowserConfiguration()
+ ),
+ $this->configuration->getSeleniumBrowserConfiguration()
);
}
@@ -390,7 +357,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 +378,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 +413,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/GlobalStateTest.php b/core/vendor/phpunit/phpunit/tests/Util/GlobalStateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..712ef47903273a6ca47ca9e6cb3454c4033cfdd0
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Util/GlobalStateTest.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package PHPUnit
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.phpunit.de/
+ */
+class Util_GlobalStateTest extends PHPUnit_Framework_TestCase
+{
+
+ /**
+ * @covers PHPUnit_Util_GlobalState::processIncludedFilesAsString
+ */
+ public function testIncludedFilesAsStringSkipsVfsProtocols()
+ {
+ $dir = __DIR__;
+ $files = array(
+ 'phpunit', // The 0 index is not used
+ $dir . '/ConfigurationTest.php',
+ $dir . '/GlobalStateTest.php',
+ 'vfs://' . $dir . '/RegexTest.php',
+ 'phpvfs53e46260465c7://' . $dir . '/TestTest.php',
+ 'file://' . $dir . '/XMLTest.php'
+ );
+
+ $this->assertEquals(
+ "require_once '" . $dir . "/ConfigurationTest.php';\n" .
+ "require_once '" . $dir . "/GlobalStateTest.php';\n" .
+ "require_once 'file://" . $dir . "/XMLTest.php';\n"
+ , PHPUnit_Util_GlobalState::processIncludedFilesAsString($files));
+ }
+
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..bb05dba1704b9cb9428a2d7d58125bc1bf770f11
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Util/RegexTest.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package PHPUnit
+ * @author Jeff Welch <whatthejeff@gmail.com>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
+ * @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/TestDox/NamePrettifierTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
index d20260f9f91b2c6b3fc67c6327846b53ff4de29f..314bcecb2289674ab88a56320c73b3588ea8af13 100644
--- a/core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.1.0
diff --git a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php
index 99e55bdcdd4dc99b453b05c3327aa0a179964acd..3b5ca16defcb6b989dbbfe0f08bac3ce49762cdd 100644
--- a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php
@@ -1,52 +1,18 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
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
);
}
@@ -55,7 +21,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.6
@@ -68,70 +34,91 @@ class Util_TestTest extends PHPUnit_Framework_TestCase
*/
public function testGetExpectedException()
{
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'FooBarBaz', 'code' => null, 'message' => ''),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Foo_Bar_Baz', 'code' => null, 'message' => ''),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Foo\Bar\Baz', 'code' => null, 'message' => ''),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'ã»ã’', 'code' => null, 'message' => ''),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => 0, 'message' => 'Message'),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine')
);
- $this->assertSame(
+ $this->assertArraySubset(
array('class' => 'Class', 'code' => null, 'message' => ''),
PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine')
);
- $this->assertSame(
- array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE),
- PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
+ $this->assertArraySubset(
+ array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE),
+ PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
);
// Ensure the Class::CONST expression is only evaluated when the constant really exists
- $this->assertSame(
- array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT'),
- PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
+ $this->assertArraySubset(
+ array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT'),
+ PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
);
- $this->assertSame(
- array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT'),
- PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
+ $this->assertArraySubset(
+ array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT'),
+ PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
+ );
+ }
+
+ /**
+ * @covers PHPUnit_Util_Test::getExpectedException
+ */
+ public function testGetExpectedRegExp()
+ {
+ $this->assertArraySubset(
+ array('message_regex' => '#regex#'),
+ PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessage')
+ );
+
+ $this->assertArraySubset(
+ array('message_regex' => '#regex#'),
+ PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithRegexMessageFromClassConstant')
+ );
+
+ $this->assertArraySubset(
+ array('message_regex' => 'ExceptionTest::UNKNOWN_MESSAGE_REGEX_CONSTANT'),
+ PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testWithUnknowRegexMessageFromClassConstant')
);
}
@@ -142,8 +129,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)
);
}
@@ -162,27 +149,27 @@ public function requirementsProvider()
array('testTen', array('extensions' => array('testExt'))),
array('testEleven', array('OS' => '/Linux/i')),
array(
- 'testSpace',
- array(
- 'extensions' => array('spl'),
- 'OS' => '/.*/i'
- )
+ 'testSpace',
+ array(
+ 'extensions' => array('spl'),
+ 'OS' => '/.*/i'
+ )
),
array(
- 'testAllPossibleRequirements',
- array(
- 'PHP' => '99-dev',
- 'PHPUnit' => '9-dev',
- 'OS' => '/DOESNOTEXIST/i',
- 'functions' => array(
- 'testFuncOne',
- 'testFuncTwo',
- ),
- 'extensions' => array(
- 'testExtOne',
- 'testExtTwo',
- )
+ 'testAllPossibleRequirements',
+ array(
+ 'PHP' => '99-dev',
+ 'PHPUnit' => '9-dev',
+ 'OS' => '/DOESNOTEXIST/i',
+ 'functions' => array(
+ 'testFuncOne',
+ 'testFuncTwo',
+ ),
+ 'extensions' => array(
+ 'testExtOne',
+ 'testExtTwo',
)
+ )
)
);
}
@@ -197,18 +184,51 @@ public function testGetRequirementsMergesClassAndMethodDocBlocks()
'PHPUnit' => '3.7',
'OS' => '/WINNT/i',
'functions' => array(
- 'testFuncClass',
- 'testFuncMethod',
+ 'testFuncClass',
+ 'testFuncMethod',
),
'extensions' => array(
- 'testExtClass',
- 'testExtMethod',
+ 'testExtClass',
+ 'testExtMethod',
)
);
$this->assertEquals(
- $expectedAnnotations,
- PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod')
+ $expectedAnnotations,
+ PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod')
+ );
+ }
+
+ /**
+ * @covers PHPUnit_Util_Test::getMissingRequirements
+ * @dataProvider missingRequirementsProvider
+ */
+ public function testGetMissingRequirements($test, $result)
+ {
+ $this->assertEquals(
+ $result,
+ PHPUnit_Util_Test::getMissingRequirements('RequirementsTest', $test)
+ );
+ }
+
+ public function missingRequirementsProvider()
+ {
+ return array(
+ array('testOne', array()),
+ array('testNine', array('Function testFunc is required.')),
+ array('testTen', array('Extension testExt is required.')),
+ array('testAlwaysSkip', array('PHPUnit 1111111 (or later) is required.')),
+ array('testAlwaysSkip2', array('PHP 9999999 (or later) is required.')),
+ array('testAlwaysSkip3', array('Operating system matching /DOESNOTEXIST/i is required.')),
+ array('testAllPossibleRequirements', array(
+ 'PHP 99-dev (or later) is required.',
+ 'PHPUnit 9-dev (or later) is required.',
+ 'Operating system matching /DOESNOTEXIST/i is required.',
+ 'Function testFuncOne is required.',
+ 'Function testFuncTwo is required.',
+ 'Extension testExtOne is required.',
+ 'Extension testExtTwo is required.',
+ )),
);
}
@@ -246,8 +266,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 +286,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 +299,7 @@ public function methodForTestParseAnnotationThatIsOnlyOneLine()
/**
* @covers PHPUnit_Util_Test::getLinesToBeCovered
+ * @covers PHPUnit_Util_Test::getLinesToBeCoveredOrUsed
* @covers PHPUnit_Util_Test::resolveElementToReflectionObjects
* @dataProvider getLinesToBeCoveredProvider
*/
@@ -288,149 +309,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 8cf307234282325cab21274685c71e7497fb5cb7..4aa4ae496a8bcc22e260751d2d8a40c8bdd66ead 100644
--- a/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php
@@ -1,47 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Mike Naberezny <mike@maintainable.com>
- * @author Derek DeVries <derek@maintainable.com>
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -51,7 +15,7 @@
* @author Mike Naberezny <mike@maintainable.com>
* @author Derek DeVries <derek@maintainable.com>
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -107,9 +71,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 +84,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 +305,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/Author.php b/core/vendor/phpunit/phpunit/tests/_files/Author.php
index 54c67cde7c37d44eeaa4a74e0f030535453a4ff5..c628ff80d6bedf8ddf445fc90cc54bb5b67628fd 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/Author.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/Author.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
index e35831c36fe6d6fcda6cb281c2afafbc2f16efb8..c8fb5a5d44ba44b26ff53bf56753eda82b85527f 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
@@ -1,55 +1,23 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 file is part of PHPUnit.
*
- * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * @package PHPUnit
- * @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
-class BankAccountException extends RuntimeException {}
+class BankAccountException extends RuntimeException
+{
+}
/**
* A bank account.
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
diff --git a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
index bfe8875388101404caf075e2d04a7394a991e254..7237253bd9967d5763c344fd88f9e2563d5a7357 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -80,9 +46,7 @@ public function testBalanceCannotBecomeNegative()
{
try {
$this->ba->withdrawMoney(1);
- }
-
- catch (BankAccountException $e) {
+ } catch (BankAccountException $e) {
$this->assertEquals(0, $this->ba->getBalance());
return;
@@ -100,9 +64,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 4a9a55a19381a74677ff5da900a9f81c292da385..1bdf7c43a267495564445caa9beb781841badff8 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * * 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 <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.3.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.3.0
@@ -80,9 +46,7 @@ public function testBalanceCannotBecomeNegative()
{
try {
$this->ba->withdrawMoney(1);
- }
-
- catch (BankAccountException $e) {
+ } catch (BankAccountException $e) {
$this->assertEquals(0, $this->ba->getBalance());
return;
@@ -100,9 +64,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 f90f30750fbf1a60652d4d18439eb3d06fa279fa..7753b280a219b6dea2eb84d3767de499b14270b0 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 95a7484fa1cb81a0e6fa09416e83df42930583f6..a837ae8bb122a499f8fb841122bbdacea2449c9f 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 27a8b9c0187769a518d494b08f41d63237a95b91..f3af8ac2ca4f725a2888159c3d1923ead3eee022 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/Book.php b/core/vendor/phpunit/phpunit/tests/_files/Book.php
index 521ae8cce4f8565d6e772ae592d83defa6a2ac33..77d3256db48269ac80fbdd1a23b1093bb597c80e 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/Book.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/Book.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php b/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
index 1a839a2f9ef1b857b809d5667d9ba94215b640fa..70fab0b1bac46684a1416ad262a33a3476bf3b27 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/ClassWithToString.php b/core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
index 4481abec5e385ef6cd7e5111b664af57d9172675..56727415a1cc11a113d2d6a1974255f22bdfe89e 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
@@ -1,45 +1,11 @@
<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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.
+/*
+ * This file is part of PHPUnit.
*
- * * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
*
- * 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 Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @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.6.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
*/
/**
@@ -47,7 +13,7 @@
*
* @package PHPUnit
* @author Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright Sebastian Bergmann <sebastian@phpunit.de>
* @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.6.0
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
index d7f7848b068caa1d4646e0340040eff67cb2bed8..becc6c8f9f3870a3ba3221fbf414ba323378ef1b 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 185cddf2a863307823b817e6e86ba2e2287ceba1..55d7f571e5de21551fb6e6cafe9b783a7b71c0c1 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 7f67f4b358caf8fc587cd5c73f183268a26d1e28..d1be1c6cf06b65ab6ac0c5be48948ca4e7c99e70 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 7c743db926a591d801de17de06628859b5ed3b00..4f1ed654221dede057266cd0caad3bb95ebd03c2 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 4cb66b76ab07f5dfa989f777da7de64da971ee5a..0e5ddc31d8dd6db4b6b38d9fa037fb51ba356ae1 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
@@ -1,4 +1,4 @@
<?php
class CustomPrinter extends PHPUnit_TextUI_ResultPrinter
{
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DataProviderDebugTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderDebugTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..96cb730215d998ca135e4c7f014093b17281fdd0
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/DataProviderDebugTest.php
@@ -0,0 +1,48 @@
+<?php
+class DataProviderDebugTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider provider
+ */
+ public function testProvider()
+ {
+ $this->assertTrue(true);
+ }
+
+ public static function provider()
+ {
+ $obj2 = new \stdClass();
+ $obj2->foo = 'bar';
+
+ $obj3 = (object) array(1,2,"Test\r\n",4,5,6,7,8);
+
+ $obj = new \stdClass();
+ //@codingStandardsIgnoreStart
+ $obj->null = null;
+ //@codingStandardsIgnoreEnd
+ $obj->boolean = true;
+ $obj->integer = 1;
+ $obj->double = 1.2;
+ $obj->string = '1';
+ $obj->text = "this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext";
+ $obj->object = $obj2;
+ $obj->objectagain = $obj2;
+ $obj->array = array('foo' => 'bar');
+ $obj->self = $obj;
+
+ $storage = new \SplObjectStorage();
+ $storage->attach($obj2);
+ $storage->foo = $obj2;
+
+ return array(
+ array(null, true, 1, 1.0),
+ array(1.2, fopen('php://memory', 'r'), '1'),
+ array(array(array(1,2,3), array(3,4,5))),
+ // \n\r and \r is converted to \n
+ array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext"),
+ array(new \stdClass(), $obj, array(), $storage, $obj3),
+ array(chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5), implode('', array_map('chr', range(0x0e, 0x1f)))),
+ array(chr(0x00) . chr(0x09))
+ );
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
index 298f0b06fb027b7d664171877e5b3c212cd14e30..3254985270e9739b546ffcc404c9cc39e981a845 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
@@ -36,4 +36,4 @@ public static function falseProvider()
'other false test2'=>array(false)
);
}
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DataProviderIncompleteTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderIncompleteTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bae7e6967c165368929296187e15003618dc6be6
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/DataProviderIncompleteTest.php
@@ -0,0 +1,37 @@
+<?php
+class DataProviderIncompleteTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider incompleteTestProviderMethod
+ */
+ public function testIncomplete($a, $b, $c)
+ {
+ $this->assertTrue(true);
+ }
+
+ /**
+ * @dataProvider providerMethod
+ */
+ public function testAdd($a, $b, $c)
+ {
+ $this->assertEquals($c, $a + $b);
+ }
+
+ public function incompleteTestProviderMethod()
+ {
+ $this->markTestIncomplete("incomplete");
+
+ return array(
+ array(0, 0, 0),
+ array(0, 1, 1),
+ );
+ }
+
+ public static function providerMethod()
+ {
+ return array(
+ array(0, 0, 0),
+ array(0, 1, 1),
+ );
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DataProviderSkippedTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderSkippedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e269abf9f3cb03c848d772c311dad48ab9a9721
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/DataProviderSkippedTest.php
@@ -0,0 +1,37 @@
+<?php
+class DataProviderSkippedTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider skippedTestProviderMethod
+ */
+ public function testSkipped($a, $b, $c)
+ {
+ $this->assertTrue(true);
+ }
+
+ /**
+ * @dataProvider providerMethod
+ */
+ public function testAdd($a, $b, $c)
+ {
+ $this->assertEquals($c, $a + $b);
+ }
+
+ public function skippedTestProviderMethod()
+ {
+ $this->markTestSkipped("skipped");
+
+ return array(
+ array(0, 0, 0),
+ array(0, 1, 1),
+ );
+ }
+
+ public static function providerMethod()
+ {
+ return array(
+ array(0, 0, 0),
+ array(0, 1, 1),
+ );
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
index fd86c8cf0e42ed88cd6cef9599eb641b78f36438..cd067b0ba9f5f3543c4f939228a42616275f4006 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
@@ -1,6 +1,4 @@
<?php
-class ExceptionStackTestException extends Exception { }
-
class ExceptionStackTest extends PHPUnit_Framework_TestCase
{
public function testPrintingChildException()
@@ -9,7 +7,7 @@ public function testPrintingChildException()
$this->assertEquals(array(1), array(2), 'message');
} catch (PHPUnit_Framework_ExpectationFailedException $e) {
$message = $e->getMessage() . $e->getComparisonFailure()->getDiff();
- throw new ExceptionStackTestException("Child exception\n$message", 101, $e);
+ throw new PHPUnit_Framework_Exception("Child exception\n$message", 101, $e);
}
}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
index 95a7c0afc52ee3d9c8e86f1f4d7a523dde8b13bd..37ce92776d2fa663c8906f90ac0bd6d25c41a058 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
@@ -8,6 +8,13 @@ class ExceptionTest extends PHPUnit_Framework_TestCase
*/
const ERROR_MESSAGE = 'Exception message';
+ /**
+ * Exception message
+ *
+ * @var string
+ */
+ const ERROR_MESSAGE_REGEX = '#regex#';
+
/**
* Exception code
*
@@ -99,4 +106,34 @@ public function testSingleLine()
public function testUnknownConstants()
{
}
+
+ /**
+ * @expectedException Class
+ * @expectedExceptionCode 1234
+ * @expectedExceptionMessage Message
+ * @expectedExceptionMessageRegExp #regex#
+ */
+ public function testWithRegexMessage()
+ {
+ }
+
+ /**
+ * @expectedException Class
+ * @expectedExceptionCode 1234
+ * @expectedExceptionMessage Message
+ * @expectedExceptionMessageRegExp ExceptionTest::ERROR_MESSAGE_REGEX
+ */
+ public function testWithRegexMessageFromClassConstant()
+ {
+ }
+
+ /**
+ * @expectedException Class
+ * @expectedExceptionCode 1234
+ * @expectedExceptionMessage Message
+ * @expectedExceptionMessageRegExp ExceptionTest::UNKNOWN_MESSAGE_REGEX_CONSTANT
+ */
+ public function testWithUnknowRegexMessageFromClassConstant()
+ {
+ }
}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php b/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
index 2bea3dadd2b9db8988e09c86a89cf17e77b86703..70f64e4ac6ed6be23532d3cdb418c93aa1b429c4 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
@@ -72,5 +72,4 @@ public function testAssertStringMatchesFormatFile()
{
$this->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 85bdb19f27a1f419f3726517364fbc4bbb1fb66b..4e1e0b05e2e9f16e31b3ded2f8241ec5353de534 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 0000000000000000000000000000000000000000..2dd4c446681c45e037dd5691fcfa7f6803073db5
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceA.php
@@ -0,0 +1,8 @@
+<?php
+
+require_once(__DIR__.'/InheritanceB.php');
+
+class InheritanceA extends InheritanceB
+{
+
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php b/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7d4a501d63af70e09a8b69dc33cb6c164d66d80
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/Inheritance/InheritanceB.php
@@ -0,0 +1,9 @@
+<?php
+
+class InheritanceB extends PHPUnit_Framework_TestCase
+{
+ public function testSomething()
+ {
+
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/IsolationTest.php b/core/vendor/phpunit/phpunit/tests/_files/IsolationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..df95c9168260d57d002be52b9f0038693d27b9dc
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/IsolationTest.php
@@ -0,0 +1,13 @@
+<?php
+class IsolationTest extends PHPUnit_Framework_TestCase
+{
+ public function testIsInIsolationReturnsFalse()
+ {
+ $this->assertFalse($this->isInIsolation());
+ }
+
+ public function testIsInIsolationReturnsTrue()
+ {
+ $this->assertTrue($this->isInIsolation());
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.json
similarity index 100%
rename from core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
rename to core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.json
diff --git a/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.json
similarity index 100%
rename from core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
rename to core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.json
diff --git a/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
deleted file mode 100644
index 27085be255a2475ac51765d31a5bae0d27b7f608..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
+++ /dev/null
@@ -1 +0,0 @@
-{"Mascott":"Tux"}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
index d3d48efbd220d958cac61de6eeaa5192c81c76b2..45f583b7777654879c33f74a39ce0fc28fee59bc 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -13,4 +13,3 @@ public function testSomething()
$o->publicMethod();
}
}
-
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
index 79d1010d35d68295327dfaafb7b4fa3f99785968..b336745460ad7e336ef3e792c5d7dde7f46951a0 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/RequirementsClassBeforeClassHookTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassBeforeClassHookTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3bb6cbc034848b42c473db7c5614facda2312ba
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassBeforeClassHookTest.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @requires extension nonExistingExtension
+ */
+class RequirementsClassBeforeClassHookTest extends PHPUnit_Framework_TestCase
+{
+ public static function setUpBeforeClass()
+ {
+ throw new Exception(__METHOD__.' should not be called because of class requirements.');
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
index 537603e8f83a1eb9546249a5cf74b7d9fd96900b..1e934c880a633eb0ec7508ddf2c90f2abfb054a4 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 0b4002ddb7da2431fb5e6fb433d017a7ed8296b4..b2c975e53a26db5b670755979bafcadde1368466 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 0d97d7803dc5a528fd8e91ed42407b73d4bc80f4..7f458fea259c0488201c46a950b05e56b05de838 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 41256dab825e9d85788736f0fcb09696ccdf1644..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
- <head>
- <title>Login</title>
- <link type="text/css" rel="Stylesheet" href="/stylesheets/screen.css">
- <script type="text/javascript">alert('Hello, world!');</script>
- </head>
- <body id="login">
- <ul id="my_ul" class="my_ul_class">
- <li class="my_li">Test LI 1</li>
- <li class="my_li">Test LI 2</li>
- <li class="my_li">Test LI 3</li>
- </ul>
- <ul id="another_ul" class="my_ul_class">
- <li class="my_li">Test LI 4</li>
- </ul>
- <div id="test_id" class="my_test_class">
- <div id="test_child_id">
- <span id="test_subchild_id">My Subchild</span>
- My Child
- </div>
-
- Test Id Text
- </div>
- <div id="test_children" class="children">
- My Children
- <div class="my_child">1</div>
- <div class="my_child">2</div>
- <div class="my_child">3</div>
- <div class="my_child">4</div>
- </div>
- <span class="test_class">
- Test Class Text
- </span>
- <img src="/images/login_logo.gif" alt="Login Logo">
- <input id="input_test_id" type="text" class="full">
- <div id="test_text">
- My test tag content
- <div class="another_node">more text</div>
- </div>
- <div id="test_multi_class" class="multi part class">test</div>
- </body>
-</html>
diff --git a/core/vendor/phpunit/phpunit/tests/_files/Singleton.php b/core/vendor/phpunit/phpunit/tests/_files/Singleton.php
index 2509efb3350c7fe2ad2632775140ff2a67cbd5c9..24dd6bd8d62c8c0984d254cd68b507e9159163fe 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 bae3655fea6f96b646ec4506f6ca6ade1cd2ced3..9ed59f9c4c9430492e38b44db9506bfb51ca9285 100644
--- a/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
@@ -1,5 +1,6 @@
<?php
-class TestIterator2 implements Iterator {
+class TestIterator2 implements Iterator
+{
protected $data;
@@ -32,4 +33,4 @@ public function rewind()
{
reset($this->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 0f8af55d2636455d6eedf795719fe23b5d089cda..1d2a769ae5601b362b50b2afe75b1587f3b0a1b4 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 32e232c49c92e1fe8ad6a885066b5a8609d017c9..13f5ee912b135ce05712d80837dc7f82c9c42507 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">
<testsuites>
diff --git a/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php b/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php
deleted file mode 100644
index bce481877742abe69961aecddad1556534f8108b..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-ini_set('precision', 14);
-ini_set('serialize_precision', 14);
diff --git a/core/vendor/phpunit/phpunit/tests/bootstrap.php b/core/vendor/phpunit/phpunit/tests/bootstrap.php
index bde92694852f4830642cb5ba8a77672dc1a365a5..cc79889b7e98ae1655ec87ce1b56297666b8f494 100644
--- a/core/vendor/phpunit/phpunit/tests/bootstrap.php
+++ b/core/vendor/phpunit/phpunit/tests/bootstrap.php
@@ -1,10 +1,6 @@
<?php
+// Needed for isolated tests
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);
-}
-
ini_set('precision', 14);
ini_set('serialize_precision', 14);
diff --git a/core/vendor/sebastian/global-state/.gitignore b/core/vendor/sebastian/global-state/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..a288f68dc0763452e4b9d4f6445a8213d3fc7fcc
--- /dev/null
+++ b/core/vendor/sebastian/global-state/.gitignore
@@ -0,0 +1,5 @@
+.idea
+composer.lock
+composer.phar
+vendor/
+cache.properties
diff --git a/core/vendor/sebastian/global-state/.travis.yml b/core/vendor/sebastian/global-state/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..41edae3bca58a845e757e3130948695d2d86a0ed
--- /dev/null
+++ b/core/vendor/sebastian/global-state/.travis.yml
@@ -0,0 +1,19 @@
+language: php
+
+before_script:
+ - composer self-update
+ - composer install --no-interaction --prefer-source --dev
+
+php:
+ - 5.3.3
+ - 5.3
+ - 5.4
+ - 5.5
+ - 5.6
+ - hhvm
+
+script: ./vendor/bin/phpunit --configuration ./build/phpunit.xml
+
+notifications:
+ email: false
+ irc: "irc.freenode.org#phpunit"
diff --git a/core/vendor/sebastian/global-state/LICENSE b/core/vendor/sebastian/global-state/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..b6176e012dc62638c47208ecdef4bec6c06dad09
--- /dev/null
+++ b/core/vendor/sebastian/global-state/LICENSE
@@ -0,0 +1,33 @@
+GlobalState
+
+Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+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.
diff --git a/core/vendor/sebastian/global-state/README.md b/core/vendor/sebastian/global-state/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..78fd1177b96f9ec519697ccd3b22d3395fa10c35
--- /dev/null
+++ b/core/vendor/sebastian/global-state/README.md
@@ -0,0 +1,13 @@
+# GlobalState
+
+Snapshotting of global state, factored out of PHPUnit into a stand-alone component.
+
+## Installation
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/global-state` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on GlobalState:
+
+ {
+ "require": {
+ "sebastian/global-state": "1.0.*"
+ }
+ }
diff --git a/core/vendor/sebastian/global-state/build.xml b/core/vendor/sebastian/global-state/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63c5445aa36aacf80c182b8117442d79471905e7
--- /dev/null
+++ b/core/vendor/sebastian/global-state/build.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="global-state">
+ <target name="clean" description="Cleanup build artifacts">
+ <delete dir="${basedir}/vendor"/>
+ <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+ <tstamp>
+ <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+ </tstamp>
+ <delete>
+ <fileset dir="${basedir}">
+ <include name="composer.phar" />
+ <date datetime="${thirty.days.ago}" when="before"/>
+ </fileset>
+ </delete>
+
+ <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+ <exec executable="php">
+ <arg value="composer.phar"/>
+ <arg value="install"/>
+ </exec>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+ <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
+ <arg value="--configuration"/>
+ <arg path="${basedir}/build/phpunit.xml"/>
+ </exec>
+ </target>
+</project>
diff --git a/core/vendor/sebastian/global-state/build/phpunit.xml b/core/vendor/sebastian/global-state/build/phpunit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fef0a0dce5cb43553631e985cd3948d5bc63879
--- /dev/null
+++ b/core/vendor/sebastian/global-state/build/phpunit.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
+ bootstrap="../vendor/autoload.php"
+ backupGlobals="false"
+ verbose="true">
+ <testsuite name="GlobalState">
+ <directory suffix="Test.php">../tests</directory>
+ </testsuite>
+
+ <filter>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">../src</directory>
+ </whitelist>
+ </filter>
+</phpunit>
diff --git a/core/vendor/sebastian/global-state/composer.json b/core/vendor/sebastian/global-state/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..7e8849bacaae5610e1e2896c6c8c8d28b92ae19a
--- /dev/null
+++ b/core/vendor/sebastian/global-state/composer.json
@@ -0,0 +1,37 @@
+{
+ "name": "sebastian/global-state",
+ "description": "Snapshotting of global state",
+ "keywords": ["global state"],
+ "homepage": "http://www.github.com/sebastianbergmann/global-state",
+ "license": "BSD-3-Clause",
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.2"
+ },
+ "suggest": {
+ "ext-uopz": "*"
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "autoload-dev": {
+ "classmap": [
+ "tests/_fixture/"
+ ]
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ }
+}
diff --git a/core/vendor/sebastian/global-state/src/Blacklist.php b/core/vendor/sebastian/global-state/src/Blacklist.php
new file mode 100644
index 0000000000000000000000000000000000000000..12d900f85fd8ea2072c629ae28d0e1ccc6b06603
--- /dev/null
+++ b/core/vendor/sebastian/global-state/src/Blacklist.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState;
+
+use ReflectionClass;
+
+/**
+ * A blacklist for global state elements that should not be snapshotted.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class Blacklist
+{
+ /**
+ * @var array
+ */
+ private $globalVariables = array();
+
+ /**
+ * @var array
+ */
+ private $classes = array();
+
+ /**
+ * @var array
+ */
+ private $classNamePrefixes = array();
+
+ /**
+ * @var array
+ */
+ private $parentClasses = array();
+
+ /**
+ * @var array
+ */
+ private $interfaces = array();
+
+ /**
+ * @var array
+ */
+ private $staticAttributes = array();
+
+ /**
+ * @param string $variableName
+ */
+ public function addGlobalVariable($variableName)
+ {
+ $this->globalVariables[$variableName] = true;
+ }
+
+ /**
+ * @param string $className
+ */
+ public function addClass($className)
+ {
+ $this->classes[] = $className;
+ }
+
+ /**
+ * @param string $className
+ */
+ public function addSubclassesOf($className)
+ {
+ $this->parentClasses[] = $className;
+ }
+
+ /**
+ * @param string $interfaceName
+ */
+ public function addImplementorsOf($interfaceName)
+ {
+ $this->interfaces[] = $interfaceName;
+ }
+
+ /**
+ * @param string $classNamePrefix
+ */
+ public function addClassNamePrefix($classNamePrefix)
+ {
+ $this->classNamePrefixes[] = $classNamePrefix;
+ }
+
+ /**
+ * @param string $className
+ * @param string $attributeName
+ */
+ public function addStaticAttribute($className, $attributeName)
+ {
+ if (!isset($this->staticAttributes[$className])) {
+ $this->staticAttributes[$className] = array();
+ }
+
+ $this->staticAttributes[$className][$attributeName] = true;
+ }
+
+ /**
+ * @param string $variableName
+ * @return boolean
+ */
+ public function isGlobalVariableBlacklisted($variableName)
+ {
+ return isset($this->globalVariables[$variableName]);
+ }
+
+ /**
+ * @param string $className
+ * @param string $attributeName
+ * @return boolean
+ */
+ public function isStaticAttributeBlacklisted($className, $attributeName)
+ {
+ if (in_array($className, $this->classes)) {
+ return true;
+ }
+
+ foreach ($this->classNamePrefixes as $prefix) {
+ if (strpos($className, $prefix) === 0) {
+ return true;
+ }
+ }
+
+ $class = new ReflectionClass($className);
+
+ foreach ($this->parentClasses as $type) {
+ if ($class->isSubclassOf($type)) {
+ return true;
+ }
+ }
+
+ foreach ($this->interfaces as $type) {
+ if ($class->implementsInterface($type)) {
+ return true;
+ }
+ }
+
+ if (isset($this->staticAttributes[$className][$attributeName])) {
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php b/core/vendor/sebastian/global-state/src/Exception.php
similarity index 58%
rename from core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
rename to core/vendor/sebastian/global-state/src/Exception.php
index 637feb3a3a95c7b69d368599360f191bdf10cd4a..04368862d89b836fca97e5d3a16c987b08b74640 100644
--- a/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
+++ b/core/vendor/sebastian/global-state/src/Exception.php
@@ -1,6 +1,6 @@
<?php
/**
- * PHPUnit
+ * GlobalState
*
* Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
@@ -34,75 +34,20 @@
* 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 <ralph.schindler@zend.com>
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
* @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
+ * @link http://www.github.com/sebastianbergmann/global-state
*/
+namespace SebastianBergmann\GlobalState;
+
/**
- * Class to hold the information about a deprecated feature that was used
- *
- * @package PHPUnit
- * @subpackage Framework
- * @author Ralph Schindler <ralph.schindler@zend.com>
* @author Sebastian Bergmann <sebastian@phpunit.de>
* @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
* @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
+ * @link http://www.github.com/sebastianbergmann/global-state
*/
-class PHPUnit_Util_DeprecatedFeature
+interface Exception
{
- /**
- * @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/sebastian/global-state/src/Restorer.php b/core/vendor/sebastian/global-state/src/Restorer.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5f0e55dfe4d2419e8f6a52d044326fe1a99f787
--- /dev/null
+++ b/core/vendor/sebastian/global-state/src/Restorer.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState;
+
+use ReflectionProperty;
+
+/**
+ * Restorer of snapshots of global state.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class Restorer
+{
+ /**
+ * Deletes function definitions that are not defined in a snapshot.
+ *
+ * @param Snapshot $snapshot
+ * @throws RuntimeException when the uopz_delete() function is not available
+ * @see https://github.com/krakjoe/uopz
+ */
+ public function restoreFunctions(Snapshot $snapshot)
+ {
+ if (!function_exists('uopz_delete')) {
+ throw new RuntimeException('The uopz_delete() function is required for this operation');
+ }
+
+ $functions = get_defined_functions();
+
+ foreach (array_diff($functions['user'], $snapshot->functions()) as $function) {
+ uopz_delete($function);
+ }
+ }
+
+ /**
+ * Restores all global and super-global variables from a snapshot.
+ *
+ * @param Snapshot $snapshot
+ */
+ public function restoreGlobalVariables(Snapshot $snapshot)
+ {
+ $superGlobalArrays = $snapshot->superGlobalArrays();
+
+ foreach ($superGlobalArrays as $superGlobalArray) {
+ $this->restoreSuperGlobalArray($snapshot, $superGlobalArray);
+ }
+
+ $globalVariables = $snapshot->globalVariables();
+
+ foreach (array_keys($GLOBALS) as $key) {
+ if ($key != 'GLOBALS' &&
+ !in_array($key, $superGlobalArrays) &&
+ !$snapshot->blacklist()->isGlobalVariableBlacklisted($key)) {
+ if (isset($globalVariables[$key])) {
+ $GLOBALS[$key] = $globalVariables[$key];
+ } else {
+ unset($GLOBALS[$key]);
+ }
+ }
+ }
+ }
+
+ /**
+ * Restores all static attributes in user-defined classes from this snapshot.
+ *
+ * @param Snapshot $snapshot
+ */
+ public function restoreStaticAttributes(Snapshot $snapshot)
+ {
+ foreach ($snapshot->staticAttributes() as $className => $staticAttributes) {
+ foreach ($staticAttributes as $name => $value) {
+ $reflector = new ReflectionProperty($className, $name);
+ $reflector->setAccessible(true);
+ $reflector->setValue($value);
+ }
+ }
+ }
+
+ /**
+ * Restores a super-global variable array from this snapshot.
+ *
+ * @param Snapshot $snapshot
+ * @param $superGlobalArray
+ */
+ private function restoreSuperGlobalArray(Snapshot $snapshot, $superGlobalArray)
+ {
+ $superGlobalVariables = $snapshot->superGlobalVariables();
+
+ if (isset($GLOBALS[$superGlobalArray]) &&
+ is_array($GLOBALS[$superGlobalArray]) &&
+ isset($superGlobalVariables[$superGlobalArray])) {
+ $keys = array_keys(
+ array_merge(
+ $GLOBALS[$superGlobalArray],
+ $superGlobalVariables[$superGlobalArray]
+ )
+ );
+
+ foreach ($keys as $key) {
+ if (isset($superGlobalVariables[$superGlobalArray][$key])) {
+ $GLOBALS[$superGlobalArray][$key] = $superGlobalVariables[$superGlobalArray][$key];
+ } else {
+ unset($GLOBALS[$superGlobalArray][$key]);
+ }
+ }
+ }
+ }
+}
diff --git a/core/vendor/sebastian/global-state/src/RuntimeException.php b/core/vendor/sebastian/global-state/src/RuntimeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e25e208f3b006375f7e3fc8d91794e347070f1c7
--- /dev/null
+++ b/core/vendor/sebastian/global-state/src/RuntimeException.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class RuntimeException extends \RuntimeException implements Exception
+{
+}
diff --git a/core/vendor/sebastian/global-state/src/Snapshot.php b/core/vendor/sebastian/global-state/src/Snapshot.php
new file mode 100644
index 0000000000000000000000000000000000000000..5fb08beca32c41a78426209aa20f10bb415b3451
--- /dev/null
+++ b/core/vendor/sebastian/global-state/src/Snapshot.php
@@ -0,0 +1,443 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState;
+
+use Closure;
+use ReflectionClass;
+
+/**
+ * A snapshot of global state.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class Snapshot
+{
+ /**
+ * @var Blacklist
+ */
+ private $blacklist;
+
+ /**
+ * @var array
+ */
+ private $globalVariables = array();
+
+ /**
+ * @var array
+ */
+ private $superGlobalArrays = array();
+
+ /**
+ * @var array
+ */
+ private $superGlobalVariables = array();
+
+ /**
+ * @var array
+ */
+ private $staticAttributes = array();
+
+ /**
+ * @var array
+ */
+ private $iniSettings = array();
+
+ /**
+ * @var array
+ */
+ private $includedFiles = array();
+
+ /**
+ * @var array
+ */
+ private $constants = array();
+
+ /**
+ * @var array
+ */
+ private $functions = array();
+
+ /**
+ * @var array
+ */
+ private $interfaces = array();
+
+ /**
+ * @var array
+ */
+ private $classes = array();
+
+ /**
+ * @var array
+ */
+ private $traits = array();
+
+ /**
+ * Creates a snapshot of the current global state.
+ *
+ * @param Blacklist $blacklist
+ * @param boolean $includeGlobalVariables
+ * @param boolean $includeStaticAttributes
+ * @param boolean $includeConstants
+ * @param boolean $includeFunctions
+ * @param boolean $includeClasses
+ * @param boolean $includeInterfaces
+ * @param boolean $includeTraits
+ * @param boolean $includeIniSettings
+ * @param boolean $includeIncludedFiles
+ */
+ public function __construct(Blacklist $blacklist = null, $includeGlobalVariables = true, $includeStaticAttributes = true, $includeConstants = true, $includeFunctions = true, $includeClasses = true, $includeInterfaces = true, $includeTraits = true, $includeIniSettings = true, $includeIncludedFiles = true)
+ {
+ if ($blacklist === null) {
+ $blacklist = new Blacklist;
+ }
+
+ $this->blacklist = $blacklist;
+
+ if ($includeConstants) {
+ $this->snapshotConstants();
+ }
+
+ if ($includeFunctions) {
+ $this->snapshotFunctions();
+ }
+
+ if ($includeClasses || $includeStaticAttributes) {
+ $this->snapshotClasses();
+ }
+
+ if ($includeInterfaces) {
+ $this->snapshotInterfaces();
+ }
+
+ if ($includeGlobalVariables) {
+ $this->setupSuperGlobalArrays();
+ $this->snapshotGlobals();
+ }
+
+ if ($includeStaticAttributes) {
+ $this->snapshotStaticAttributes();
+ }
+
+ if ($includeIniSettings) {
+ $this->iniSettings = ini_get_all(null, false);
+ }
+
+ if ($includeIncludedFiles) {
+ $this->includedFiles = get_included_files();
+ }
+
+ if (function_exists('get_declared_traits')) {
+ $this->traits = get_declared_traits();
+ }
+ }
+
+ /**
+ * @return Blacklist
+ */
+ public function blacklist()
+ {
+ return $this->blacklist;
+ }
+
+ /**
+ * @return array
+ */
+ public function globalVariables()
+ {
+ return $this->globalVariables;
+ }
+
+ /**
+ * @return array
+ */
+ public function superGlobalVariables()
+ {
+ return $this->superGlobalVariables;
+ }
+
+ /**
+ * Returns a list of all super-global variable arrays.
+ *
+ * @return array
+ */
+ public function superGlobalArrays()
+ {
+ return $this->superGlobalArrays;
+ }
+
+ /**
+ * @return array
+ */
+ public function staticAttributes()
+ {
+ return $this->staticAttributes;
+ }
+
+ /**
+ * @return array
+ */
+ public function iniSettings()
+ {
+ return $this->iniSettings;
+ }
+
+ /**
+ * @return array
+ */
+ public function includedFiles()
+ {
+ return $this->includedFiles;
+ }
+
+ /**
+ * @return array
+ */
+ public function constants()
+ {
+ return $this->constants;
+ }
+
+ /**
+ * @return array
+ */
+ public function functions()
+ {
+ return $this->functions;
+ }
+
+ /**
+ * @return array
+ */
+ public function interfaces()
+ {
+ return $this->interfaces;
+ }
+
+ /**
+ * @return array
+ */
+ public function classes()
+ {
+ return $this->classes;
+ }
+
+ /**
+ * @return array
+ */
+ public function traits()
+ {
+ return $this->traits;
+ }
+
+ /**
+ * Creates a snapshot user-defined constants.
+ */
+ private function snapshotConstants()
+ {
+ $constants = get_defined_constants(true);
+
+ if (isset($constants['user'])) {
+ $this->constants = $constants['user'];
+ }
+ }
+
+ /**
+ * Creates a snapshot user-defined functions.
+ */
+ private function snapshotFunctions()
+ {
+ $functions = get_defined_functions();
+
+ $this->functions = $functions['user'];
+ }
+
+ /**
+ * Creates a snapshot user-defined classes.
+ */
+ private function snapshotClasses()
+ {
+ foreach (array_reverse(get_declared_classes()) as $className) {
+ $class = new ReflectionClass($className);
+
+ if (!$class->isUserDefined()) {
+ break;
+ }
+
+ $this->classes[] = $className;
+ }
+
+ $this->classes = array_reverse($this->classes);
+ }
+
+ /**
+ * Creates a snapshot user-defined interfaces.
+ */
+ private function snapshotInterfaces()
+ {
+ foreach (array_reverse(get_declared_interfaces()) as $interfaceName) {
+ $class = new ReflectionClass($interfaceName);
+
+ if (!$class->isUserDefined()) {
+ break;
+ }
+
+ $this->interfaces[] = $interfaceName;
+ }
+
+ $this->interfaces = array_reverse($this->interfaces);
+ }
+
+ /**
+ * Creates a snapshot of all global and super-global variables.
+ */
+ private function snapshotGlobals()
+ {
+ $superGlobalArrays = $this->superGlobalArrays();
+
+ foreach ($superGlobalArrays as $superGlobalArray) {
+ $this->snapshotSuperGlobalArray($superGlobalArray);
+ }
+
+ foreach (array_keys($GLOBALS) as $key) {
+ if ($key != 'GLOBALS' &&
+ !in_array($key, $superGlobalArrays) &&
+ $this->canBeSerialized($GLOBALS[$key]) &&
+ !$this->blacklist->isGlobalVariableBlacklisted($key)) {
+ $this->globalVariables[$key] = unserialize(serialize($GLOBALS[$key]));
+ }
+ }
+ }
+
+ /**
+ * Creates a snapshot a super-global variable array.
+ *
+ * @param $superGlobalArray
+ */
+ private function snapshotSuperGlobalArray($superGlobalArray)
+ {
+ $this->superGlobalVariables[$superGlobalArray] = array();
+
+ if (isset($GLOBALS[$superGlobalArray]) && is_array($GLOBALS[$superGlobalArray])) {
+ foreach ($GLOBALS[$superGlobalArray] as $key => $value) {
+ $this->superGlobalVariables[$superGlobalArray][$key] = unserialize(serialize($value));
+ }
+ }
+ }
+
+ /**
+ * Creates a snapshot of all static attributes in user-defined classes.
+ */
+ private function snapshotStaticAttributes()
+ {
+ foreach ($this->classes as $className) {
+ $class = new ReflectionClass($className);
+ $snapshot = array();
+
+ foreach ($class->getProperties() as $attribute) {
+ if ($attribute->isStatic()) {
+ $name = $attribute->getName();
+
+ if ($this->blacklist->isStaticAttributeBlacklisted($className, $name)) {
+ continue;
+ }
+
+ $attribute->setAccessible(true);
+ $value = $attribute->getValue();
+
+ if ($this->canBeSerialized($value)) {
+ $snapshot[$name] = unserialize(serialize($value));
+ }
+ }
+ }
+
+ if (!empty($snapshot)) {
+ $this->staticAttributes[$className] = $snapshot;
+ }
+ }
+ }
+
+ /**
+ * Returns a list of all super-global variable arrays.
+ *
+ * @return array
+ */
+ private function setupSuperGlobalArrays()
+ {
+ $this->superGlobalArrays = array(
+ '_ENV',
+ '_POST',
+ '_GET',
+ '_COOKIE',
+ '_SERVER',
+ '_FILES',
+ '_REQUEST'
+ );
+
+ if (ini_get('register_long_arrays') == '1') {
+ $this->superGlobalArrays = array_merge(
+ $this->superGlobalArrays,
+ array(
+ 'HTTP_ENV_VARS',
+ 'HTTP_POST_VARS',
+ 'HTTP_GET_VARS',
+ 'HTTP_COOKIE_VARS',
+ 'HTTP_SERVER_VARS',
+ 'HTTP_POST_FILES'
+ )
+ );
+ }
+ }
+
+ /**
+ * @param mixed $variable
+ * @return boolean
+ * @todo Implement this properly
+ */
+ private function canBeSerialized($variable) {
+ return !$variable instanceof Closure;
+ }
+}
diff --git a/core/vendor/sebastian/global-state/tests/BlacklistTest.php b/core/vendor/sebastian/global-state/tests/BlacklistTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5a2a75a88b8056855092c35739bd5e6d2dced6b
--- /dev/null
+++ b/core/vendor/sebastian/global-state/tests/BlacklistTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState;
+
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class BlacklistTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \SebastianBergmann\GlobalState\Blacklist
+ */
+ private $blacklist;
+
+ protected function setUp()
+ {
+ $this->blacklist = new Blacklist;
+ }
+
+ public function testGlobalVariableThatIsNotBlacklistedIsNotTreatedAsBlacklisted()
+ {
+ $this->assertFalse($this->blacklist->isGlobalVariableBlacklisted('variable'));
+ }
+
+ public function testGlobalVariableCanBeBlacklisted()
+ {
+ $this->blacklist->addGlobalVariable('variable');
+
+ $this->assertTrue($this->blacklist->isGlobalVariableBlacklisted('variable'));
+ }
+
+ public function testStaticAttributeThatIsNotBlacklistedIsNotTreatedAsBlacklisted()
+ {
+ $this->assertFalse(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedClass',
+ 'attribute'
+ )
+ );
+ }
+
+ public function testClassCanBeBlacklisted()
+ {
+ $this->blacklist->addClass('SebastianBergmann\GlobalState\TestFixture\BlacklistedClass');
+
+ $this->assertTrue(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedClass',
+ 'attribute'
+ )
+ );
+ }
+
+ public function testSubclassesCanBeBlacklisted()
+ {
+ $this->blacklist->addSubclassesOf('SebastianBergmann\GlobalState\TestFixture\BlacklistedClass');
+
+ $this->assertTrue(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedChildClass',
+ 'attribute'
+ )
+ );
+ }
+
+ public function testImplementorsCanBeBlacklisted()
+ {
+ $this->blacklist->addImplementorsOf('SebastianBergmann\GlobalState\TestFixture\BlacklistedInterface');
+
+ $this->assertTrue(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedImplementor',
+ 'attribute'
+ )
+ );
+ }
+
+ public function testClassNamePrefixesCanBeBlacklisted()
+ {
+ $this->blacklist->addClassNamePrefix('SebastianBergmann\GlobalState');
+
+ $this->assertTrue(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedClass',
+ 'attribute'
+ )
+ );
+ }
+
+ public function testStaticAttributeCanBeBlacklisted()
+ {
+ $this->blacklist->addStaticAttribute(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedClass',
+ 'attribute'
+ );
+
+ $this->assertTrue(
+ $this->blacklist->isStaticAttributeBlacklisted(
+ 'SebastianBergmann\GlobalState\TestFixture\BlacklistedClass',
+ 'attribute'
+ )
+ );
+ }
+}
diff --git a/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedChildClass.php b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedChildClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..99f7fdb055c7b59b274d33019d5793bd40271716
--- /dev/null
+++ b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedChildClass.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState\TestFixture;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class BlacklistedChildClass extends BlacklistedClass
+{
+}
diff --git a/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedClass.php b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..f1582c7d76922925d6c8f91698e8e9ae988fc83a
--- /dev/null
+++ b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedClass.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState\TestFixture;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class BlacklistedClass
+{
+ private static $attribute;
+}
diff --git a/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedImplementor.php b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedImplementor.php
new file mode 100644
index 0000000000000000000000000000000000000000..c80d98738f644cf88aa2ecacb2f04d220be3ab0c
--- /dev/null
+++ b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedImplementor.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState\TestFixture;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+class BlacklistedImplementor implements BlacklistedInterface
+{
+ private static $attribute;
+}
diff --git a/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedInterface.php b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3941fdec261beabd36c46dfda4903abe7136f82
--- /dev/null
+++ b/core/vendor/sebastian/global-state/tests/_fixture/BlacklistedInterface.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * GlobalState
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * 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.
+ *
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+
+namespace SebastianBergmann\GlobalState\TestFixture;
+
+/**
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://www.github.com/sebastianbergmann/global-state
+ */
+interface BlacklistedInterface
+{
+}