diff --git a/composer.lock b/composer.lock
index f85fc2cf12d1eb7c2fb356a1420442c6b94ce6cd..01405e136314fc9a86141d09f7d95208fbe5a2a9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -774,16 +774,16 @@
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.3.3",
+ "version": "1.3.4",
"source": {
"type": "git",
- "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "1.3.3"
+ "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+ "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
},
"dist": {
"type": "zip",
- "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
- "reference": "1.3.3",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+ "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
"shasum": ""
},
"require": {
@@ -810,12 +810,12 @@
}
],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
"keywords": [
"filesystem",
"iterator"
],
- "time": "2012-10-11 04:44:38"
+ "time": "2013-10-10 15:34:57"
},
{
"name": "phpunit/php-text-template",
diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php
index b5fc8225880696f9e0dbd565ac60b8aea706c5fd..e934391d21027eab20f72131e2910f703280c537 100644
--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
@@ -1,7 +1,7 @@
<?php
-// autoload.php generated by Composer
+// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit2f086fd5a6ac4778e93c60384b7d424a::getLoader();
+return ComposerAutoloaderInitdcdeef3a2347836a4b3309cb54064cf9::getLoader();
diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php
index bcf980915da5d5a3dc4ef2370efab8f7d165c9fd..1db8d9a0b2e2207309eb93e83ab8ab4736fd4ab2 100644
--- a/core/vendor/composer/ClassLoader.php
+++ b/core/vendor/composer/ClassLoader.php
@@ -49,7 +49,7 @@ class ClassLoader
public function getPrefixes()
{
- return $this->prefixes;
+ return call_user_func_array('array_merge', $this->prefixes);
}
public function getFallbackDirs()
@@ -98,19 +98,21 @@ public function add($prefix, $paths, $prepend = false)
return;
}
- if (!isset($this->prefixes[$prefix])) {
- $this->prefixes[$prefix] = (array) $paths;
+
+ $first = $prefix[0];
+ if (!isset($this->prefixes[$first][$prefix])) {
+ $this->prefixes[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
- $this->prefixes[$prefix] = array_merge(
+ $this->prefixes[$first][$prefix] = array_merge(
(array) $paths,
- $this->prefixes[$prefix]
+ $this->prefixes[$first][$prefix]
);
} else {
- $this->prefixes[$prefix] = array_merge(
- $this->prefixes[$prefix],
+ $this->prefixes[$first][$prefix] = array_merge(
+ $this->prefixes[$first][$prefix],
(array) $paths
);
}
@@ -119,8 +121,8 @@ public function add($prefix, $paths, $prepend = false)
/**
* Registers a set of classes, replacing any others previously set.
*
- * @param string $prefix The classes prefix
- * @param array|string $paths The location(s) of the classes
+ * @param string $prefix The classes prefix
+ * @param array|string $paths The location(s) of the classes
*/
public function set($prefix, $paths)
{
@@ -129,7 +131,7 @@ public function set($prefix, $paths)
return;
}
- $this->prefixes[$prefix] = (array) $paths;
+ $this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
}
/**
@@ -195,6 +197,7 @@ public function loadClass($class)
*/
public function findFile($class)
{
+ // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
if ('\\' == $class[0]) {
$class = substr($class, 1);
}
@@ -205,7 +208,7 @@ public function findFile($class)
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
- $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+ $classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
@@ -213,13 +216,16 @@ public function findFile($class)
$className = $class;
}
- $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+ $classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
- foreach ($this->prefixes as $prefix => $dirs) {
- if (0 === strpos($class, $prefix)) {
- foreach ($dirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ $first = $class[0];
+ if (isset($this->prefixes[$first])) {
+ foreach ($this->prefixes[$first] as $prefix => $dirs) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($dirs as $dir) {
+ if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
+ return $dir . DIRECTORY_SEPARATOR . $classPath;
+ }
}
}
}
diff --git a/core/vendor/composer/autoload_classmap.php b/core/vendor/composer/autoload_classmap.php
index fe65adea6b374fb1f149242402532da3f7cf38d2..96f77f2d4929111dccd0f8fc4fc9a5820570d72f 100644
--- a/core/vendor/composer/autoload_classmap.php
+++ b/core/vendor/composer/autoload_classmap.php
@@ -1,6 +1,6 @@
<?php
-// autoload_classmap.php generated by Composer
+// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir));
diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php
index 24be466c45fb738c08c8fa55503188ee0d27b612..f6dbb7cc1c34109b40d28fe9e88a9cd3ab57d045 100644
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -1,43 +1,43 @@
<?php
-// autoload_namespaces.php generated by Composer
+// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir));
return array(
- 'Zend\\Stdlib\\' => $vendorDir . '/zendframework/zend-stdlib',
- 'Zend\\Feed\\' => $vendorDir . '/zendframework/zend-feed',
- 'Zend\\Escaper\\' => $vendorDir . '/zendframework/zend-escaper',
- 'Twig_' => $vendorDir . '/twig/twig/lib',
- 'Symfony\\Component\\Yaml\\' => $vendorDir . '/symfony/yaml',
- 'Symfony\\Component\\Validator\\' => $vendorDir . '/symfony/validator',
- 'Symfony\\Component\\Translation\\' => $vendorDir . '/symfony/translation',
- 'Symfony\\Component\\Serializer\\' => $vendorDir . '/symfony/serializer',
- 'Symfony\\Component\\Routing\\' => $vendorDir . '/symfony/routing',
- 'Symfony\\Component\\Process\\' => $vendorDir . '/symfony/process',
- 'Symfony\\Component\\HttpKernel\\' => $vendorDir . '/symfony/http-kernel',
- 'Symfony\\Component\\HttpFoundation\\' => $vendorDir . '/symfony/http-foundation',
- 'Symfony\\Component\\EventDispatcher\\' => $vendorDir . '/symfony/event-dispatcher',
- 'Symfony\\Component\\DependencyInjection\\' => $vendorDir . '/symfony/dependency-injection',
- 'Symfony\\Component\\Debug\\' => $vendorDir . '/symfony/debug',
- 'Symfony\\Component\\ClassLoader\\' => $vendorDir . '/symfony/class-loader',
- 'Symfony\\Cmf\\Component\\Routing' => $vendorDir . '/symfony-cmf/routing',
- 'Psr\\Log\\' => $vendorDir . '/psr/log',
- 'Guzzle\\Stream' => $vendorDir . '/guzzle/stream',
- 'Guzzle\\Parser' => $vendorDir . '/guzzle/parser',
- 'Guzzle\\Http' => $vendorDir . '/guzzle/http',
- 'Guzzle\\Common' => $vendorDir . '/guzzle/common',
- 'Gliph' => $vendorDir . '/sdboyer/gliph/src',
- 'EasyRdf_' => $vendorDir . '/easyrdf/easyrdf/lib',
- 'Drupal\\Driver' => $baseDir . '/drivers/lib',
- 'Drupal\\Core' => $baseDir . '/core/lib',
- 'Drupal\\Component' => $baseDir . '/core/lib',
- 'Doctrine\\Common\\Lexer\\' => $vendorDir . '/doctrine/lexer/lib',
- 'Doctrine\\Common\\Inflector\\' => $vendorDir . '/doctrine/inflector/lib',
- 'Doctrine\\Common\\Collections\\' => $vendorDir . '/doctrine/collections/lib',
- 'Doctrine\\Common\\Cache\\' => $vendorDir . '/doctrine/cache/lib',
- 'Doctrine\\Common\\Annotations\\' => $vendorDir . '/doctrine/annotations/lib',
- 'Doctrine\\Common\\' => $vendorDir . '/doctrine/common/lib',
- 'Assetic' => $vendorDir . '/kriswallsmith/assetic/src',
+ 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib'),
+ 'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed'),
+ 'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper'),
+ 'Twig_' => array($vendorDir . '/twig/twig/lib'),
+ 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+ 'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
+ 'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
+ 'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
+ 'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
+ 'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
+ 'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
+ 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
+ 'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
+ 'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
+ 'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
+ 'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
+ 'Symfony\\Cmf\\Component\\Routing' => array($vendorDir . '/symfony-cmf/routing'),
+ 'Psr\\Log\\' => array($vendorDir . '/psr/log'),
+ 'Guzzle\\Stream' => array($vendorDir . '/guzzle/stream'),
+ 'Guzzle\\Parser' => array($vendorDir . '/guzzle/parser'),
+ 'Guzzle\\Http' => array($vendorDir . '/guzzle/http'),
+ 'Guzzle\\Common' => array($vendorDir . '/guzzle/common'),
+ 'Gliph' => array($vendorDir . '/sdboyer/gliph/src'),
+ 'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
+ 'Drupal\\Driver' => array($baseDir . '/drivers/lib'),
+ 'Drupal\\Core' => array($baseDir . '/core/lib'),
+ 'Drupal\\Component' => array($baseDir . '/core/lib'),
+ 'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
+ 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
+ 'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
+ 'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'),
+ 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
+ 'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
+ 'Assetic' => array($vendorDir . '/kriswallsmith/assetic/src'),
);
diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php
index 31fbf8d035cd1c181b61a8e10d1dc90ceafda031..34e0d191d340de98648bf4022536a216e03b3566 100644
--- a/core/vendor/composer/autoload_real.php
+++ b/core/vendor/composer/autoload_real.php
@@ -1,8 +1,8 @@
<?php
-// autoload_real.php generated by Composer
+// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit2f086fd5a6ac4778e93c60384b7d424a
+class ComposerAutoloaderInitdcdeef3a2347836a4b3309cb54064cf9
{
private static $loader;
@@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit2f086fd5a6ac4778e93c60384b7d424a', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitdcdeef3a2347836a4b3309cb54064cf9', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit2f086fd5a6ac4778e93c60384b7d424a', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitdcdeef3a2347836a4b3309cb54064cf9', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname(dirname($vendorDir));
@@ -32,7 +32,7 @@ public static function getLoader()
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
- $loader->add($namespace, $path);
+ $loader->set($namespace, $path);
}
$classMap = require __DIR__ . '/autoload_classmap.php';
@@ -42,8 +42,10 @@ public static function getLoader()
$loader->register(true);
- require $vendorDir . '/kriswallsmith/assetic/src/functions.php';
- require $baseDir . '/core/lib/Drupal.php';
+ $includeFiles = require __DIR__ . '/autoload_files.php';
+ foreach ($includeFiles as $file) {
+ require $file;
+ }
return $loader;
}
diff --git a/core/vendor/composer/include_paths.php b/core/vendor/composer/include_paths.php
index 66f70988d77dd9babc082acaf466338a020ed6fd..79db17e1ac599978e9a39287c609a80846bd6a24 100644
--- a/core/vendor/composer/include_paths.php
+++ b/core/vendor/composer/include_paths.php
@@ -1,6 +1,6 @@
<?php
-// include_paths.php generated by Composer
+// include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir));
@@ -10,8 +10,8 @@
$vendorDir . '/phpunit/phpunit-mock-objects',
$vendorDir . '/phpunit/php-timer',
$vendorDir . '/phpunit/php-token-stream',
- $vendorDir . '/phpunit/php-file-iterator',
$vendorDir . '/phpunit/php-code-coverage',
$vendorDir . '/phpunit/phpunit',
$vendorDir . '/symfony/yaml',
+ $vendorDir . '/phpunit/php-file-iterator',
);
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index ed258f02b05b83ac69dd3ab4bc5a416d610dab0c..f7cd26a4445ea45209ef4149e494c3aba02ab560 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -409,53 +409,6 @@
"tokenizer"
]
},
- {
- "name": "phpunit/php-file-iterator",
- "version": "1.3.3",
- "version_normalized": "1.3.3.0",
- "source": {
- "type": "git",
- "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "1.3.3"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
- "reference": "1.3.3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2012-10-11 04:44:38",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "File/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "http://www.phpunit.de/",
- "keywords": [
- "filesystem",
- "iterator"
- ]
- },
{
"name": "phpunit/php-code-coverage",
"version": "1.2.11",
@@ -2115,5 +2068,52 @@
"database",
"routing"
]
+ },
+ {
+ "name": "phpunit/php-file-iterator",
+ "version": "1.3.4",
+ "version_normalized": "1.3.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+ "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+ "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2013-10-10 15:34:57",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "File/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "include-path": [
+ ""
+ ],
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sb@sebastian-bergmann.de",
+ "role": "lead"
+ }
+ ],
+ "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+ "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+ "keywords": [
+ "filesystem",
+ "iterator"
+ ]
}
]
diff --git a/core/vendor/phpunit/php-file-iterator/ChangeLog.markdown b/core/vendor/phpunit/php-file-iterator/ChangeLog.markdown
index 06593b095256c6014558be6db61d376dbc319cad..fd9ed1bfe5e780cf024b72d48f497ef847c1990c 100644
--- a/core/vendor/phpunit/php-file-iterator/ChangeLog.markdown
+++ b/core/vendor/phpunit/php-file-iterator/ChangeLog.markdown
@@ -3,6 +3,11 @@ File_Iterator 1.3
This is the list of changes for the File_Iterator 1.3 release series.
+File_Iterator 1.3.4
+-------------------
+
+* Symlinks are now followed.
+
File_Iterator 1.3.3
-------------------
diff --git a/core/vendor/phpunit/php-file-iterator/File/Iterator.php b/core/vendor/phpunit/php-file-iterator/File/Iterator.php
index 73f19b974ec6e427bb98b3f792d97ad83d60b9b3..f898ef51a55b9f3442880dc758f404fda1bd68cd 100644
--- a/core/vendor/phpunit/php-file-iterator/File/Iterator.php
+++ b/core/vendor/phpunit/php-file-iterator/File/Iterator.php
@@ -2,7 +2,7 @@
/**
* php-file-iterator
*
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package File
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @since File available since Release 1.0.0
*/
@@ -45,8 +45,8 @@
* FilterIterator implementation that filters files based on prefix(es) and/or
* suffix(es). Hidden files and files from hidden directories are also filtered.
*
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @version Release: @package_version@
* @link http://github.com/sebastianbergmann/php-file-iterator/tree
diff --git a/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php b/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
index fcb21059982b6aad6f9969e19052dda8c4234b21..5a8c01aa68c32144a599049971a7d90c803b6a0d 100644
--- a/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
+++ b/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php
@@ -2,7 +2,7 @@
/**
* php-file-iterator
*
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package File
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @since File available since Release 1.3.0
*/
diff --git a/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in b/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
index 20d58b9461254a3ac7608afab526d92fcf77474d..56da6c145a931d3772ac009539533bd9e0617804 100644
--- a/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
+++ b/core/vendor/phpunit/php-file-iterator/File/Iterator/Autoload.php.in
@@ -2,7 +2,7 @@
/**
* php-file-iterator
*
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
*
* @package File
* @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @since File available since Release 1.3.0
*/
diff --git a/core/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php b/core/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
index d30283e94b501d29f3786c84a3c6c8f7330be58a..2b846d09df505eada7ea8ea8dcf1f2682a8eea79 100644
--- a/core/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
+++ b/core/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php
@@ -2,7 +2,7 @@
/**
* php-file-iterator
*
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package File
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @since File available since Release 1.3.0
*/
@@ -47,8 +47,8 @@
* RecursiveDirectoryIterator for each given path. The list of unique
* files is returned as an array.
*
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @version Release: @package_version@
* @link http://github.com/sebastianbergmann/php-file-iterator/tree
diff --git a/core/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php b/core/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
index 47a50ae7b3e55be77d1eb1747c6bc5ba2d3738c2..3c0166e0801320afaef3284d7d9f392ad6746710 100644
--- a/core/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
+++ b/core/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php
@@ -2,7 +2,7 @@
/**
* php-file-iterator
*
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @package File
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @since File available since Release 1.1.0
*/
@@ -46,8 +46,8 @@
* an AppendIterator that contains an RecursiveDirectoryIterator for each given
* path.
*
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
* @version Release: @package_version@
* @link http://github.com/sebastianbergmann/php-file-iterator/tree
@@ -104,7 +104,7 @@ public function getFileIterator($paths, $suffixes = '', $prefixes = '', array $e
$iterator->append(
new File_Iterator(
new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator($path)
+ new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::FOLLOW_SYMLINKS)
),
$suffixes,
$prefixes,
diff --git a/core/vendor/phpunit/php-file-iterator/LICENSE b/core/vendor/phpunit/php-file-iterator/LICENSE
index 58c57434ee02624fb9254a0b6c832474795317e3..c392d412c4ebad46dd57b76a2e2a0d83819a1cb1 100644
--- a/core/vendor/phpunit/php-file-iterator/LICENSE
+++ b/core/vendor/phpunit/php-file-iterator/LICENSE
@@ -1,6 +1,6 @@
File_Iterator
-Copyright (c) 2009-2012, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2009-2013, 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/php-file-iterator/composer.json b/core/vendor/phpunit/php-file-iterator/composer.json
index aab32bce25bab7a914c4588c5820842f4205d7ca..1ddd5b88bb67862e20963cc1d0ae1ef1b531b70b 100644
--- a/core/vendor/phpunit/php-file-iterator/composer.json
+++ b/core/vendor/phpunit/php-file-iterator/composer.json
@@ -6,7 +6,7 @@
"iterator",
"filesystem"
],
- "homepage": "http://www.phpunit.de/",
+ "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
"license": "BSD-3-Clause",
"authors": [
{
diff --git a/core/vendor/phpunit/php-file-iterator/package-composer.json b/core/vendor/phpunit/php-file-iterator/package-composer.json
deleted file mode 100644
index c71bad7bf5f14d4d87ef1cb4b04154c2d3aaf915..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-file-iterator/package-composer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "phpunit/php-file-iterator",
- "keywords": [ "iterator", "filesystem" ],
- "license": "BSD-3-Clause",
- "homepage": "http://www.phpunit.de/",
- "dependency_map": {},
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
- "irc": "irc://irc.freenode.net/phpunit"
- },
- "autoload": {
- "classmap": [ "File/" ]
- },
- "include_path": [
- ""
- ],
- "version": false,
- "time": false
-}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-file-iterator/package.xml b/core/vendor/phpunit/php-file-iterator/package.xml
index e08bfd5839eb64ffa02b1378a8b029a7a4c7cf13..f6ca981b176a8f6f160c0de6847b4d73faddf4db 100644
--- a/core/vendor/phpunit/php-file-iterator/package.xml
+++ b/core/vendor/phpunit/php-file-iterator/package.xml
@@ -17,9 +17,9 @@
<email>sb@sebastian-bergmann.de</email>
<active>yes</active>
</lead>
- <date>2012-10-05</date>
+ <date>2013-10-10</date>
<version>
- <release>1.3.3</release>
+ <release>1.3.4</release>
<api>1.3.0</api>
</version>
<stability>