[jan] Update to PHPUnit 4.1.3.

horde · Jun 17, 2014 · 7fbc34f · 7fbc34f
1 parent a236c31
commit 7fbc34f
Show file tree

Hide file tree

Showing 50 changed files with 440 additions and 379 deletions.
diff --git a/framework/Test/bundle/composer.lock b/framework/Test/bundle/composer.lock
diff --git 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
@@ -78,14 +78,15 @@
     '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',
     'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php',
     '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
@@ -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
@@ -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
@@ -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
@@ -1,25 +1,29 @@
 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:
     - php: hhvm
 
 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
@@ -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
@@ -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
@@ -47,3 +47,4 @@
   </exec>
  </target>
 </project>
+
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
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          bootstrap="../tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite name="PHPUnit Mock Objects">
-      <directory suffix="Test.php">../tests</directory>
-      <directory suffix=".phpt">../tests</directory>
-    </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-text" target="php://stdout"/>
-  </logging>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../src</directory>
-    </whitelist>
-  </filter>
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="PHPUnit Mock Objects">
+    <directory suffix="Test.php">../tests</directory>
+    <directory suffix=".phpt">../tests</directory>
+  </testsuite>
 </phpunit>
+
diff --git 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 @@
         ""
     ]
 }
+