diff --git a/framework/Test/bundle/composer.lock b/framework/Test/bundle/composer.lock
index 9d51f282573..7c4e53c99ac 100644
--- a/framework/Test/bundle/composer.lock
+++ b/framework/Test/bundle/composer.lock
@@ -256,16 +256,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.1.1",
+ "version": "4.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "1d6b554732382879045e11c56decd4be76130720"
+ "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1d6b554732382879045e11c56decd4be76130720",
- "reference": "1d6b554732382879045e11c56decd4be76130720",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/939cb801b3b2aa253aedd0b279f40bb8f35cec91",
+ "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91",
"shasum": ""
},
"require": {
@@ -326,20 +326,20 @@
"testing",
"xunit"
],
- "time": "2014-05-24 10:48:51"
+ "time": "2014-06-11 14:15:47"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.1.0",
+ "version": "2.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c"
+ "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/da0eb04d8ee95ec2898187e407e519c118d3d27c",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
+ "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
"shasum": ""
},
"require": {
@@ -383,7 +383,7 @@
"mock",
"xunit"
],
- "time": "2014-05-02 07:04:11"
+ "time": "2014-06-07 16:22:57"
},
{
"name": "phpunit/phpunit-story",
diff --git a/framework/Test/bundle/vendor/autoload.php b/framework/Test/bundle/vendor/autoload.php
index acc5a1cbfc0..12c534446c8 100644
--- a/framework/Test/bundle/vendor/autoload.php
+++ b/framework/Test/bundle/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit895cf7c73f2f7964e283bd5ecd7d9ed0::getLoader();
+return ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4::getLoader();
diff --git a/framework/Test/bundle/vendor/composer/autoload_classmap.php b/framework/Test/bundle/vendor/composer/autoload_classmap.php
index ddd56d89370..3b9793463f4 100644
--- a/framework/Test/bundle/vendor/composer/autoload_classmap.php
+++ b/framework/Test/bundle/vendor/composer/autoload_classmap.php
@@ -78,6 +78,7 @@
'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',
+ 'PHPUnit_Framework_MockObject_BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php',
'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php',
'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php',
'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php',
@@ -85,7 +86,7 @@
'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php',
'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php',
'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php',
- 'PHPUnit_Framework_MockObject_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception.php',
+ 'PHPUnit_Framework_MockObject_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php',
'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php',
'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php',
'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php',
@@ -106,6 +107,7 @@
'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php',
'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php',
'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php',
+ 'PHPUnit_Framework_MockObject_RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php',
'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php',
'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php',
diff --git a/framework/Test/bundle/vendor/composer/autoload_real.php b/framework/Test/bundle/vendor/composer/autoload_real.php
index cfc0f41c02c..1b5ce4a7a9c 100644
--- a/framework/Test/bundle/vendor/composer/autoload_real.php
+++ b/framework/Test/bundle/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit895cf7c73f2f7964e283bd5ecd7d9ed0
+class ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4
{
private static $loader;
@@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit895cf7c73f2f7964e283bd5ecd7d9ed0', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit895cf7c73f2f7964e283bd5ecd7d9ed0', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -51,7 +51,7 @@ public static function getLoader()
}
}
-function composerRequire895cf7c73f2f7964e283bd5ecd7d9ed0($file)
+function composerRequire520d2c71c384feed8a11e5e8d4a97ca4($file)
{
require $file;
}
diff --git a/framework/Test/bundle/vendor/composer/include_paths.php b/framework/Test/bundle/vendor/composer/include_paths.php
index bf3b8ac0b3b..a298475723d 100644
--- a/framework/Test/bundle/vendor/composer/include_paths.php
+++ b/framework/Test/bundle/vendor/composer/include_paths.php
@@ -7,12 +7,12 @@
return array(
$vendorDir . '/phpunit/php-text-template',
- $vendorDir . '/phpunit/phpunit-mock-objects',
$vendorDir . '/phpunit/php-timer',
$vendorDir . '/phpunit/php-token-stream',
$vendorDir . '/phpunit/php-file-iterator',
$vendorDir . '/phpunit/phpunit-story',
$vendorDir . '/phpunit/php-code-coverage',
+ $vendorDir . '/phpunit/phpunit-mock-objects',
$vendorDir . '/phpunit/phpunit',
$vendorDir . '/symfony/yaml',
);
diff --git a/framework/Test/bundle/vendor/composer/installed.json b/framework/Test/bundle/vendor/composer/installed.json
index c9c1e4a31bb..b0183906d72 100644
--- a/framework/Test/bundle/vendor/composer/installed.json
+++ b/framework/Test/bundle/vendor/composer/installed.json
@@ -322,65 +322,6 @@
"template"
]
},
- {
- "name": "phpunit/phpunit-mock-objects",
- "version": "2.1.0",
- "version_normalized": "2.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/da0eb04d8ee95ec2898187e407e519c118d3d27c",
- "reference": "da0eb04d8ee95ec2898187e407e519c118d3d27c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.1"
- },
- "suggest": {
- "ext-soap": "*"
- },
- "time": "2014-05-02 07:04:11",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.1.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ]
- },
{
"name": "phpunit/php-timer",
"version": "1.0.5",
@@ -694,19 +635,78 @@
"xunit"
]
},
+ {
+ "name": "phpunit/phpunit-mock-objects",
+ "version": "2.1.4",
+ "version_normalized": "2.1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+ "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
+ "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "phpunit/php-text-template": "~1.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.1"
+ },
+ "suggest": {
+ "ext-soap": "*"
+ },
+ "time": "2014-06-07 16:22:57",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Mock Object library for PHPUnit",
+ "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+ "keywords": [
+ "mock",
+ "xunit"
+ ]
+ },
{
"name": "phpunit/phpunit",
- "version": "4.1.1",
- "version_normalized": "4.1.1.0",
+ "version": "4.1.3",
+ "version_normalized": "4.1.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "1d6b554732382879045e11c56decd4be76130720"
+ "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1d6b554732382879045e11c56decd4be76130720",
- "reference": "1d6b554732382879045e11c56decd4be76130720",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/939cb801b3b2aa253aedd0b279f40bb8f35cec91",
+ "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91",
"shasum": ""
},
"require": {
@@ -731,7 +731,7 @@
"suggest": {
"phpunit/php-invoker": "~1.1"
},
- "time": "2014-05-24 10:48:51",
+ "time": "2014-06-11 14:15:47",
"bin": [
"phpunit"
],
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/.travis.yml b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/.travis.yml
index ee04dced501..b6a76ecd22e 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/.travis.yml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/.travis.yml
@@ -1,17 +1,18 @@
language: php
-php:
- - 5.3.3
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - hhvm
-
before_script:
- - COMPOSER_ROOT_VERSION=dev-master composer install --dev --prefer-source
+ - composer self-update
+ - composer install --no-interaction --prefer-source --dev
-script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
+script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
+
+php:
+ - 5.3.3
+ - 5.3
+ - 5.4
+ - 5.5
+ - 5.6
+ - hhvm
matrix:
allow_failures:
@@ -19,7 +20,10 @@ matrix:
notifications:
email: false
- irc:
- channels:
- - "irc.freenode.org#phpunit"
- use_notice: true
+ webhooks:
+ urls:
+ - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+ on_success: always
+ on_failure: always
+ on_start: false
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
index 6f6ef344522..b2905398264 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-Pull Requests for bug fixes should be made against the current release branch (1.2).
+Pull Requests for bug fixes should be made against the current release branch (1.2).
Pull Requests for new features should be made against master.
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/README.md b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/README.md
index ada237ad707..cb855a8a76a 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/README.md
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/README.md
@@ -18,3 +18,4 @@ To add PHPUnit_MockObject as a local, per-project dependency to your project, si
"phpunit/phpunit-mock-objects": "2.1.*"
}
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build.xml b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build.xml
index 3c947eb2e4c..aa44cbece74 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build.xml
@@ -47,3 +47,4 @@
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
index a549714a900..f2b2216a82f 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
@@ -1,21 +1,12 @@
-
-
-
- ../tests
- ../tests
-
-
-
-
-
-
-
-
-
- ../src
-
-
+ backupGlobals="false"
+ verbose="true">
+
+ ../tests
+ ../tests
+
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/composer.json b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/composer.json
index e9935ea29a7..46fda2b5db2 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/composer.json
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/composer.json
@@ -43,3 +43,4 @@
""
]
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
index 51c84d1ada5..84db1114592 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
@@ -1,25 +1,22 @@
-
-
-
- tests
- tests
-
-
+
+
+ tests
+ tests
+
-
-
-
+
-
+
src
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
new file mode 100644
index 00000000000..a0cd1f30377
--- /dev/null
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
@@ -0,0 +1,55 @@
+.
+ * 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_MockObject
+ * @author Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since File available since Release 2.0.6
+ */
+
+/**
+ * @package PHPUnit_MockObject
+ * @author Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_BadMethodCallException extends BadMethodCallException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
similarity index 85%
rename from framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception.php
rename to framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
index bb769eaa5ab..8ce99ff2a8c 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
@@ -2,7 +2,7 @@
/**
* PHPUnit
*
- * Copyright (c) 2010-2012, Sebastian Bergmann .
+ * Copyright (c) 2010-2014, Sebastian Bergmann .
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,22 +36,22 @@
*
* @package PHPUnit_MockObject
* @author Sebastian Bergmann
- * @copyright 2010-2012 Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://github.com/sebastianbergmann/phpunit-mock-objects
* @since File available since Release 2.0.0
*/
/**
- * Exception class uses by PHPUnit_MockObject.
+ * Interface for exceptions used by PHPUnit_MockObject.
*
* @package PHPUnit_MockObject
* @author Sebastian Bergmann
- * @copyright 2010-2012 Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @link http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since Interface available since Release 2.0.0
+ * @since Interface available since Release 2.0.6
*/
-class PHPUnit_Framework_MockObject_Exception extends RuntimeException
+interface PHPUnit_Framework_MockObject_Exception
{
}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
new file mode 100644
index 00000000000..b13ab68568b
--- /dev/null
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
@@ -0,0 +1,55 @@
+.
+ * 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_MockObject
+ * @author Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since File available since Release 2.0.6
+ */
+
+/**
+ * @package PHPUnit_MockObject
+ * @author Sebastian Bergmann
+ * @copyright 2010-2014 Sebastian Bergmann
+ * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
+ * @link http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_RuntimeException extends RuntimeException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
index 027235bfc0d..a24171ad72d 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
@@ -169,6 +169,7 @@ class PHPUnit_Framework_MockObject_Generator
* @return object
* @throws InvalidArgumentException
* @throws PHPUnit_Framework_Exception
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
* @since Method available since Release 1.0.0
*/
public function getMock($type, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE, $callOriginalMethods = FALSE, $proxyTarget = NULL)
@@ -198,7 +199,7 @@ public function getMock($type, $methods = array(), array $arguments = array(), $
}
if ($methods != array_unique($methods)) {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf(
'Cannot stub or mock using a method list that contains duplicates: "%s"',
implode(', ', $methods)
@@ -211,7 +212,7 @@ public function getMock($type, $methods = array(), array $arguments = array(), $
$reflect = new ReflectionClass($mockClassName);
if (!$reflect->implementsInterface("PHPUnit_Framework_MockObject_MockObject")) {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf(
'Class "%s" already exists.',
$mockClassName
@@ -263,15 +264,29 @@ protected function getObject($code, $className, $type = '', $callOriginalConstru
if (count($arguments) == 0) {
$object = new $className;
} else {
- $class = new ReflectionClass($className);
+ $class = new ReflectionClass($className);
$object = $class->newInstanceArgs($arguments);
}
} else {
- // We have to use this dirty trick instead of ReflectionClass::newInstanceWithoutConstructor()
- // because of https://github.com/sebastianbergmann/phpunit-mock-objects/issues/154
- $object = unserialize(
- sprintf('O:%d:"%s":0:{}', strlen($className), $className)
- );
+ $class = new ReflectionClass('ReflectionClass');
+ $hasNewInstanceWithoutConstructor = $class->hasMethod('newInstanceWithoutConstructor');;
+
+ $class = new ReflectionClass($className);
+ $isInternal = $this->isInternalClass($class);
+
+ if ($isInternal && !$this->unserializeHackIsSupported()) {
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
+ 'Internal classes cannot be mocked without invoking their constructor in PHP ' . PHP_VERSION
+ );
+ }
+
+ if ($isInternal || !$hasNewInstanceWithoutConstructor) {
+ $object = unserialize(
+ sprintf('O:%d:"%s":0:{}', strlen($className), $className)
+ );
+ } else {
+ $object = $class->newInstanceWithoutConstructor();
+ }
}
if ($callOriginalMethods) {
@@ -316,7 +331,7 @@ protected function evalClass($code, $className)
* @param boolean $cloneArguments
* @return object
* @since Method available since Release 1.0.0
- * @throws InvalidArgumentException
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
* @throws PHPUnit_Framework_Exception
*/
public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
@@ -355,7 +370,7 @@ interface_exists($originalClassName, $callAutoload)) {
$cloneArguments
);
} else {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf('Class "%s" does not exist.', $originalClassName)
);
}
@@ -376,7 +391,8 @@ interface_exists($originalClassName, $callAutoload)) {
* @param boolean $cloneArguments
* @return object
* @since Method available since Release 1.2.3
- * @throws InvalidArgumentException
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
+ * @throws PHPUnit_Framework_Exception
*/
public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
{
@@ -389,7 +405,7 @@ public function getMockForTrait($traitName, array $arguments = array(), $mockCla
}
if (!trait_exists($traitName, $callAutoload)) {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf(
'Trait "%s" does not exist.',
$traitName
@@ -434,7 +450,7 @@ public function getMockForTrait($traitName, array $arguments = array(), $mockCla
* @param boolean $callAutoload
* @return object
* @since Method available since Release 1.1.0
- * @throws InvalidArgumentException
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
* @throws PHPUnit_Framework_Exception
*/
public function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE)
@@ -448,7 +464,7 @@ public function getObjectForTrait($traitName, array $arguments = array(), $trait
}
if (!trait_exists($traitName, $callAutoload)) {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf(
'Trait "%s" does not exist.',
$traitName
@@ -533,7 +549,7 @@ public function generate($type, array $methods = NULL, $mockClassName = '', $cal
* @param array $methods
* @param array $options
* @return string
- * @throws PHPUnit_Framework_Exception
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
*/
public function generateClassFromWsdl($wsdlFile, $className, array $methods = array(), array $options = array())
{
@@ -619,7 +635,7 @@ public function generateClassFromWsdl($wsdlFile, $className, array $methods = ar
return $classTemplate->render();
} else {
- throw new PHPUnit_Framework_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
'The SOAP extension is required to generate a mock object ' .
'from WSDL.'
);
@@ -930,7 +946,8 @@ protected function generateMockedMethodDefinitionFromExisting($templateDir, Refl
$this->getMethodParameters($method),
$this->getMethodParameters($method, TRUE),
$reference,
- $callOriginalMethods
+ $callOriginalMethods,
+ $method->isStatic()
);
}
@@ -944,14 +961,19 @@ protected function generateMockedMethodDefinitionFromExisting($templateDir, Refl
* @param string $arguments_call
* @param string $reference
* @param boolean $callOriginalMethods
+ * @param boolean $static
* @return string
*/
- protected function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = TRUE, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $callOriginalMethods = FALSE)
+ protected function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = TRUE, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $callOriginalMethods = FALSE, $static = FALSE)
{
- $templateFile = sprintf(
- '%s_method.tpl',
- $callOriginalMethods ? 'proxied' : 'mocked'
- );
+ if ($static) {
+ $templateFile = 'mocked_static_method.tpl';
+ } else {
+ $templateFile = sprintf(
+ '%s_method.tpl',
+ $callOriginalMethods ? 'proxied' : 'mocked'
+ );
+ }
$template = new Text_Template($templateDir . $templateFile);
@@ -992,6 +1014,7 @@ protected function canMockMethod(ReflectionMethod $method)
* @param ReflectionMethod $method
* @param boolean $forCall
* @return string
+ * @throws PHPUnit_Framework_MockObject_RuntimeException
* @since Method available since Release 2.0.0
*/
protected function getMethodParameters(ReflectionMethod $method, $forCall = FALSE)
@@ -1022,7 +1045,7 @@ protected function getMethodParameters(ReflectionMethod $method, $forCall = FALS
try {
$class = $parameter->getClass();
} catch (ReflectionException $e) {
- throw new PHPUnit_Framework_MockObject_Exception(
+ throw new PHPUnit_Framework_MockObject_RuntimeException(
sprintf(
'Cannot mock %s::%s() because a class or ' .
'interface used in the signature is not loaded',
@@ -1056,4 +1079,36 @@ protected function getMethodParameters(ReflectionMethod $method, $forCall = FALS
return join(', ', $parameters);
}
+
+ /**
+ * @param ReflectionClass $class
+ * @return boolean
+ * @since Method available since Release 2.0.8
+ */
+ private function isInternalClass(ReflectionClass $class)
+ {
+ while ($class) {
+ if ($class->isInternal()) {
+ return true;
+ }
+
+ $class = $class->getParentClass();
+ }
+
+ return false;
+ }
+
+ /**
+ * @return boolean
+ * @since Method available since Release 2.0.9
+ */
+ private function unserializeHackIsSupported()
+ {
+ if (PHP_VERSION == '5.4.29' || PHP_VERSION == '5.5.13' ||
+ version_compare(PHP_VERSION, '5.6.0', '>=')) {
+ return FALSE;
+ }
+
+ return TRUE;
+ }
}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
new file mode 100644
index 00000000000..5454b2f39f4
--- /dev/null
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
@@ -0,0 +1,5 @@
+
+ {modifier} function {reference}{method_name}({arguments_decl})
+ {
+ throw new PHPUnit_Framework_MockObject_BadMethodCallException;
+ }
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
index cbf93882815..6663ab46143 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
@@ -28,7 +28,7 @@ public function testGetMockCanCreateNonExistingFunctions()
/**
* @covers PHPUnit_Framework_MockObject_Generator::getMock
- * @expectedException PHPUnit_Framework_Exception
+ * @expectedException PHPUnit_Framework_MockObject_RuntimeException
* @expectedExceptionMessage duplicates: "foo, foo"
*/
public function testGetMockGeneratorFails()
@@ -95,7 +95,7 @@ public function testGetMockForAbstractClassExpectingInvalidArgumentException($cl
/**
* @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
- * @expectedException PHPUnit_Framework_Exception
+ * @expectedException PHPUnit_Framework_MockObject_RuntimeException
*/
public function testGetMockForAbstractClassAnstractClassDoesNotExist()
{
@@ -130,17 +130,6 @@ public function testGetMockForTraitWithNonExistentMethodsAndNonAbstractMethods()
$this->assertTrue($mock->anotherMockableMethod());
}
- /**
- * @dataProvider getMockForTraitExpectsInvalidArgumentExceptionDataprovider
- * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
- * @requires PHP 5.4.0
- * @expectedException PHPUnit_Framework_Exception
- */
- public function testGetMockForTraitExpectingInvalidArgumentException($traitName, $mockClassName)
- {
- $mock = $this->generator->getMockForTrait($traitName, array(), $mockClassName);
- }
-
/**
* @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
* @requires PHP 5.4.0
@@ -150,16 +139,4 @@ public function testGetMockForTraitStubbingAbstractMethod()
$mock = $this->generator->getMockForTrait('AbstractTrait');
$this->assertTrue(method_exists($mock, 'doSomething'));
}
-
- /**
- * Dataprovider for test "testGetMockForTraitExpectingInvalidArgumentException"
- */
- public static function getMockForTraitExpectsInvalidArgumentExceptionDataprovider()
- {
- return array(
- 'traitName not a string' => array(array(), ''),
- 'mockClassName not a string' => array('AbstractTrait', new StdClass),
- 'trait does not exist' => array('AbstractTraitDoesNotExist', 'TraitTest')
- );
- }
}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
index d4a9d99d2f9..ec195f125a7 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
@@ -770,6 +770,29 @@ public function testInterfaceWithStaticMethodCanBeStubbed()
);
}
+ /**
+ * @expectedException PHPUnit_Framework_MockObject_BadMethodCallException
+ */
+ public function testInvokingStubbedStaticMethodRaisesException()
+ {
+ $mock = $this->getMock('ClassWithStaticMethod');
+ $mock->staticMethod();
+ }
+
+ /**
+ * @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171
+ * @ticket 171
+ */
+ public function testStubForClassThatImplementsSerializableCanBeCreatedWithoutInvokingTheConstructor()
+ {
+ $this->assertInstanceOf(
+ 'ClassThatImplementsSerializable',
+ $this->getMockBuilder('ClassThatImplementsSerializable')
+ ->disableOriginalConstructor()
+ ->getMock()
+ );
+ }
+
private function resetMockObjects()
{
$refl = new ReflectionObject($this);
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
new file mode 100644
index 00000000000..87576cad6e0
--- /dev/null
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
@@ -0,0 +1,15 @@
+ $value) {
+ $this->{$key} = $value;
+ }
+ }
+}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
new file mode 100644
index 00000000000..0c13c120fae
--- /dev/null
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
@@ -0,0 +1,7 @@
+ '/_fixture/AnInterface.php',
'anotherinterface' => '/_fixture/AnotherInterface.php',
'bar' => '/_fixture/Bar.php',
+ 'classthatimplementsserializable' => '/_files/ClassThatImplementsSerializable.php',
+ 'classwithstaticmethod' => '/_files/ClassWithStaticMethod.php',
'foo' => '/_fixture/Foo.php',
'framework_mockbuildertest' => '/MockBuilderTest.php',
'framework_mockobject_generatortest' => '/GeneratorTest.php',
'framework_mockobject_invocation_objecttest' => '/MockObject/Invocation/ObjectTest.php',
'framework_mockobject_invocation_statictest' => '/MockObject/Invocation/StaticTest.php',
+ 'framework_mockobject_matcher_consecutiveparameterstest' => '/MockObject/Matcher/ConsecutiveParametersTest.php',
'framework_mockobjecttest' => '/MockObjectTest.php',
'framework_proxyobjecttest' => '/ProxyObjectTest.php',
'interfacewithstaticmethod' => '/_fixture/InterfaceWithStaticMethod.php',
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
index 9f90b5b1336..39a9c12aa0c 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
@@ -2,3 +2,4 @@
require __DIR__ . '/autoload.php';
require __DIR__ . '/_fixture/FunctionCallback.php';
require __DIR__ . '/../vendor/autoload.php';
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/.travis.yml b/framework/Test/bundle/vendor/phpunit/phpunit/.travis.yml
index b97200e7aad..dcc1f09e369 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/.travis.yml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/.travis.yml
@@ -22,3 +22,4 @@ notifications:
on_success: always
on_failure: always
on_start: false
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/README.md b/framework/Test/bundle/vendor/phpunit/phpunit/README.md
index 411f7fcdef7..6c6aaf1e073 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/README.md
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/README.md
@@ -38,3 +38,4 @@ Thanks to everyone who has contributed to PHPUnit! You can find a detailed list
A very special thanks to everyone who has contributed to the documentation and helps maintaining the translations:
* [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/build.xml b/framework/Test/bundle/vendor/phpunit/phpunit/build.xml
index 68e03b90906..176d07a183b 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/build.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/build.xml
@@ -55,14 +55,6 @@
-
-
-
-
-
-
-
-
@@ -336,3 +328,4 @@
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/build/phar-manifest.php b/framework/Test/bundle/vendor/phpunit/phpunit/build/phar-manifest.php
index 474686bb425..50608fb4f9b 100755
--- a/framework/Test/bundle/vendor/phpunit/phpunit/build/phar-manifest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/build/phar-manifest.php
@@ -25,3 +25,4 @@
print "\n";
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/build/travis-ci.xml b/framework/Test/bundle/vendor/phpunit/phpunit/build/travis-ci.xml
index eb9b8436e91..bf237feceac 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/build/travis-ci.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/build/travis-ci.xml
@@ -22,3 +22,4 @@
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/composer.json b/framework/Test/bundle/vendor/phpunit/phpunit/composer.json
index cccfb40d40f..bf04caf5b97 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/composer.json
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/composer.json
@@ -53,6 +53,15 @@
"src/"
]
},
+ "autoload-dev": {
+ "classmap": [
+ "tests/"
+ ],
+ "files": [
+ "src/Framework/Assert/Functions.php",
+ "tests/_files/CoveredFunction.php"
+ ]
+ },
"extra": {
"branch-alias": {
"dev-master": "4.1.x-dev"
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/phpdox.xml.dist b/framework/Test/bundle/vendor/phpunit/phpunit/phpdox.xml.dist
index f312fa743fe..e77645e04b6 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/phpdox.xml.dist
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/phpdox.xml.dist
@@ -20,3 +20,4 @@
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/phpunit.xml.dist b/framework/Test/bundle/vendor/phpunit/phpunit/phpunit.xml.dist
index 5fdc432253a..50966d7cb69 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/phpunit.xml.dist
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/phpunit.xml.dist
@@ -35,3 +35,4 @@
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/src/Runner/Version.php b/framework/Test/bundle/vendor/phpunit/phpunit/src/Runner/Version.php
index 5fca1997146..4a07746e95a 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/src/Runner/Version.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -71,7 +71,7 @@ public static function id()
}
if (self::$version === null) {
- $version = new SebastianBergmann\Version('4.1.1', dirname(dirname(__DIR__)));
+ $version = new SebastianBergmann\Version('4.1.3', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-5.6.phpt b/framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
similarity index 81%
rename from framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-5.6.phpt
rename to framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
index c52021227b9..dce85c2bd8e 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-5.6.phpt
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
@@ -2,7 +2,10 @@
phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
--SKIPIF--
=')) print 'skip: PHP >= 5.6.0beta2 required';
+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', '>=')) || defined('HHVM_VERSION'))
+ print "skip: PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ required";
?>
--FILE--
= 5.4.0 && < 5.6.0 required';
+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', '<=')) ||
+ defined('HHVM_VERSION')))
+ print "skip: PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM required";
?>
--FILE--
publicMethod();
}
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
index d1be1c6cf06..7f67f4b358c 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
+++ b/framework/Test/bundle/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/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
index 45f583b7777..d3d48efbd22 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -13,3 +13,4 @@ public function testSomething()
$o->publicMethod();
}
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
index b336745460a..79d1010d35d 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -18,3 +18,4 @@ public function testSomething()
$o->publicMethod();
}
}
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
index 6c1e224b739..537603e8f83 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
@@ -21,3 +21,5 @@ public function testMethod()
}
}
+
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
index c0b9d5621f1..76355c27949 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
@@ -133,8 +133,8 @@ public function testAlwaysSkip3()
}
/**
- * @requires extension spl
- * @requires OS .*
+ * @requires extension spl
+ * @requires OS .*
*/
public function testSpace()
{
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration.xml b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration.xml
index 4fa4c41036e..32e232c49c9 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration.xml
@@ -114,3 +114,4 @@
timeout="30000"/>
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
index cf559cd4ced..902706c3415 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
@@ -66,3 +66,4 @@
parse="xml"
xpointer="xpointer(/phpunit/selenium)" />
+
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/autoload.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/autoload.php
deleted file mode 100644
index ee0f7c5e905..00000000000
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/autoload.php
+++ /dev/null
@@ -1,162 +0,0 @@
- '/_files/AbstractTest.php',
- 'author' => '/_files/Author.php',
- 'bankaccount' => '/_files/BankAccount.php',
- 'bankaccountexception' => '/_files/BankAccount.php',
- 'bankaccounttest' => '/_files/BankAccountTest.php',
- 'bankaccountwithcustomextensiontest' => '/_files/BankAccountTest.test.php',
- 'basetestlistenersample' => '/_files/BaseTestListenerSample.php',
- 'beforeandaftertest' => '/_files/BeforeAndAfterTest.php',
- 'beforeclassandafterclasstest' => '/_files/BeforeClassAndAfterClassTest.php',
- 'book' => '/_files/Book.php',
- 'calculator' => '/_files/Calculator.php',
- 'changecurrentworkingdirectorytest' => '/_files/ChangeCurrentWorkingDirectoryTest.php',
- 'childsuite' => '/Regression/783/ChildSuite.php',
- 'classwithnonpublicattributes' => '/_files/ClassWithNonPublicAttributes.php',
- 'classwithtostring' => '/_files/ClassWithToString.php',
- 'concretetest' => '/_files/ConcreteTest.php',
- 'concretewithmycustomextensiontest' => '/_files/ConcreteTest.my.php',
- 'coverageclassextendedtest' => '/_files/CoverageClassExtendedTest.php',
- 'coverageclasstest' => '/_files/CoverageClassTest.php',
- 'coveragefunctionparenthesestest' => '/_files/CoverageFunctionParenthesesTest.php',
- 'coveragefunctionparentheseswhitespacetest' => '/_files/CoverageFunctionParenthesesWhitespaceTest.php',
- 'coveragefunctiontest' => '/_files/CoverageFunctionTest.php',
- 'coveragemethodonelineannotationtest' => '/_files/CoverageMethodOneLineAnnotationTest.php',
- 'coveragemethodparenthesestest' => '/_files/CoverageMethodParenthesesTest.php',
- 'coveragemethodparentheseswhitespacetest' => '/_files/CoverageMethodParenthesesWhitespaceTest.php',
- 'coveragemethodtest' => '/_files/CoverageMethodTest.php',
- 'coveragenonetest' => '/_files/CoverageNoneTest.php',
- 'coveragenothingtest' => '/_files/CoverageNothingTest.php',
- 'coveragenotprivatetest' => '/_files/CoverageNotPrivateTest.php',
- 'coveragenotprotectedtest' => '/_files/CoverageNotProtectedTest.php',
- 'coveragenotpublictest' => '/_files/CoverageNotPublicTest.php',
- 'coverageprivatetest' => '/_files/CoveragePrivateTest.php',
- 'coverageprotectedtest' => '/_files/CoverageProtectedTest.php',
- 'coveragepublictest' => '/_files/CoveragePublicTest.php',
- 'coveragetwodefaultclassannotations' => '/_files/CoverageTwoDefaultClassAnnotations.php',
- 'coveredclass' => '/_files/CoveredClass.php',
- 'coveredparentclass' => '/_files/CoveredClass.php',
- 'customprinter' => '/_files/CustomPrinter.php',
- 'dataproviderfiltertest' => '/_files/DataProviderFilterTest.php',
- 'dataprovidertest' => '/_files/DataProviderTest.php',
- 'dependencyfailuretest' => '/_files/DependencyFailureTest.php',
- 'dependencysuccesstest' => '/_files/DependencySuccessTest.php',
- 'dependencytestsuite' => '/_files/DependencyTestSuite.php',
- 'doubletestcase' => '/_files/DoubleTestCase.php',
- 'dummyexception' => '/_files/DummyException.php',
- 'emptytestcasetest' => '/_files/EmptyTestCaseTest.php',
- 'error' => '/_files/Error.php',
- 'exceptioninassertpostconditionstest' => '/_files/ExceptionInAssertPostConditionsTest.php',
- 'exceptioninassertpreconditionstest' => '/_files/ExceptionInAssertPreConditionsTest.php',
- 'exceptioninsetuptest' => '/_files/ExceptionInSetUpTest.php',
- 'exceptioninteardowntest' => '/_files/ExceptionInTearDownTest.php',
- 'exceptionintest' => '/_files/ExceptionInTest.php',
- 'exceptionstacktest' => '/_files/ExceptionStack.php',
- 'exceptionstacktestexception' => '/_files/ExceptionStack.php',
- 'exceptiontest' => '/_files/ExceptionTest.php',
- 'extensions_repeatedtesttest' => '/Extensions/RepeatedTestTest.php',
- 'failure' => '/_files/Failure.php',
- 'failuretest' => '/_files/FailureTest.php',
- 'fataltest' => '/_files/FatalTest.php',
- 'foo\\coveredclass' => '/_files/NamespaceCoveredClass.php',
- 'foo\\coveredparentclass' => '/_files/NamespaceCoveredClass.php',
- 'foo_bar_issue684test' => '/Regression/684/Issue684Test.php',
- 'framework_assert_functionstest' => '/Framework/Assert/FunctionsTest.php',
- 'framework_asserttest' => '/Framework/AssertTest.php',
- 'framework_basetestlistenertest' => '/Framework/BaseTestListenerTest.php',
- 'framework_comparatortest' => '/Framework/ComparatorTest.php',
- 'framework_constraint_jsonmatches_errormessageprovidertest' => '/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php',
- 'framework_constraint_jsonmatchestest' => '/Framework/Constraint/JsonMatchesTest.php',
- 'framework_constrainttest' => '/Framework/ConstraintTest.php',
- 'framework_suitetest' => '/Framework/SuiteTest.php',
- 'framework_testcasetest' => '/Framework/TestCaseTest.php',
- 'framework_testfailuretest' => '/Framework/TestFailureTest.php',
- 'framework_testimplementortest' => '/Framework/TestImplementorTest.php',
- 'framework_testlistenertest' => '/Framework/TestListenerTest.php',
- 'incompletetest' => '/_files/IncompleteTest.php',
- 'inheritedtestcase' => '/_files/InheritedTestCase.php',
- 'initest' => '/_files/IniTest.php',
- 'issue1021test' => '/Regression/1021/Issue1021Test.php',
- 'issue244exception' => '/Regression/GitHub/244/Issue244Test.php',
- 'issue244exceptionintcode' => '/Regression/GitHub/244/Issue244Test.php',
- 'issue244test' => '/Regression/GitHub/244/Issue244Test.php',
- 'issue322test' => '/Regression/GitHub/322/Issue322Test.php',
- 'issue433test' => '/Regression/GitHub/433/Issue433Test.php',
- 'issue445test' => '/Regression/GitHub/445/Issue445Test.php',
- 'issue498test' => '/Regression/GitHub/498/Issue498Test.php',
- 'issue503test' => '/Regression/GitHub/503/Issue503Test.php',
- 'issue523' => '/Regression/523/Issue523Test.php',
- 'issue523test' => '/Regression/523/Issue523Test.php',
- 'issue578test' => '/Regression/578/Issue578Test.php',
- 'issue581test' => '/Regression/GitHub/581/Issue581Test.php',
- 'issue74test' => '/Regression/GitHub/74/Issue74Test.php',
- 'issue765test' => '/Regression/GitHub/765/Issue765Test.php',
- 'mockrunner' => '/_files/MockRunner.php',
- 'multidependencytest' => '/_files/MultiDependencyTest.php',
- 'my\\space\\exceptionnamespacetest' => '/_files/ExceptionNamespaceTest.php',
- 'namespacecoverageclassextendedtest' => '/_files/NamespaceCoverageClassExtendedTest.php',
- 'namespacecoverageclasstest' => '/_files/NamespaceCoverageClassTest.php',
- 'namespacecoveragecoversclasspublictest' => '/_files/NamespaceCoverageCoversClassPublicTest.php',
- 'namespacecoveragecoversclasstest' => '/_files/NamespaceCoverageCoversClassTest.php',
- 'namespacecoveragemethodtest' => '/_files/NamespaceCoverageMethodTest.php',
- 'namespacecoveragenotprivatetest' => '/_files/NamespaceCoverageNotPrivateTest.php',
- 'namespacecoveragenotprotectedtest' => '/_files/NamespaceCoverageNotProtectedTest.php',
- 'namespacecoveragenotpublictest' => '/_files/NamespaceCoverageNotPublicTest.php',
- 'namespacecoverageprivatetest' => '/_files/NamespaceCoveragePrivateTest.php',
- 'namespacecoverageprotectedtest' => '/_files/NamespaceCoverageProtectedTest.php',
- 'namespacecoveragepublictest' => '/_files/NamespaceCoveragePublicTest.php',
- 'newexception' => '/Regression/GitHub/74/NewException.php',
- 'noargtestcasetest' => '/_files/NoArgTestCaseTest.php',
- 'nonstatic' => '/_files/NonStatic.php',
- 'notestcaseclass' => '/_files/NoTestCaseClass.php',
- 'notestcases' => '/_files/NoTestCases.php',
- 'notexistingcoveredelementtest' => '/_files/NotExistingCoveredElementTest.php',
- 'nothingtest' => '/_files/NothingTest.php',
- 'notpublictestcase' => '/_files/NotPublicTestCase.php',
- 'notvoidtestcase' => '/_files/NotVoidTestCase.php',
- 'onetest' => '/Regression/783/OneTest.php',
- 'onetestcase' => '/_files/OneTestCase.php',
- 'outputtestcase' => '/_files/OutputTestCase.php',
- 'overridetestcase' => '/_files/OverrideTestCase.php',
- 'parentclasswithprivateattributes' => '/_files/ClassWithNonPublicAttributes.php',
- 'parentclasswithprotectedattributes' => '/_files/ClassWithNonPublicAttributes.php',
- 'parentsuite' => '/Regression/783/ParentSuite.php',
- 'requirementsclassdocblocktest' => '/_files/RequirementsClassDocBlockTest.php',
- 'requirementstest' => '/_files/RequirementsTest.php',
- 'runner_basetestrunnertest' => '/Runner/BaseTestRunnerTest.php',
- 'samplearrayaccess' => '/_files/SampleArrayAccess.php',
- 'sampleclass' => '/_files/SampleClass.php',
- 'singleton' => '/_files/Singleton.php',
- 'stacktest' => '/_files/StackTest.php',
- 'struct' => '/_files/Struct.php',
- 'success' => '/_files/Success.php',
- 'templatemethodstest' => '/_files/TemplateMethodsTest.php',
- 'testclass' => '/Framework/ComparatorTest.php',
- 'testclasscomparator' => '/Framework/ComparatorTest.php',
- 'testiterator' => '/_files/TestIterator.php',
- 'testiterator2' => '/_files/TestIterator2.php',
- 'throwexceptiontestcase' => '/_files/ThrowExceptionTestCase.php',
- 'thrownoexceptiontestcase' => '/_files/ThrowNoExceptionTestCase.php',
- 'twotest' => '/Regression/783/TwoTest.php',
- 'util_configurationtest' => '/Util/ConfigurationTest.php',
- 'util_testdox_nameprettifiertest' => '/Util/TestDox/NamePrettifierTest.php',
- 'util_testtest' => '/Util/TestTest.php',
- 'util_xmltest' => '/Util/XMLTest.php',
- 'wasrun' => '/_files/WasRun.php'
- );
- }
- $cn = strtolower($class);
- if (isset($classes[$cn])) {
- require __DIR__ . $classes[$cn];
- }
- }
-);
-// @codeCoverageIgnoreEnd
diff --git a/framework/Test/bundle/vendor/phpunit/phpunit/tests/bootstrap-travis.php b/framework/Test/bundle/vendor/phpunit/phpunit/tests/bootstrap-travis.php
index 6fb886dc634..bce48187774 100644
--- a/framework/Test/bundle/vendor/phpunit/phpunit/tests/bootstrap-travis.php
+++ b/framework/Test/bundle/vendor/phpunit/phpunit/tests/bootstrap-travis.php
@@ -1,7 +1,4 @@
jan@horde.org
yes
- 2014-05-06
+ 2014-06-17
2.4.2
2.3.0
@@ -27,7 +27,7 @@
LGPL-2.1
-*
+* [jan] Update to PHPUnit 4.1.3.
@@ -673,8 +673,8 @@
-
-
+
+
@@ -814,7 +814,6 @@
-
@@ -846,11 +845,17 @@
+
+
+
+
+
+
@@ -884,7 +889,6 @@
-
@@ -934,6 +938,10 @@
+
+
+
+
@@ -1631,7 +1639,6 @@
-
@@ -1736,8 +1743,8 @@
-
-
+
+
@@ -1877,7 +1884,6 @@
-
@@ -1894,10 +1900,14 @@
+
+
+
+
@@ -1960,6 +1970,8 @@
+
+
@@ -2513,10 +2525,10 @@
stable
stable
- 2014-05-06
+ 2014-06-17
LGPL-2.1
-*
+* [jan] Update to PHPUnit 4.1.3.