[jan] Update to PHPUnit 4.3.4 and dependencies.

horde · Oct 27, 2014 · 0dc68e3 · 0dc68e3
1 parent a2c7e0b
commit 0dc68e3
Show file tree

Hide file tree

Showing 368 changed files with 11,308 additions and 6,463 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 ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4::getLoader();
+return ComposerAutoloaderInitf180ee719060005281a8135d67e94a99::getLoader();
diff --git a/framework/Test/bundle/vendor/composer/ClassLoader.php b/framework/Test/bundle/vendor/composer/ClassLoader.php
@@ -143,6 +143,8 @@ public function add($prefix, $paths, $prepend = false)
      * @param string       $prefix  The prefix/namespace, with trailing '\\'
      * @param array|string $paths   The PSR-0 base directories
      * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -202,10 +204,13 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
      */
-    public function setPsr4($prefix, $paths) {
+    public function setPsr4($prefix, $paths)
+    {
         if (!$prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {

diff --git a/framework/Test/bundle/vendor/composer/autoload_classmap.php b/framework/Test/bundle/vendor/composer/autoload_classmap.php
diff --git a/framework/Test/bundle/vendor/composer/autoload_namespaces.php b/framework/Test/bundle/vendor/composer/autoload_namespaces.php
@@ -7,4 +7,5 @@
 
 return array(
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+    'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src'),
 );
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 ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4
+class ComposerAutoloaderInitf180ee719060005281a8135d67e94a99
 {
     private static $loader;
 
@@ -19,12 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitf180ee719060005281a8135d67e94a99', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit520d2c71c384feed8a11e5e8d4a97ca4', 'loadClassLoader'));
-
-        $vendorDir = dirname(__DIR__);
-        $baseDir = dirname($vendorDir);
+        spl_autoload_unregister(array('ComposerAutoloaderInitf180ee719060005281a8135d67e94a99', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -51,7 +48,7 @@ public static function getLoader()
     }
 }
 
-function composerRequire520d2c71c384feed8a11e5e8d4a97ca4($file)
+function composerRequiref180ee719060005281a8135d67e94a99($file)
 {
     require $file;
 }
diff --git a/framework/Test/bundle/vendor/composer/include_paths.php b/framework/Test/bundle/vendor/composer/include_paths.php
@@ -8,11 +8,9 @@
 return array(
     $vendorDir . '/phpunit/php-text-template',
     $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',
 );