diff --git a/composer.json b/composer.json index 436dae9..b67a455 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "kriswallsmith/assetic": "1.1.*@alpha", "symfony-cmf/routing": "1.1.*@alpha", "easyrdf/easyrdf": "0.8.*@beta", + "phpunit/php-file-iterator": ">=1.3.4", "phpunit/phpunit": "3.7.*", "zendframework/zend-feed": "2.2.*" }, diff --git a/composer.lock b/composer.lock index 5a70a6e..b70a5ae 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "4c727150110aeae10efe10a92ff256f5", + "hash": "f7a0b622986c34f89ef027d303bae751", "packages": [ { "name": "doctrine/annotations", @@ -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 aac8b62..a40536e 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit7ffa68419492d19fe654de54c86ae5d2::getLoader(); +return ComposerAutoloaderInitd2bbfc5196fbebf2034fdff509544297::getLoader(); diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index b7dd370..697527d 100644 --- a/core/vendor/composer/autoload_real.php +++ b/core/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit7ffa68419492d19fe654de54c86ae5d2 +class ComposerAutoloaderInitd2bbfc5196fbebf2034fdff509544297 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7ffa68419492d19fe654de54c86ae5d2', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd2bbfc5196fbebf2034fdff509544297', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7ffa68419492d19fe654de54c86ae5d2', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd2bbfc5196fbebf2034fdff509544297', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname(dirname($vendorDir)); diff --git a/core/vendor/composer/include_paths.php b/core/vendor/composer/include_paths.php index 771d07b..79db17e 100644 --- a/core/vendor/composer/include_paths.php +++ b/core/vendor/composer/include_paths.php @@ -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 8347a64..3822997 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -465,53 +465,6 @@ ] }, { - "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", "version_normalized": "1.2.11.0", @@ -2110,5 +2063,52 @@ "php", "spl" ] + }, + { + "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 06593b0..fd9ed1b 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 73f19b9..f898ef5 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 . + * Copyright (c) 2009-2013, Sebastian Bergmann . * 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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 fcb2105..5a8c01a 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 . + * Copyright (c) 2009-2013, Sebastian Bergmann . * 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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 20d58b9..56da6c1 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 . + * Copyright (c) 2009-2013, Sebastian Bergmann . * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ * * @package File * @author Sebastian Bergmann - * @copyright 2009-2012 Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 d30283e..2b846d0 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 . + * Copyright (c) 2009-2013, Sebastian Bergmann . * 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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 47a50ae..3c0166e 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 . + * Copyright (c) 2009-2013, Sebastian Bergmann . * 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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 - * @copyright 2009-2012 Sebastian Bergmann + * @author Sebastian Bergmann + * @copyright 2009-2013 Sebastian Bergmann * @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 58c5743..c392d41 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 . +Copyright (c) 2009-2013, Sebastian Bergmann . 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 aab32bc..1ddd5b8 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 c71bad7..0000000 --- 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 e08bfd5..f6ca981 100644 --- a/core/vendor/phpunit/php-file-iterator/package.xml +++ b/core/vendor/phpunit/php-file-iterator/package.xml @@ -17,9 +17,9 @@ sb@sebastian-bergmann.de yes - 2012-10-05 + 2013-10-10 - 1.3.3 + 1.3.4 1.3.0