From ef326513c577095b7d6ab75f49d5f3ef60d88710 Mon Sep 17 00:00:00 2001 From: catch Date: Mon, 13 May 2013 22:20:18 +0100 Subject: [PATCH] Issue #1977570 by RobLoach: Update third-party vendors and fix composer.json --- composer.json | 36 +- composer.lock | 317 ++-- core/.gitignore | 16 + core/vendor/.gitignore | 14 - core/vendor/autoload.php | 2 +- core/vendor/composer/ClassLoader.php | 39 +- core/vendor/composer/autoload_classmap.php | 690 ++++----- core/vendor/composer/autoload_namespaces.php | 52 +- core/vendor/composer/autoload_real.php | 12 +- core/vendor/composer/include_paths.php | 20 +- core/vendor/composer/installed.json | 1349 +++++++++-------- .../common/Guzzle/Common/Collection.php | 64 +- .../guzzle/common/Guzzle/Common/Version.php | 2 +- .../vendor/guzzle/http/Guzzle/Http/Client.php | 13 +- .../http/Guzzle/Http/Curl/CurlHandle.php | 7 + .../guzzle/http/Guzzle/Http/QueryString.php | 2 + .../http/Guzzle/Http/RedirectPlugin.php | 4 +- .../guzzle/http/Guzzle/Http/composer.json | 4 +- core/vendor/kriswallsmith/assetic/.travis.yml | 16 - .../kriswallsmith/assetic/CHANGELOG-1.1.md | 11 + core/vendor/kriswallsmith/assetic/LICENSE | 2 +- core/vendor/kriswallsmith/assetic/README.md | 46 +- .../kriswallsmith/assetic/composer.json | 62 +- .../kriswallsmith/assetic/docs/en/build.md | 32 - .../kriswallsmith/assetic/docs/en/concepts.md | 129 -- .../kriswallsmith/assetic/docs/en/define.md | 145 -- .../kriswallsmith/assetic/docs/en/index.md | 7 - .../assetic/docs/en/introduction.md | 21 - .../kriswallsmith/assetic/docs/ja/build.md | 30 - .../kriswallsmith/assetic/docs/ja/concepts.md | 121 -- .../kriswallsmith/assetic/docs/ja/define.md | 140 -- .../kriswallsmith/assetic/docs/ja/index.md | 7 - .../assetic/docs/ja/introduction.md | 18 - .../kriswallsmith/assetic/phpunit.travis.xml | 39 - .../kriswallsmith/assetic/phpunit.xml.dist | 42 - .../assetic/src/Assetic/Asset/AssetCache.php | 2 +- .../src/Assetic/Asset/AssetCollection.php | 11 +- .../Asset/AssetCollectionInterface.php | 16 +- .../src/Assetic/Asset/AssetInterface.php | 2 +- .../src/Assetic/Asset/AssetReference.php | 2 +- .../assetic/src/Assetic/Asset/BaseAsset.php | 7 +- .../assetic/src/Assetic/Asset/FileAsset.php | 9 +- .../assetic/src/Assetic/Asset/GlobAsset.php | 7 +- .../assetic/src/Assetic/Asset/HttpAsset.php | 15 +- .../AssetCollectionFilterIterator.php | 2 +- .../Iterator/AssetCollectionIterator.php | 5 +- .../assetic/src/Assetic/Asset/StringAsset.php | 2 +- .../assetic/src/Assetic/AssetManager.php | 4 +- .../assetic/src/Assetic/AssetWriter.php | 5 +- .../assetic/src/Assetic/Cache/ApcCache.php | 2 +- .../assetic/src/Assetic/Cache/ArrayCache.php | 58 + .../src/Assetic/Cache/CacheInterface.php | 2 +- .../assetic/src/Assetic/Cache/ConfigCache.php | 2 +- .../src/Assetic/Cache/ExpiringCache.php | 2 +- .../src/Assetic/Cache/FilesystemCache.php | 2 +- .../src/Assetic/Exception/Exception.php | 2 +- .../src/Assetic/Exception/FilterException.php | 2 +- .../Extension/Twig/AsseticExtension.php | 4 +- .../Extension/Twig/AsseticFilterFunction.php | 2 +- .../Extension/Twig/AsseticFilterInvoker.php | 2 +- .../Assetic/Extension/Twig/AsseticNode.php | 2 +- .../Extension/Twig/AsseticTokenParser.php | 2 +- .../Extension/Twig/TwigFormulaLoader.php | 4 +- .../Assetic/Extension/Twig/TwigResource.php | 2 +- .../Assetic/Extension/Twig/ValueContainer.php | 79 + .../src/Assetic/Factory/AssetFactory.php | 10 +- .../src/Assetic/Factory/LazyAssetManager.php | 2 +- .../Factory/Loader/BasePhpFormulaLoader.php | 2 +- .../Factory/Loader/CachedFormulaLoader.php | 2 +- .../Factory/Loader/FormulaLoaderInterface.php | 2 +- .../Loader/FunctionCallsFormulaLoader.php | 2 +- .../Resource/CoalescingDirectoryResource.php | 2 +- .../Factory/Resource/DirectoryResource.php | 6 +- .../Assetic/Factory/Resource/FileResource.php | 2 +- .../Resource/IteratorResourceInterface.php | 2 +- .../Factory/Resource/ResourceInterface.php | 2 +- .../Factory/Worker/CacheBustingWorker.php | 78 + .../Factory/Worker/EnsureFilterWorker.php | 2 +- .../Factory/Worker/WorkerInterface.php | 2 +- .../src/Assetic/Filter/BaseCssFilter.php | 50 +- .../src/Assetic/Filter/BaseNodeFilter.php | 43 + .../src/Assetic/Filter/BaseProcessFilter.php | 51 + .../src/Assetic/Filter/CallablesFilter.php | 6 +- .../src/Assetic/Filter/CoffeeScriptFilter.php | 27 +- .../src/Assetic/Filter/CompassFilter.php | 40 +- .../src/Assetic/Filter/CssEmbedFilter.php | 9 +- .../src/Assetic/Filter/CssImportFilter.php | 2 +- .../src/Assetic/Filter/CssMinFilter.php | 2 +- .../src/Assetic/Filter/CssRewriteFilter.php | 4 +- .../assetic/src/Assetic/Filter/DartFilter.php | 67 + .../src/Assetic/Filter/FilterCollection.php | 2 +- .../src/Assetic/Filter/FilterInterface.php | 2 +- .../GoogleClosure/BaseCompilerFilter.php | 8 +- .../GoogleClosure/CompilerApiFilter.php | 36 +- .../GoogleClosure/CompilerJarFilter.php | 8 +- .../assetic/src/Assetic/Filter/GssFilter.php | 9 +- .../src/Assetic/Filter/HandlebarsFilter.php | 102 ++ .../src/Assetic/Filter/HashableInterface.php | 2 +- .../src/Assetic/Filter/JSMinFilter.php | 2 +- .../src/Assetic/Filter/JSMinPlusFilter.php | 2 +- .../src/Assetic/Filter/JpegoptimFilter.php | 7 +- .../src/Assetic/Filter/JpegtranFilter.php | 9 +- .../assetic/src/Assetic/Filter/LessFilter.php | 39 +- .../src/Assetic/Filter/LessphpFilter.php | 49 +- .../src/Assetic/Filter/OptiPngFilter.php | 9 +- .../src/Assetic/Filter/PackagerFilter.php | 2 +- .../src/Assetic/Filter/PackerFilter.php | 2 +- .../src/Assetic/Filter/PhpCssEmbedFilter.php | 4 +- .../src/Assetic/Filter/PngoutFilter.php | 9 +- .../src/Assetic/Filter/Sass/SassFilter.php | 11 +- .../src/Assetic/Filter/Sass/ScssFilter.php | 2 +- .../src/Assetic/Filter/ScssphpFilter.php | 32 +- .../src/Assetic/Filter/SprocketsFilter.php | 9 +- .../src/Assetic/Filter/StylusFilter.php | 17 +- .../src/Assetic/Filter/TypeScriptFilter.php | 76 + .../src/Assetic/Filter/UglifyCssFilter.php | 119 ++ .../src/Assetic/Filter/UglifyJs2Filter.php | 105 ++ .../src/Assetic/Filter/UglifyJsFilter.php | 51 +- .../Filter/Yui/BaseCompressorFilter.php | 31 +- .../Filter/Yui/CssCompressorFilter.php | 2 +- .../Assetic/Filter/Yui/JsCompressorFilter.php | 2 +- .../assetic/src/Assetic/FilterManager.php | 2 +- .../assetic/src/Assetic/Util/PathUtils.php | 9 + .../src/Assetic/Util/TraversableString.php | 2 +- .../src/Assetic/ValueSupplierInterface.php | 2 +- .../kriswallsmith/assetic/src/functions.php | 6 +- .../Assetic/Test/Asset/AssetCacheTest.php | 175 --- .../Test/Asset/AssetCollectionTest.php | 333 ---- .../Assetic/Test/Asset/AssetReferenceTest.php | 126 -- .../Assetic/Test/Asset/FileAssetTest.php | 72 - .../Assetic/Test/Asset/GlobAssetTest.php | 61 - .../Assetic/Test/Asset/HttpAssetTest.php | 58 - .../Assetic/Test/Asset/StringAssetTest.php | 79 - .../tests/Assetic/Test/AssetManagerTest.php | 53 - .../tests/Assetic/Test/AssetWriterTest.php | 207 --- .../tests/Assetic/Test/Cache/ApcCacheTest.php | 42 - .../Assetic/Test/Cache/ConfigCacheTest.php | 65 - .../Assetic/Test/Cache/ExpiringCacheTest.php | 111 -- .../Test/Cache/FilesystemCacheTest.php | 51 - .../Extension/Twig/AsseticExtensionTest.php | 212 --- .../Extension/Twig/TwigFormulaLoaderTest.php | 108 -- .../Test/Extension/Twig/TwigResourceTest.php | 48 - .../Twig/templates/absolute_path.twig | 3 - .../Extension/Twig/templates/combine.twig | 3 - .../Test/Extension/Twig/templates/debug.twig | 3 - .../Extension/Twig/templates/filters.twig | 3 - .../Extension/Twig/templates/function.twig | 3 - .../Test/Extension/Twig/templates/glob.twig | 3 - .../Test/Extension/Twig/templates/image.twig | 3 - .../Extension/Twig/templates/mixture.twig | 3 - .../Twig/templates/optional_filter.twig | 3 - .../Twig/templates/output_pattern.twig | 3 - .../Extension/Twig/templates/output_url.twig | 3 - .../Extension/Twig/templates/reference.twig | 3 - .../Twig/templates/unclosed_tag.twig | 5 - .../Extension/Twig/templates/variables.twig | 5 - .../Assetic/Test/Factory/AssetFactoryTest.php | 203 --- .../Test/Factory/LazyAssetManagerTest.php | 96 -- .../Loader/CachedFormulaLoaderTest.php | 138 -- .../Loader/FunctionCallsFormulaLoaderTest.php | 69 - .../Test/Factory/Loader/templates/debug.php | 8 - .../CoalescingDirectoryResourceTest.php | 42 - .../Resource/DirectoryResourceTest.php | 132 -- .../Factory/Resource/FileResourceTest.php | 42 - .../Factory/Resource/Fixtures/dir1/file1.txt | 0 .../Factory/Resource/Fixtures/dir1/file2.txt | 0 .../Factory/Resource/Fixtures/dir2/file1.txt | 0 .../Factory/Resource/Fixtures/dir2/file3.txt | 0 .../Factory/Worker/EnsureFilterWorkerTest.php | 47 - .../Test/Filter/BaseImageFilterTest.php | 24 - .../Test/Filter/CallablesFilterTest.php | 39 - .../Test/Filter/CoffeeScriptFilterTest.php | 73 - .../Assetic/Test/Filter/CompassFilterTest.php | 66 - .../Test/Filter/CssEmbedFilterTest.php | 54 - .../Test/Filter/CssImportFilterTest.php | 67 - .../Assetic/Test/Filter/CssMinFilterTest.php | 40 - .../Test/Filter/CssRewriteFilterTest.php | 127 -- .../Test/Filter/FilterCollectionTest.php | 59 - .../GoogleClosure/CompilerApiFilterTest.php | 86 -- .../GoogleClosure/CompilerJarFilterTest.php | 78 - .../Assetic/Test/Filter/GssFilterTest.php | 45 - .../Assetic/Test/Filter/JSMinFilterTest.php | 39 - .../Test/Filter/JSMinPlusFilterTest.php | 39 - .../Test/Filter/JpegoptimFilterTest.php | 45 - .../Test/Filter/JpegtranFilterTest.php | 45 - .../Assetic/Test/Filter/LessFilterTest.php | 63 - .../Assetic/Test/Filter/LessphpFilterTest.php | 47 - .../Assetic/Test/Filter/OptiPngFilterTest.php | 56 - .../Test/Filter/PackagerFilterTest.php | 69 - .../Assetic/Test/Filter/PackerFilterTest.php | 36 - .../Test/Filter/PhpCssEmbedFilterTest.php | 34 - .../Assetic/Test/Filter/PngoutFilterTest.php | 57 - .../Test/Filter/Sass/SassFilterTest.php | 70 - .../Test/Filter/Sass/ScssFilterTest.php | 44 - .../Assetic/Test/Filter/ScssphpFilterTest.php | 62 - .../Test/Filter/SprocketsFilterTest.php | 69 - .../Assetic/Test/Filter/StylusFilterTest.php | 53 - .../Test/Filter/UglifyJsFilterTest.php | 100 -- .../Filter/Yui/BaseCompressorFilterTest.php | 31 - .../Filter/Yui/CssCompressorFilterTest.php | 23 - .../Filter/Yui/JsCompressorFilterTest.php | 62 - .../Test/Filter/fixtures/compass/compass.sass | 4 - .../fixtures/compass/partials/_sass.sass | 4 - .../fixtures/compass/partials/_scss.scss | 6 - .../Filter/fixtures/compass/stylesheet.sass | 4 - .../Filter/fixtures/compass/stylesheet.scss | 6 - .../Test/Filter/fixtures/cssembed/test.css | 4 - .../Test/Filter/fixtures/cssimport/import.css | 2 - .../Test/Filter/fixtures/cssimport/main.css | 4 - .../Test/Filter/fixtures/cssimport/more.sass | 1 - .../fixtures/cssimport/more/evenmore/bg.gif | 0 .../cssimport/more/evenmore/deep1.css | 2 - .../cssimport/more/evenmore/deep2.css | 4 - .../fixtures/cssimport/noncssimport.css | 2 - .../Test/Filter/fixtures/cssmin/fonts.css | 3 - .../Test/Filter/fixtures/cssmin/main.css | 5 - .../Assetic/Test/Filter/fixtures/home.gif | 5 - .../Assetic/Test/Filter/fixtures/home.jpg | 3 - .../Assetic/Test/Filter/fixtures/home.png | 6 - .../Assetic/Test/Filter/fixtures/jsmin/js.js | 7 - .../Test/Filter/fixtures/less/_include.less | 1 - .../Test/Filter/fixtures/less/main.less | 3 - .../fixtures/packager/app/application.js | 11 - .../Filter/fixtures/packager/lib/package.yml | 4 - .../Test/Filter/fixtures/packager/lib/util.js | 11 - .../Test/Filter/fixtures/packer/example.js | 7 - .../Test/Filter/fixtures/sass/_include.scss | 1 - .../Test/Filter/fixtures/sass/main.scss | 3 - .../Test/Filter/fixtures/sprockets/include.js | 1 - .../sprockets/lib1/assets/images/image.gif | 1 - .../Filter/fixtures/sprockets/lib1/header.js | 3 - .../Filter/fixtures/sprockets/lib2/footer.js | 1 - .../Test/Filter/fixtures/sprockets/main.js | 5 - .../Test/Filter/fixtures/uglifyjs/script.js | 18 - .../tests/Assetic/Test/FilterManagerTest.php | 58 - .../tests/Assetic/Test/Fixture/messages.de.js | 1 - .../tests/Assetic/Test/Fixture/messages.en.js | 1 - .../tests/Assetic/Test/Fixture/messages.fr.js | 1 - .../Test/Util/TraversableStringTest.php | 35 - .../kriswallsmith/assetic/tests/bootstrap.php | 46 - .../php-file-iterator/File/Iterator.php | 10 +- .../File/Iterator/Autoload.php | 6 +- .../File/Iterator/Autoload.php.in | 4 +- .../File/Iterator/Facade.php | 10 +- .../File/Iterator/Factory.php | 10 +- core/vendor/phpunit/php-file-iterator/LICENSE | 2 +- .../phpunit/php-file-iterator/composer.json | 2 +- .../php-file-iterator/package-composer.json | 19 + core/vendor/phpunit/php-text-template/LICENSE | 2 +- .../php-text-template/Text/Template.php | 10 +- .../Text/Template/Autoload.php | 6 +- .../Text/Template/Autoload.php.in | 6 +- core/vendor/phpunit/php-timer/LICENSE | 2 +- core/vendor/phpunit/php-timer/PHP/Timer.php | 16 +- .../phpunit/php-timer/PHP/Timer/Autoload.php | 6 +- .../php-timer/PHP/Timer/Autoload.php.in | 6 +- .../phpunit/php-timer/Tests/TimerTest.php | 10 +- core/vendor/phpunit/php-timer/composer.json | 2 +- .../phpunit/php-timer/package-composer.json | 19 + core/vendor/phpunit/php-token-stream/LICENSE | 2 +- .../phpunit/php-token-stream/PHP/Token.php | 14 +- .../php-token-stream/PHP/Token/Stream.php | 10 +- .../PHP/Token/Stream/Autoload.php | 6 +- .../PHP/Token/Stream/Autoload.php.in | 6 +- .../PHP/Token/Stream/CachingFactory.php | 10 +- .../Tests/Token/ClassTest.php | 6 +- .../Tests/Token/ClosureTest.php | 125 -- .../Tests/Token/FunctionTest.php | 10 +- .../Tests/Token/IncludeTest.php | 6 +- .../Tests/Token/InterfaceTest.php | 10 +- .../Tests/Token/NamespaceTest.php | 10 +- .../php-token-stream/Tests/TokenTest.php | 10 +- .../php-token-stream/Tests/_files/closure.php | 5 - .../phpunit/php-token-stream/composer.json | 2 +- .../php-token-stream/package-composer.json | 19 + .../Tests/MockObjectTest.php | 50 +- .../_files/MethodCallbackByReference.php | 4 +- core/vendor/phpunit/phpunit/.travis.yml | 9 +- core/vendor/phpunit/phpunit/ChangeLog.md | 22 + .../phpunit/phpunit/PHPUnit/Autoload.php | 40 +- .../phpunit/phpunit/PHPUnit/Autoload.php.in | 40 +- .../Framework/Process/TestCaseMethod.tpl.dist | 9 +- .../phpunit/PHPUnit/Framework/TestCase.php | 7 + .../phpunit/PHPUnit/Runner/Version.php | 2 +- .../phpunit/PHPUnit/TextUI/TestRunner.php | 5 +- .../phpunit/phpunit/PHPUnit/Util/XML.php | 3 +- .../phpunit/Tests/Framework/AssertTest.php | 23 + .../phpunit/Tests/Regression/GitHub/863.phpt | 25 + .../_files/SelectorAssertionsFixture.html | 2 +- .../phpunit/phpunit/build/assertions.php | 0 core/vendor/phpunit/phpunit/composer.json | 2 +- .../phpunit/phpunit/composer/bin/phpunit | 6 +- core/vendor/phpunit/phpunit/package.xml | 7 +- core/vendor/phpunit/phpunit/phpunit.php | 0 .../Symfony/Cmf/Component/Routing/.travis.yml | 4 +- .../Cmf/Component/Routing/CHANGELOG.md | 6 + .../Cmf/Component/Routing/ChainRouter.php | 76 +- .../Routing/ChainedRouterInterface.php | 2 +- .../Routing/ContentAwareGenerator.php | 93 +- .../Routing/ContentRepositoryInterface.php | 12 +- .../Cmf/Component/Routing/DynamicRouter.php | 48 +- .../NestedMatcher/ConfigurableUrlMatcher.php | 68 - .../Routing/NestedMatcher/UrlMatcher.php | 2 + .../Routing/ProviderBasedGenerator.php | 28 +- .../Component/Routing/RouteAwareInterface.php | 7 +- .../Routing/RouteObjectInterface.php | 8 - .../Routing/RouteProviderInterface.php | 8 +- .../Tests/Enhancer/FieldMapEnhancerTest.php | 1 - .../Enhancer/FieldPresenceEnhancerTest.php | 1 - .../Enhancer/RouteContentEnhancerTest.php | 3 +- .../Routing/Tests/Enhancer/RouteObject.php | 2 +- .../ConfigurableUrlMatcherTest.php | 137 -- .../Tests/NestedMatcher/NestedMatcherTest.php | 3 +- .../Routing/Tests/Routing/ChainRouterTest.php | 36 +- .../Routing/ContentAwareGeneratorTest.php | 93 +- .../Tests/Routing/DynamicRouterTest.php | 36 +- .../Routing/ProviderBasedGeneratorTest.php | 24 +- .../Routing/Tests/Routing/RouteMock.php | 4 +- .../Cmf/Component/Routing/Tests/bootstrap.php | 1 + .../Routing/VersatileGeneratorInterface.php | 19 +- .../Cmf/Component/Routing/composer.json | 10 +- .../ClassLoader/ClassCollectionLoader.php | 12 +- .../ClassLoader/DebugClassLoader.php | 2 +- .../Tests/ClassCollectionLoaderTest.php | 18 +- .../Tests/DebugClassLoaderTest.php | 51 + .../Fixtures/Namespaced/WithComments.php | 12 +- .../ContainerAwareInterface.php | 2 +- .../DependencyInjection/ContainerBuilder.php | 13 +- .../DependencyInjection/Dumper/YamlDumper.php | 2 +- .../Loader/XmlFileLoader.php | 2 +- .../Loader/YamlFileLoader.php | 9 +- .../Tests/ContainerBuilderTest.php | 21 + .../Tests/Fixtures/containers/container8.php | 1 + .../Tests/Fixtures/php/services8.php | 1 + .../Tests/Fixtures/xml/services8.xml | 1 + .../Tests/Fixtures/yaml/services2.yml | 1 + .../Tests/Fixtures/yaml/services8.yml | 1 + .../Tests/Loader/XmlFileLoaderTest.php | 50 +- .../Tests/Loader/YamlFileLoaderTest.php | 4 +- .../Component/HttpFoundation/HeaderBag.php | 2 +- .../Component/HttpFoundation/Request.php | 13 +- .../Component/HttpFoundation/Response.php | 2 +- .../Session/Attribute/AttributeBag.php | 2 +- .../HttpFoundation/Tests/RequestTest.php | 8 + .../DataCollector/ConfigDataCollector.php | 26 + .../Debug/TraceableEventDispatcher.php | 4 + .../HttpKernel/Fragment/FragmentHandler.php | 6 +- .../Fragment/InlineFragmentRenderer.php | 2 +- .../Component/HttpKernel/HttpCache/Store.php | 2 +- .../Symfony/Component/HttpKernel/Kernel.php | 6 +- .../Profiler/FileProfilerStorage.php | 2 +- .../HttpKernel/Profiler/Profiler.php | 2 +- .../Tests/Fragment/FragmentHandlerTest.php | 6 +- .../HttpKernel/Tests/HttpCache/StoreTest.php | 8 +- .../Tests/Profiler/Mock/RedisMock.php | 13 + .../Symfony/Component/Process}/.gitignore | 4 +- .../Symfony/Component/Process/CHANGELOG.md | 7 + .../Process/Exception/ExceptionInterface.php | 0 .../Exception/InvalidArgumentException.php | 21 + .../Process/Exception/LogicException.php | 21 + .../Exception/ProcessFailedException.php | 2 +- .../Process/Exception/RuntimeException.php | 0 .../Symfony/Component/Process/PhpProcess.php | 4 +- .../Symfony/Component/Process/Process.php | 192 ++- .../Component/Process/ProcessBuilder.php | 25 +- .../Symfony/Component/Process/README.md | 4 +- .../Process/Tests/AbstractProcessTest.php | 71 +- .../Process/Tests/ProcessBuilderTest.php | 12 +- .../Tests/ProcessFailedExceptionTest.php | 3 +- .../Tests/SigchildDisabledProcessTest.php | 18 +- .../Tests/SigchildEnabledProcessTest.php | 8 +- .../Component/Process/Tests/bootstrap.php | 18 - .../Symfony/Component/Process/composer.json | 9 +- .../Component/Process/phpunit.xml.dist | 2 +- .../Routing/Generator/UrlGenerator.php | 4 +- .../Routing/Loader/XmlFileLoader.php | 8 +- .../Loader/schema/routing/routing-1.0.xsd | 18 +- .../Component/Routing/RouteCollection.php | 24 +- .../Component/Routing/RouteCompiler.php | 2 +- .../Routing/Tests/Fixtures/missing_id.xml | 2 +- .../Tests/Fixtures/namespaceprefix.xml | 2 +- .../Routing/Tests/Fixtures/nonvalid.xml | 3 +- .../Routing/Tests/Fixtures/nonvalidroute.xml | 2 +- .../Routing/Tests/Fixtures/validpattern.php | 12 +- .../Routing/Tests/Fixtures/validpattern.xml | 6 +- .../Routing/Tests/Fixtures/validpattern.yml | 8 +- .../Routing/Tests/Fixtures/validresource.xml | 2 +- .../Routing/Tests/Fixtures/validresource.yml | 4 +- .../Tests/Generator/UrlGeneratorTest.php | 11 +- .../Tests/Loader/PhpFileLoaderTest.php | 12 +- .../Tests/Loader/XmlFileLoaderTest.php | 41 +- .../Tests/Loader/YamlFileLoaderTest.php | 30 +- .../Dumper/ApacheMatcherDumperTest.php | 3 +- .../Matcher/Dumper/PhpMatcherDumperTest.php | 31 +- .../Routing/Tests/Matcher/UrlMatcherTest.php | 20 +- .../Routing/Tests/RouteCollectionTest.php | 141 +- .../Serializer/Encoder/XmlEncoder.php | 4 +- .../Tests/Encoder/JsonEncoderTest.php | 1 - .../Translation/TranslatorInterface.php | 4 +- .../Validator/Constraints/FileValidator.php | 27 +- .../Component/Validator/DefaultTranslator.php | 12 +- .../Symfony/Component/Validator/README.md | 2 +- .../Tests/Constraints/FileValidatorTest.php | 17 +- .../Symfony/Component/Validator/Validator.php | 2 +- .../yaml/Symfony/Component/Yaml/Inline.php | 5 - .../yaml/Symfony/Component/Yaml/Parser.php | 85 +- .../Component/Yaml/Tests/DumperTest.php | 72 +- .../Component/Yaml/Tests/ParserTest.php | 116 +- core/vendor/twig/twig/CHANGELOG | 16 +- core/vendor/twig/twig/doc/api.rst | 96 +- core/vendor/twig/twig/doc/filters/batch.rst | 45 + core/vendor/twig/twig/doc/filters/first.rst | 25 + core/vendor/twig/twig/doc/filters/index.rst | 39 +- .../twig/twig/doc/filters/json_encode.rst | 4 +- core/vendor/twig/twig/doc/filters/last.rst | 25 + core/vendor/twig/twig/doc/filters/merge.rst | 2 +- core/vendor/twig/twig/doc/filters/sort.rst | 2 +- .../twig/twig/doc/filters/striptags.rst | 2 +- .../twig/twig/doc/filters/url_encode.rst | 15 +- core/vendor/twig/twig/doc/functions/index.rst | 14 +- .../doc/functions/template_from_string.rst | 6 +- core/vendor/twig/twig/doc/intro.rst | 51 +- core/vendor/twig/twig/doc/recipes.rst | 7 +- core/vendor/twig/twig/doc/tags/for.rst | 15 + core/vendor/twig/twig/doc/tags/index.rst | 24 +- core/vendor/twig/twig/doc/templates.rst | 9 +- core/vendor/twig/twig/doc/tests/index.rst | 10 +- core/vendor/twig/twig/ext/twig/php_twig.h | 2 +- core/vendor/twig/twig/ext/twig/twig.c | 3 + core/vendor/twig/twig/lib/Twig/Autoloader.php | 3 +- core/vendor/twig/twig/lib/Twig/Compiler.php | 3 +- .../twig/twig/lib/Twig/CompilerInterface.php | 3 +- .../vendor/twig/twig/lib/Twig/Environment.php | 62 +- core/vendor/twig/twig/lib/Twig/Error.php | 3 +- .../twig/twig/lib/Twig/Error/Loader.php | 3 +- .../twig/twig/lib/Twig/Error/Runtime.php | 3 +- .../twig/twig/lib/Twig/Error/Syntax.php | 3 +- .../twig/lib/Twig/ExistsLoaderInterface.php | 3 +- .../twig/twig/lib/Twig/ExpressionParser.php | 3 +- .../twig/twig/lib/Twig/Extension/Core.php | 94 +- .../twig/twig/lib/Twig/Extension/Staging.php | 3 +- .../twig/twig/lib/Twig/ExtensionInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Filter.php | 3 +- .../twig/twig/lib/Twig/Filter/Function.php | 3 +- .../twig/twig/lib/Twig/Filter/Method.php | 3 +- .../vendor/twig/twig/lib/Twig/Filter/Node.php | 3 +- .../twig/lib/Twig/FilterCallableInterface.php | 3 +- .../twig/twig/lib/Twig/FilterInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Function.php | 3 +- .../twig/twig/lib/Twig/Function/Function.php | 3 +- .../twig/twig/lib/Twig/Function/Method.php | 3 +- .../twig/twig/lib/Twig/Function/Node.php | 3 +- .../lib/Twig/FunctionCallableInterface.php | 3 +- .../twig/twig/lib/Twig/FunctionInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Lexer.php | 8 +- .../twig/twig/lib/Twig/LexerInterface.php | 3 +- .../twig/twig/lib/Twig/Loader/Array.php | 3 +- .../twig/twig/lib/Twig/Loader/Chain.php | 3 +- .../twig/twig/lib/Twig/Loader/Filesystem.php | 4 +- .../twig/twig/lib/Twig/Loader/String.php | 3 +- .../twig/twig/lib/Twig/LoaderInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Markup.php | 3 +- core/vendor/twig/twig/lib/Twig/Node.php | 3 +- .../twig/twig/lib/Twig/Node/AutoEscape.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Block.php | 3 +- .../twig/lib/Twig/Node/BlockReference.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Body.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Do.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Embed.php | 3 +- .../twig/twig/lib/Twig/Node/Expression.php | 3 +- .../Twig/Node/Expression/BlockReference.php | 3 +- .../Node/Expression/ExtensionReference.php | 3 +- .../Twig/Node/Expression/Filter/Default.php | 3 +- .../twig/lib/Twig/Node/Expression/Parent.php | 3 +- .../Twig/Node/Expression/Test/Constant.php | 3 +- .../lib/Twig/Node/Expression/Test/Defined.php | 3 +- .../Twig/Node/Expression/Test/Divisibleby.php | 3 +- .../lib/Twig/Node/Expression/Test/Even.php | 3 +- .../lib/Twig/Node/Expression/Test/Null.php | 3 +- .../lib/Twig/Node/Expression/Test/Odd.php | 3 +- .../lib/Twig/Node/Expression/Test/Sameas.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Flush.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/For.php | 3 +- .../twig/twig/lib/Twig/Node/ForLoop.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/If.php | 3 +- .../vendor/twig/twig/lib/Twig/Node/Import.php | 3 +- .../twig/twig/lib/Twig/Node/Include.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Macro.php | 3 +- .../vendor/twig/twig/lib/Twig/Node/Module.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Print.php | 3 +- .../twig/twig/lib/Twig/Node/Sandbox.php | 3 +- .../twig/lib/Twig/Node/SandboxedModule.php | 3 +- .../twig/lib/Twig/Node/SandboxedPrint.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Set.php | 3 +- .../twig/twig/lib/Twig/Node/Spaceless.php | 3 +- core/vendor/twig/twig/lib/Twig/Node/Text.php | 3 +- .../twig/twig/lib/Twig/NodeInterface.php | 3 +- .../twig/lib/Twig/NodeOutputInterface.php | 3 +- .../twig/twig/lib/Twig/NodeTraverser.php | 3 +- .../twig/lib/Twig/NodeVisitor/Escaper.php | 3 +- .../twig/lib/Twig/NodeVisitor/Optimizer.php | 3 +- .../twig/lib/Twig/NodeVisitor/Sandbox.php | 3 +- .../twig/lib/Twig/NodeVisitorInterface.php | 5 +- core/vendor/twig/twig/lib/Twig/Parser.php | 3 +- .../twig/twig/lib/Twig/ParserInterface.php | 3 +- .../twig/lib/Twig/Sandbox/SecurityError.php | 3 +- .../twig/lib/Twig/Sandbox/SecurityPolicy.php | 3 +- .../Twig/Sandbox/SecurityPolicyInterface.php | 3 +- .../twig/twig/lib/Twig/SimpleFilter.php | 3 +- .../twig/twig/lib/Twig/SimpleFunction.php | 3 +- core/vendor/twig/twig/lib/Twig/SimpleTest.php | 3 +- core/vendor/twig/twig/lib/Twig/Template.php | 3 +- .../twig/twig/lib/Twig/TemplateInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Test.php | 3 +- .../twig/twig/lib/Twig/Test/Function.php | 3 +- .../lib/Twig/Test/IntegrationTestCase.php | 5 +- .../vendor/twig/twig/lib/Twig/Test/Method.php | 3 +- core/vendor/twig/twig/lib/Twig/Test/Node.php | 3 +- .../twig/lib/Twig/TestCallableInterface.php | 3 +- .../twig/twig/lib/Twig/TestInterface.php | 3 +- core/vendor/twig/twig/lib/Twig/Token.php | 3 +- .../vendor/twig/twig/lib/Twig/TokenParser.php | 3 +- .../twig/twig/lib/Twig/TokenParser/Do.php | 2 +- .../twig/twig/lib/Twig/TokenParser/Set.php | 2 +- .../twig/twig/lib/Twig/TokenParserBroker.php | 3 +- .../lib/Twig/TokenParserBrokerInterface.php | 3 +- .../twig/lib/Twig/TokenParserInterface.php | 3 +- .../vendor/twig/twig/lib/Twig/TokenStream.php | 3 +- .../twig/test/Twig/Tests/EnvironmentTest.php | 16 + .../Twig/Tests/Fixtures/filters/batch.test | 31 + .../Tests/Fixtures/filters/batch_float.php | 31 + .../filters/batch_with_empty_fill.test | 37 + .../Fixtures/filters/batch_with_fill.test | 37 + .../Twig/Tests/Fixtures/filters/date.test | 45 +- .../Twig/Tests/Fixtures/filters/first.test | 14 + .../Twig/Tests/Fixtures/filters/last.test | 14 + .../Tests/Fixtures/filters/urlencode.test | 12 + .../Twig/Tests/Fixtures/functions/date.test | 6 +- .../Fixtures/tags/autoescape/literal.test | 4 +- ...ntegrationTest.php => IntegrationTest.php} | 0 .../twig/twig/test/Twig/Tests/LexerTest.php | 54 +- .../test/Twig/Tests/Loader/FilesystemTest.php | 1 + .../twig/twig/test/Twig/Tests/ParserTest.php | 2 +- .../twig/test/Twig/Tests/TemplateTest.php | 2 +- .../twig/test/Twig/Tests/escapingTest.php | 6 +- 545 files changed, 5238 insertions(+), 8466 deletions(-) create mode 100644 core/.gitignore delete mode 100644 core/vendor/.gitignore delete mode 100644 core/vendor/kriswallsmith/assetic/.travis.yml mode change 100644 => 100755 core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/en/build.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/en/concepts.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/en/define.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/en/index.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/en/introduction.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/ja/build.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/ja/concepts.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/ja/define.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/ja/index.md delete mode 100644 core/vendor/kriswallsmith/assetic/docs/ja/introduction.md delete mode 100644 core/vendor/kriswallsmith/assetic/phpunit.travis.xml delete mode 100644 core/vendor/kriswallsmith/assetic/phpunit.xml.dist create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ArrayCache.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/ValueContainer.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/CacheBustingWorker.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseNodeFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseProcessFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/DartFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HandlebarsFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/TypeScriptFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyCssFilter.php create mode 100644 core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJs2Filter.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/FileAssetTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/StringAssetTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetManagerTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ApcCacheTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/absolute_path.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/combine.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/debug.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/filters.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/function.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/glob.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/image.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/mixture.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/optional_filter.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_pattern.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_url.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/reference.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/variables.twig delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/templates/debug.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file1.txt delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file2.txt delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file1.txt delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file3.txt delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CoffeeScriptFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CompassFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssEmbedFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssImportFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssMinFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssRewriteFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/FilterCollectionTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerJarFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GssFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinPlusFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegoptimFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegtranFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessphpFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/OptiPngFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackagerFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackerFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PhpCssEmbedFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PngoutFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/SassFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/ScssFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/ScssphpFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/SprocketsFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/StylusFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/UglifyJsFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/BaseCompressorFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/CssCompressorFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/JsCompressorFilterTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/compass.sass delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_sass.sass delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_scss.scss delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.sass delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.scss delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssembed/test.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/import.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/main.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more.sass delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/bg.gif delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep1.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep2.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/noncssimport.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/fonts.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/main.css delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.gif delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.jpg delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.png delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/jsmin/js.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/_include.less delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/main.less delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/app/application.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/package.yml delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/util.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packer/example.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/_include.scss delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/main.scss delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/include.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/header.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib2/footer.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/main.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/uglifyjs/script.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/FilterManagerTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Fixture/messages.de.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Fixture/messages.en.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Fixture/messages.fr.js delete mode 100644 core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Util/TraversableStringTest.php delete mode 100644 core/vendor/kriswallsmith/assetic/tests/bootstrap.php create mode 100644 core/vendor/phpunit/php-file-iterator/package-composer.json create mode 100644 core/vendor/phpunit/php-timer/package-composer.json delete mode 100644 core/vendor/phpunit/php-token-stream/Tests/Token/ClosureTest.php delete mode 100644 core/vendor/phpunit/php-token-stream/Tests/_files/closure.php create mode 100644 core/vendor/phpunit/php-token-stream/package-composer.json create mode 100644 core/vendor/phpunit/phpunit/Tests/Regression/GitHub/863.phpt mode change 100644 => 100755 core/vendor/phpunit/phpunit/build/assertions.php mode change 100644 => 100755 core/vendor/phpunit/phpunit/phpunit.php create mode 100644 core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/CHANGELOG.md delete mode 100644 core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/NestedMatcher/ConfigurableUrlMatcher.php delete mode 100644 core/vendor/symfony-cmf/routing/Symfony/Cmf/Component/Routing/Tests/NestedMatcher/ConfigurableUrlMatcherTest.php create mode 100644 core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php rename core/vendor/{kriswallsmith/assetic => symfony/process/Symfony/Component/Process}/.gitignore (70%) mode change 100755 => 100644 core/vendor/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php create mode 100644 core/vendor/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php create mode 100644 core/vendor/symfony/process/Symfony/Component/Process/Exception/LogicException.php mode change 100755 => 100644 core/vendor/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php mode change 100755 => 100644 core/vendor/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php delete mode 100644 core/vendor/symfony/process/Symfony/Component/Process/Tests/bootstrap.php create mode 100644 core/vendor/twig/twig/doc/filters/batch.rst create mode 100644 core/vendor/twig/twig/doc/filters/first.rst create mode 100644 core/vendor/twig/twig/doc/filters/last.rst create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.php create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test create mode 100644 core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test rename core/vendor/twig/twig/test/Twig/Tests/{integrationTest.php => IntegrationTest.php} (100%) diff --git a/composer.json b/composer.json index 9db4826237..9b317c4580 100644 --- a/composer.json +++ b/composer.json @@ -4,22 +4,22 @@ "type": "drupal-core", "license": "GPL-2.0+", "require": { - "symfony/class-loader": "2.2.0", - "symfony/dependency-injection": "2.2.0", - "symfony/event-dispatcher": "2.2.0", - "symfony/http-foundation": "2.2.0", - "symfony/http-kernel": "2.2.0", - "symfony/routing": "2.2.0", - "symfony/serializer": "2.2.0", - "symfony/validator": "2.2.0", - "symfony/yaml": "2.2.0", - "twig/twig": "1.12.1", - "doctrine/common": "2.3.0", - "guzzle/http": "3.1.0", - "kriswallsmith/assetic": "1.1.0-alpha1", - "symfony-cmf/routing": "dev-master#ea4a10", - "easyrdf/easyrdf": "0.8.0-beta.1", - "phpunit/phpunit": "3.7.15" + "symfony/class-loader": "2.2.*", + "symfony/dependency-injection": "2.2.*", + "symfony/event-dispatcher": "2.2.*", + "symfony/http-foundation": "2.2.*", + "symfony/http-kernel": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/serializer": "2.2.*", + "symfony/validator": "2.2.*", + "symfony/yaml": "2.2.*", + "twig/twig": "1.12.*", + "doctrine/common": "2.3.*", + "guzzle/http": "3.1.*", + "kriswallsmith/assetic": "1.1.*@alpha", + "symfony-cmf/routing": "1.1.*@alpha", + "easyrdf/easyrdf": "0.8.*@beta", + "phpunit/phpunit": "3.7.*" }, "autoload": { "psr-0": { @@ -28,8 +28,8 @@ "Drupal\\Driver": "drivers/lib/" } }, - "minimum-stability": "dev", "config": { - "vendor-dir": "core/vendor" + "vendor-dir": "core/vendor", + "preferred-install": "dist" } } diff --git a/composer.lock b/composer.lock index 4d0f5490b2..e8a696a728 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,9 @@ { - "hash": "6b1bf50f976af5d14628f38478885c0f", + "_readme": [ + "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": "8969a2b9cb8e5b12a6649cadfa010bab", "packages": [ { "name": "doctrine/common", @@ -53,7 +57,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" @@ -126,17 +130,17 @@ }, { "name": "guzzle/common", - "version": "v3.1.0", + "version": "v3.1.2", "target-dir": "Guzzle/Common", "source": { "type": "git", "url": "git://github.com/guzzle/common.git", - "reference": "v3.1.0" + "reference": "v3.1.2" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/common/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/common/archive/v3.1.2.zip", + "reference": "v3.1.2", "shasum": "" }, "require": { @@ -166,30 +170,32 @@ "event", "exception" ], - "time": "2013-01-13 05:14:34" + "time": "2013-01-28 00:07:40" }, { "name": "guzzle/http", - "version": "v3.1.0", + "version": "v3.1.2", "target-dir": "Guzzle/Http", "source": { "type": "git", "url": "git://github.com/guzzle/http.git", - "reference": "v3.1.0" + "reference": "v3.1.2" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/http/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/http/archive/v3.1.2.zip", + "reference": "v3.1.2", "shasum": "" }, "require": { - "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", "guzzle/stream": "self.version", "php": ">=5.3.2" }, + "suggest": { + "ext-curl": "*" + }, "type": "library", "extra": { "branch-alias": { @@ -221,21 +227,21 @@ "http", "http client" ], - "time": "2013-01-13 05:09:32" + "time": "2013-01-26 08:20:43" }, { "name": "guzzle/parser", - "version": "v3.1.0", + "version": "v3.1.2", "target-dir": "Guzzle/Parser", "source": { "type": "git", "url": "git://github.com/guzzle/parser.git", - "reference": "v3.1.0" + "reference": "v3.1.2" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/parser/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/parser/archive/v3.1.2.zip", + "reference": "v3.1.2", "shasum": "" }, "require": { @@ -269,17 +275,17 @@ }, { "name": "guzzle/stream", - "version": "v3.1.0", + "version": "v3.1.2", "target-dir": "Guzzle/Stream", "source": { "type": "git", "url": "https://github.com/guzzle/stream", - "reference": "v3.1.0" + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/stream/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/guzzle/stream/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { @@ -319,31 +325,38 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.1.0-alpha1", + "version": "v1.1.0-alpha4", "source": { "type": "git", - "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "v1.1.0-alpha1" + "url": "https://github.com/kriswallsmith/assetic.git", + "reference": "v1.1.0-alpha4" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", - "reference": "v1.1.0-alpha1", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.0-alpha4", + "reference": "v1.1.0-alpha4", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "2.1.*" + "symfony/process": ">=2.1.0,<2.3-dev" }, "require-dev": { + "cssmin/cssmin": "*", + "joliclic/javascript-packer": "*", + "kamicane/packager": "*", "leafo/lessphp": "*", "leafo/scssphp": "*", + "leafo/scssphp-compass": "*", + "mrclay/minify": "*", + "phpunit/phpunit": "3.7.*", "ptachoire/cssembed": "*", "twig/twig": ">=1.6.0,<2.0" }, "suggest": { "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", "twig/twig": "Assetic provides the integration with the Twig templating engine" }, @@ -356,7 +369,10 @@ "autoload": { "psr-0": { "Assetic": "src/" - } + }, + "files": [ + "src/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -376,11 +392,11 @@ "compression", "minification" ], - "time": "2012-08-28 05:33:44" + "time": "2013-02-24 17:22:20" }, { "name": "phpunit/php-code-coverage", - "version": "1.2.x-dev", + "version": "1.2.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", @@ -433,16 +449,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "dev-master", + "version": "1.3.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" + "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "1.3.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3", + "reference": "1.3.3", "shasum": "" }, "require": { @@ -469,25 +485,25 @@ } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "homepage": "http://www.phpunit.de/", "keywords": [ "filesystem", "iterator" ], - "time": "2013-01-07 10:47:05" + "time": "2012-10-11 04:44:38" }, { "name": "phpunit/php-text-template", - "version": "dev-master", + "version": "1.1.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" + "url": "git://github.com/sebastianbergmann/php-text-template.git", + "reference": "1.1.4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", + "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4", + "reference": "1.1.4", "shasum": "" }, "require": { @@ -518,20 +534,20 @@ "keywords": [ "template" ], - "time": "2013-01-07 10:56:17" + "time": "2012-10-31 11:15:28" }, { "name": "phpunit/php-timer", - "version": "1.0.x-dev", + "version": "1.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" + "url": "git://github.com/sebastianbergmann/php-timer.git", + "reference": "1.0.4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4", + "reference": "1.0.4", "shasum": "" }, "require": { @@ -558,24 +574,24 @@ } ], "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "homepage": "http://www.phpunit.de/", "keywords": [ "timer" ], - "time": "2013-01-30 06:08:51" + "time": "2012-10-11 04:45:58" }, { "name": "phpunit/php-token-stream", - "version": "dev-master", + "version": "1.1.5", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" + "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "reference": "1.1.5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", + "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5", + "reference": "1.1.5", "shasum": "" }, "require": { @@ -603,24 +619,24 @@ } ], "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "homepage": "http://www.phpunit.de/", "keywords": [ "tokenizer" ], - "time": "2013-01-07 10:56:35" + "time": "2012-10-11 04:47:14" }, { "name": "phpunit/phpunit", - "version": "3.7.15", + "version": "3.7.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.15" + "reference": "3.7.19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.15", - "reference": "3.7.15", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19", + "reference": "3.7.19", "shasum": "" }, "require": { @@ -634,7 +650,7 @@ "phpunit/php-text-template": ">=1.1.1", "phpunit/php-timer": ">=1.0.2,<1.1.0", "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.2.0" + "symfony/yaml": ">=2.0.0,<2.3.0" }, "require-dev": { "pear-pear/pear": "1.9.4" @@ -681,20 +697,20 @@ "testing", "xunit" ], - "time": "2013-03-01 11:55:06" + "time": "2013-03-25 11:45:06" }, { "name": "phpunit/phpunit-mock-objects", - "version": "1.2.x-dev", + "version": "1.2.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" + "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "1.2.3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip", + "reference": "1.2.3", "shasum": "" }, "require": { @@ -730,7 +746,7 @@ "mock", "xunit" ], - "time": "2013-02-05 07:46:41" + "time": "2013-01-13 10:24:48" }, { "name": "psr/log", @@ -772,28 +788,32 @@ }, { "name": "symfony-cmf/routing", - "version": "dev-master", + "version": "1.1.0-alpha1", "target-dir": "Symfony/Cmf/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "ea4a10" + "reference": "1.1.0-alpha1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/43585d83fb07f9354c098fcae593010567f53d45", - "reference": "ea4a10", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/1.1.0-alpha1", + "reference": "1.1.0-alpha1", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/http-kernel": ">=2.1,<2.3-dev", - "symfony/routing": ">=2.1,<2.3-dev" + "psr/log": ">=1.0,<2.0", + "symfony/http-kernel": ">=2.2,<2.3-dev", + "symfony/routing": ">=2.2,<2.3-dev" + }, + "suggest": { + "symfony/http-foundation": "ChainRouter/DynamicRouter have optional support for Request instances, several enhancers require a Request instances, >=2.2,<2.3-dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -817,21 +837,21 @@ "database", "routing" ], - "time": "2013-01-21 20:33:16" + "time": "2013-05-07 06:30:59" }, { "name": "symfony/class-loader", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -867,21 +887,21 @@ ], "description": "Symfony ClassLoader Component", "homepage": "http://symfony.com", - "time": "2013-03-01 06:43:14" + "time": "2013-03-19 08:32:26" }, { "name": "symfony/dependency-injection", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -922,21 +942,21 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2013-02-11 11:43:49" + "time": "2013-03-23 07:49:54" }, { "name": "symfony/event-dispatcher", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -980,17 +1000,17 @@ }, { "name": "symfony/http-foundation", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1026,21 +1046,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-02-26 09:42:13" + "time": "2013-04-06 10:15:43" }, { "name": "symfony/http-kernel", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1095,30 +1115,35 @@ ], "description": "Symfony HttpKernel Component", "homepage": "http://symfony.com", - "time": "2013-03-01 06:52:29" + "time": "2013-04-06 10:16:33" }, { "name": "symfony/process", - "version": "2.1.x-dev", + "version": "v2.2.1", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "v2.1.8" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://api.github.com/repos/symfony/Process/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Process": "" + "Symfony\\Component\\Process\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1137,21 +1162,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-02-18 21:27:57" + "time": "2013-03-23 07:49:54" }, { "name": "symfony/routing", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1195,21 +1220,21 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-02-11 11:24:47" + "time": "2013-03-23 12:03:22" }, { "name": "symfony/serializer", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/Serializer", "source": { "type": "git", "url": "https://github.com/symfony/Serializer.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1242,28 +1267,28 @@ ], "description": "Symfony Serializer Component", "homepage": "http://symfony.com", - "time": "2013-01-19 07:50:02" + "time": "2013-03-06 21:43:23" }, { "name": "symfony/translation", - "version": "dev-master", + "version": "v2.2.1", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/10164d84c407fd9ac5918172f86a4b94bf2b9c0b", - "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b", + "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "symfony/config": ">=2.0,<2.4-dev", + "symfony/config": ">=2.0,<2.3-dev", "symfony/yaml": ">=2.2,<3.0" }, "suggest": { @@ -1273,7 +1298,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -1297,21 +1322,21 @@ ], "description": "Symfony Translation Component", "homepage": "http://symfony.com", - "time": "2013-02-11 10:13:11" + "time": "2013-04-01 08:06:05" }, { "name": "symfony/validator", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/Validator", "source": { "type": "git", "url": "https://github.com/symfony/Validator.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1358,21 +1383,21 @@ ], "description": "Symfony Validator Component", "homepage": "http://symfony.com", - "time": "2013-02-28 14:29:34" + "time": "2013-04-01 08:06:05" }, { "name": "symfony/yaml", - "version": "v2.2.0", + "version": "v2.2.1", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -1405,20 +1430,20 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-01-27 16:49:19" + "time": "2013-03-23 07:49:54" }, { "name": "twig/twig", - "version": "v1.12.1", + "version": "v1.12.3", "source": { "type": "git", - "url": "git://github.com/fabpot/Twig.git", - "reference": "v1.12.1" + "url": "https://github.com/fabpot/Twig.git", + "reference": "v1.12.3" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/archive/v1.12.1.zip", - "reference": "v1.12.1", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3", + "reference": "v1.12.3", "shasum": "" }, "require": { @@ -1454,7 +1479,7 @@ "keywords": [ "templating" ], - "time": "2013-01-15 20:03:52" + "time": "2013-04-08 12:40:11" } ], "packages-dev": [ @@ -1463,10 +1488,16 @@ "aliases": [ ], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": { "kriswallsmith/assetic": 15, - "symfony-cmf/routing": 20, + "symfony-cmf/routing": 15, "easyrdf/easyrdf": 10 - } + }, + "platform": [ + + ], + "platform-dev": [ + + ] } diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 0000000000..91bd4cddab --- /dev/null +++ b/core/.gitignore @@ -0,0 +1,16 @@ +# SimpleTest breaks with the following files, so avoid adding them. +vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php +vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php +vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php + +# The resources for the Validator component are not required. +vendor/symfony/validator/Symfony/Component/Validator/Resources + +# Symfony Validator depends on Symfony Translation but only requires the +# TranslatorInterface. Thus, we add only the required interface from Symfony +# Translation by ignoring everything except the interface. +vendor/symfony/translation/Symfony/Component/Translation/* +!vendor/symfony/translation/Symfony/Component/Translation/TranslatorInterface.php + +# PHPUnit provides some binary dependencies that are already available. +vendor/phpunit/phpunit/build/dependencies diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore deleted file mode 100644 index 2e604cb5bc..0000000000 --- a/core/vendor/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# SimpleTest breaks with the following files, so avoid adding them. -symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php -symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php -symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php - -# The resources for the Validator component are not required. -symfony/validator/Symfony/Component/Validator/Resources - -# Symfony Validator depends on Symfony Translation but only requires the -# TranslatorInterface. Thus, we add only the required interface from Symfony -# Translation by ignoring everything except the interface. -symfony/translation/Symfony/Component/Translation/* -!symfony/translation/Symfony/Component/Translation/TranslatorInterface.php - diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php index f77afa1649..9c5340f623 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1::getLoader(); +return ComposerAutoloaderInitc244582ae2d491644d70197d64a9670b::getLoader(); diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php index 596c65d0fe..3679d46461 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 ); } @@ -129,7 +131,7 @@ public function set($prefix, $paths) return; } - $this->prefixes[$prefix] = (array) $paths; + $this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths; } /** @@ -175,7 +177,7 @@ public function unregister() * Loads the given class or interface. * * @param string $class The name of the class - * @return bool|null True, if loaded + * @return bool|null True if loaded, null otherwise */ public function loadClass($class) { @@ -191,7 +193,7 @@ public function loadClass($class) * * @param string $class The name of the class * - * @return string|null The path, if found + * @return string|false The path if found, false otherwise */ public function findFile($class) { @@ -205,7 +207,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 +215,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 060e183e4d..002677e1ff 100644 --- a/core/vendor/composer/autoload_classmap.php +++ b/core/vendor/composer/autoload_classmap.php @@ -2,351 +2,351 @@ // autoload_classmap.php generated by Composer -$vendorDir = dirname(__DIR__); -$baseDir = dirname($vendorDir); +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = dirname(dirname($vendorDir)); return array( - 'File_Iterator' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator.php', - 'File_Iterator_Facade' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator/Facade.php', - 'File_Iterator_Factory' => $baseDir . '/vendor/phpunit/php-file-iterator/File/Iterator/Factory.php', - 'PHPUnit_Extensions_GroupTestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php', - 'PHPUnit_Extensions_PhptTestCase' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php', - 'PHPUnit_Extensions_PhptTestCase_Logger' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php', - 'PHPUnit_Extensions_PhptTestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php', - 'PHPUnit_Extensions_RepeatedTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php', - 'PHPUnit_Extensions_TestDecorator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php', - 'PHPUnit_Extensions_TicketListener' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php', - 'PHPUnit_Framework_Assert' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Assert.php', - 'PHPUnit_Framework_AssertionFailedError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php', - 'PHPUnit_Framework_Comparator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator.php', - 'PHPUnit_Framework_ComparatorFactory' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php', - 'PHPUnit_Framework_Comparator_Array' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php', - 'PHPUnit_Framework_Comparator_DOMDocument' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php', - 'PHPUnit_Framework_Comparator_Double' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php', - 'PHPUnit_Framework_Comparator_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php', - 'PHPUnit_Framework_Comparator_MockObject' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php', - 'PHPUnit_Framework_Comparator_Numeric' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php', - 'PHPUnit_Framework_Comparator_Object' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php', - 'PHPUnit_Framework_Comparator_Resource' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php', - 'PHPUnit_Framework_Comparator_Scalar' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php', - 'PHPUnit_Framework_Comparator_SplObjectStorage' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php', - 'PHPUnit_Framework_Comparator_Type' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php', - 'PHPUnit_Framework_ComparisonFailure' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php', - 'PHPUnit_Framework_Constraint' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint.php', - 'PHPUnit_Framework_Constraint_And' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php', - 'PHPUnit_Framework_Constraint_ArrayHasKey' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php', - 'PHPUnit_Framework_Constraint_Attribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php', - 'PHPUnit_Framework_Constraint_Callback' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php', - 'PHPUnit_Framework_Constraint_ClassHasAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php', - 'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php', - 'PHPUnit_Framework_Constraint_Composite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php', - 'PHPUnit_Framework_Constraint_Count' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php', - 'PHPUnit_Framework_Constraint_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php', - 'PHPUnit_Framework_Constraint_ExceptionCode' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php', - 'PHPUnit_Framework_Constraint_ExceptionMessage' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php', - 'PHPUnit_Framework_Constraint_FileExists' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php', - 'PHPUnit_Framework_Constraint_GreaterThan' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php', - 'PHPUnit_Framework_Constraint_IsAnything' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php', - 'PHPUnit_Framework_Constraint_IsEmpty' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php', - 'PHPUnit_Framework_Constraint_IsEqual' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php', - 'PHPUnit_Framework_Constraint_IsFalse' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php', - 'PHPUnit_Framework_Constraint_IsIdentical' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php', - 'PHPUnit_Framework_Constraint_IsInstanceOf' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php', - 'PHPUnit_Framework_Constraint_IsNull' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php', - 'PHPUnit_Framework_Constraint_IsTrue' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php', - 'PHPUnit_Framework_Constraint_IsType' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php', - 'PHPUnit_Framework_Constraint_JsonMatches' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php', - 'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php', - 'PHPUnit_Framework_Constraint_LessThan' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php', - 'PHPUnit_Framework_Constraint_Not' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php', - 'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php', - 'PHPUnit_Framework_Constraint_Or' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php', - 'PHPUnit_Framework_Constraint_PCREMatch' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php', - 'PHPUnit_Framework_Constraint_SameSize' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php', - 'PHPUnit_Framework_Constraint_StringContains' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php', - 'PHPUnit_Framework_Constraint_StringEndsWith' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php', - 'PHPUnit_Framework_Constraint_StringMatches' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php', - 'PHPUnit_Framework_Constraint_StringStartsWith' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php', - 'PHPUnit_Framework_Constraint_TraversableContains' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php', - 'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php', - 'PHPUnit_Framework_Constraint_Xor' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php', - 'PHPUnit_Framework_Error' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error.php', - 'PHPUnit_Framework_Error_Deprecated' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php', - 'PHPUnit_Framework_Error_Notice' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php', - 'PHPUnit_Framework_Error_Warning' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php', - 'PHPUnit_Framework_Exception' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Exception.php', - 'PHPUnit_Framework_ExpectationFailedException' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php', - 'PHPUnit_Framework_IncompleteTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php', - 'PHPUnit_Framework_IncompleteTestError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php', - 'PHPUnit_Framework_MockObject_Builder_Identity' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php', - 'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php', - 'PHPUnit_Framework_MockObject_Builder_Match' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php', - 'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php', - 'PHPUnit_Framework_MockObject_Builder_Namespace' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php', - 'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php', - 'PHPUnit_Framework_MockObject_Builder_Stub' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php', - 'PHPUnit_Framework_MockObject_Generator' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php', - 'PHPUnit_Framework_MockObject_Invocation' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php', - 'PHPUnit_Framework_MockObject_InvocationMocker' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php', - 'PHPUnit_Framework_MockObject_Invocation_Object' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php', - 'PHPUnit_Framework_MockObject_Invocation_Static' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php', - 'PHPUnit_Framework_MockObject_Invokable' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php', - 'PHPUnit_Framework_MockObject_Matcher' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php', - 'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php', - 'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php', - 'PHPUnit_Framework_MockObject_Matcher_Invocation' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php', - 'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php', - 'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php', - 'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php', - 'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php', - 'PHPUnit_Framework_MockObject_Matcher_MethodName' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php', - 'PHPUnit_Framework_MockObject_Matcher_Parameters' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php', - 'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php', - 'PHPUnit_Framework_MockObject_MockBuilder' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php', - 'PHPUnit_Framework_MockObject_MockObject' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php', - 'PHPUnit_Framework_MockObject_Stub' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php', - 'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php', - 'PHPUnit_Framework_MockObject_Stub_Exception' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php', - 'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php', - 'PHPUnit_Framework_MockObject_Stub_Return' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php', - 'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php', - 'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php', - 'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php', - 'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php', - 'PHPUnit_Framework_MockObject_Verifiable' => $baseDir . '/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php', - 'PHPUnit_Framework_OutputError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/OutputError.php', - 'PHPUnit_Framework_SelfDescribing' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php', - 'PHPUnit_Framework_SkippedTest' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php', - 'PHPUnit_Framework_SkippedTestError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php', - 'PHPUnit_Framework_SkippedTestSuiteError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php', - 'PHPUnit_Framework_SyntheticError' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php', - 'PHPUnit_Framework_Test' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Test.php', - 'PHPUnit_Framework_TestCase' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php', - 'PHPUnit_Framework_TestFailure' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestFailure.php', - 'PHPUnit_Framework_TestListener' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestListener.php', - 'PHPUnit_Framework_TestResult' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php', - 'PHPUnit_Framework_TestSuite' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php', - 'PHPUnit_Framework_TestSuite_DataProvider' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php', - 'PHPUnit_Framework_Warning' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Framework/Warning.php', - 'PHPUnit_Runner_BaseTestRunner' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php', - 'PHPUnit_Runner_StandardTestSuiteLoader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php', - 'PHPUnit_Runner_TestSuiteLoader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php', - 'PHPUnit_Runner_Version' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php', - 'PHPUnit_TextUI_Command' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php', - 'PHPUnit_TextUI_ResultPrinter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php', - 'PHPUnit_TextUI_TestRunner' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php', - 'PHPUnit_Util_Class' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Class.php', - 'PHPUnit_Util_Configuration' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Configuration.php', - 'PHPUnit_Util_DeprecatedFeature' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php', - 'PHPUnit_Util_DeprecatedFeature_Logger' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php', - 'PHPUnit_Util_Diff' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Diff.php', - 'PHPUnit_Util_ErrorHandler' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php', - 'PHPUnit_Util_Fileloader' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Fileloader.php', - 'PHPUnit_Util_Filesystem' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Filesystem.php', - 'PHPUnit_Util_Filter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Filter.php', - 'PHPUnit_Util_Getopt' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Getopt.php', - 'PHPUnit_Util_GlobalState' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/GlobalState.php', - 'PHPUnit_Util_InvalidArgumentHelper' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php', - 'PHPUnit_Util_Log_JSON' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/JSON.php', - 'PHPUnit_Util_Log_JUnit' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php', - 'PHPUnit_Util_Log_TAP' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Log/TAP.php', - 'PHPUnit_Util_PHP' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP.php', - 'PHPUnit_Util_PHP_Default' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Default.php', - 'PHPUnit_Util_PHP_Windows' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php', - 'PHPUnit_Util_Printer' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Printer.php', - 'PHPUnit_Util_String' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/String.php', - 'PHPUnit_Util_Test' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Test.php', - 'PHPUnit_Util_TestDox_NamePrettifier' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php', - 'PHPUnit_Util_TestDox_ResultPrinter' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php', - 'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php', - 'PHPUnit_Util_TestDox_ResultPrinter_Text' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php', - 'PHPUnit_Util_TestSuiteIterator' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php', - 'PHPUnit_Util_Type' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/Type.php', - 'PHPUnit_Util_XML' => $baseDir . '/vendor/phpunit/phpunit/PHPUnit/Util/XML.php', - 'PHP_CodeCoverage' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php', - 'PHP_CodeCoverage_Driver' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php', - 'PHP_CodeCoverage_Driver_Xdebug' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php', - 'PHP_CodeCoverage_Exception' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php', - 'PHP_CodeCoverage_Filter' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php', - 'PHP_CodeCoverage_Report_Clover' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php', - 'PHP_CodeCoverage_Report_Factory' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php', - 'PHP_CodeCoverage_Report_HTML' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php', - 'PHP_CodeCoverage_Report_HTML_Renderer' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php', - 'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php', - 'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php', - 'PHP_CodeCoverage_Report_HTML_Renderer_File' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php', - 'PHP_CodeCoverage_Report_Node' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php', - 'PHP_CodeCoverage_Report_Node_Directory' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php', - 'PHP_CodeCoverage_Report_Node_File' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php', - 'PHP_CodeCoverage_Report_Node_Iterator' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php', - 'PHP_CodeCoverage_Report_PHP' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php', - 'PHP_CodeCoverage_Report_Text' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php', - 'PHP_CodeCoverage_Util' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php', - 'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php', - 'PHP_CodeCoverage_Version' => $baseDir . '/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php', - 'PHP_Timer' => $baseDir . '/vendor/phpunit/php-timer/PHP/Timer.php', - 'PHP_Token' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_TokenWithScope' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_TokenWithScopeAndVisibility' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ABSTRACT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_AMPERSAND' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_AND_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ARRAY' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ARRAY_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_AS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_AT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BACKTICK' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BAD_CHARACTER' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BOOLEAN_AND' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BOOLEAN_OR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BOOL_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_BREAK' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CALLABLE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CARET' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CASE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CATCH' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CHARACTER' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLASS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLASS_C' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLONE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLOSE_BRACKET' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLOSE_CURLY' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLOSE_SQUARE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CLOSE_TAG' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_COLON' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_COMMA' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_COMMENT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CONCAT_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CONST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CONSTANT_ENCAPSED_STRING' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CONTINUE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_CURLY_OPEN' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DEC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DECLARE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DEFAULT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DIR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DIV' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DIV_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DNUMBER' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DO' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOC_COMMENT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOLLAR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOLLAR_OPEN_CURLY_BRACES' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOUBLE_ARROW' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOUBLE_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOUBLE_COLON' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_DOUBLE_QUOTES' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ECHO' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ELSE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ELSEIF' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EMPTY' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENCAPSED_AND_WHITESPACE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDDECLARE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDFOR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDFOREACH' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDIF' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDSWITCH' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ENDWHILE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_END_HEREDOC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EVAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EXCLAMATION_MARK' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EXIT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_EXTENDS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FILE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FINAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FOR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FOREACH' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FUNCTION' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_FUNC_C' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_GLOBAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_GOTO' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_GT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_HALT_COMPILER' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IF' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IMPLEMENTS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INCLUDE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INCLUDE_ONCE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INLINE_HTML' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INSTANCEOF' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INSTEADOF' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INTERFACE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_INT_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_ISSET' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_GREATER_OR_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_IDENTICAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_NOT_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_NOT_IDENTICAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_IS_SMALLER_OR_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_Includes' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LINE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LIST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LNUMBER' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LOGICAL_AND' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LOGICAL_OR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LOGICAL_XOR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_LT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_METHOD_C' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_MINUS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_MINUS_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_MOD_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_MULT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_MUL_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_NAMESPACE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_NEW' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_NS_C' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_NS_SEPARATOR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_NUM_STRING' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OBJECT_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OBJECT_OPERATOR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OPEN_BRACKET' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OPEN_CURLY' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OPEN_SQUARE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OPEN_TAG' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OPEN_TAG_WITH_ECHO' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_OR_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PAAMAYIM_NEKUDOTAYIM' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PERCENT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PIPE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PLUS' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PLUS_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PRINT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PRIVATE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PROTECTED' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_PUBLIC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_QUESTION_MARK' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_REQUIRE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_REQUIRE_ONCE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_RETURN' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SEMICOLON' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SL_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SR_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_START_HEREDOC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_STATIC' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_STRING' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_STRING_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_STRING_VARNAME' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_SWITCH' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_Stream' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token/Stream.php', - 'PHP_Token_Stream_CachingFactory' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php', - 'PHP_Token_THROW' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_TILDE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_TRAIT' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_TRAIT_C' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_TRY' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_UNSET' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_UNSET_CAST' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_USE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_VAR' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_VARIABLE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_WHILE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_WHITESPACE' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'PHP_Token_XOR_EQUAL' => $baseDir . '/vendor/phpunit/php-token-stream/PHP/Token.php', - 'SessionHandlerInterface' => $baseDir . '/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php', - 'Text_Template' => $baseDir . '/vendor/phpunit/php-text-template/Text/Template.php', + 'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator.php', + 'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator/Facade.php', + 'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator/Factory.php', + 'PHPUnit_Extensions_GroupTestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php', + 'PHPUnit_Extensions_PhptTestCase' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php', + 'PHPUnit_Extensions_PhptTestCase_Logger' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php', + 'PHPUnit_Extensions_PhptTestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php', + 'PHPUnit_Extensions_RepeatedTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php', + 'PHPUnit_Extensions_TestDecorator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php', + 'PHPUnit_Extensions_TicketListener' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php', + 'PHPUnit_Framework_Assert' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Assert.php', + 'PHPUnit_Framework_AssertionFailedError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php', + 'PHPUnit_Framework_Comparator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator.php', + 'PHPUnit_Framework_ComparatorFactory' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php', + 'PHPUnit_Framework_Comparator_Array' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php', + 'PHPUnit_Framework_Comparator_DOMDocument' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php', + 'PHPUnit_Framework_Comparator_Double' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php', + 'PHPUnit_Framework_Comparator_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php', + 'PHPUnit_Framework_Comparator_MockObject' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php', + 'PHPUnit_Framework_Comparator_Numeric' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php', + 'PHPUnit_Framework_Comparator_Object' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php', + 'PHPUnit_Framework_Comparator_Resource' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php', + 'PHPUnit_Framework_Comparator_Scalar' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php', + 'PHPUnit_Framework_Comparator_SplObjectStorage' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php', + 'PHPUnit_Framework_Comparator_Type' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php', + 'PHPUnit_Framework_ComparisonFailure' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php', + 'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint.php', + 'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php', + 'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php', + 'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php', + 'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php', + 'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php', + 'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php', + 'PHPUnit_Framework_Constraint_Composite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php', + 'PHPUnit_Framework_Constraint_Count' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php', + 'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php', + 'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php', + 'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php', + 'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php', + 'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php', + 'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php', + 'PHPUnit_Framework_Constraint_IsEmpty' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php', + 'PHPUnit_Framework_Constraint_IsEqual' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php', + 'PHPUnit_Framework_Constraint_IsFalse' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php', + 'PHPUnit_Framework_Constraint_IsIdentical' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php', + 'PHPUnit_Framework_Constraint_IsInstanceOf' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php', + 'PHPUnit_Framework_Constraint_IsNull' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php', + 'PHPUnit_Framework_Constraint_IsTrue' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php', + 'PHPUnit_Framework_Constraint_IsType' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php', + 'PHPUnit_Framework_Constraint_JsonMatches' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php', + 'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php', + 'PHPUnit_Framework_Constraint_LessThan' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php', + 'PHPUnit_Framework_Constraint_Not' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php', + 'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php', + 'PHPUnit_Framework_Constraint_Or' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php', + 'PHPUnit_Framework_Constraint_PCREMatch' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php', + 'PHPUnit_Framework_Constraint_SameSize' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php', + 'PHPUnit_Framework_Constraint_StringContains' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php', + 'PHPUnit_Framework_Constraint_StringEndsWith' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php', + 'PHPUnit_Framework_Constraint_StringMatches' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php', + 'PHPUnit_Framework_Constraint_StringStartsWith' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php', + 'PHPUnit_Framework_Constraint_TraversableContains' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php', + 'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php', + 'PHPUnit_Framework_Constraint_Xor' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php', + 'PHPUnit_Framework_Error' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error.php', + 'PHPUnit_Framework_Error_Deprecated' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php', + 'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php', + 'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php', + 'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Exception.php', + 'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php', + 'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php', + 'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php', + 'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php', + 'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php', + 'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php', + 'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php', + 'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php', + 'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php', + 'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php', + 'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php', + 'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php', + 'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php', + 'PHPUnit_Framework_MockObject_Invocation_Object' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php', + 'PHPUnit_Framework_MockObject_Invocation_Static' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php', + 'PHPUnit_Framework_MockObject_Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php', + 'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php', + 'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php', + 'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php', + 'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php', + 'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php', + 'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php', + 'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php', + 'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php', + 'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php', + 'PHPUnit_Framework_MockObject_Matcher_Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php', + 'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php', + 'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php', + 'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php', + 'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php', + 'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php', + 'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php', + 'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php', + 'PHPUnit_Framework_MockObject_Stub_Return' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php', + 'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php', + 'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php', + 'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php', + 'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php', + 'PHPUnit_Framework_MockObject_Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php', + 'PHPUnit_Framework_OutputError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/OutputError.php', + 'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php', + 'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php', + 'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php', + 'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php', + 'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php', + 'PHPUnit_Framework_Test' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Test.php', + 'PHPUnit_Framework_TestCase' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestCase.php', + 'PHPUnit_Framework_TestFailure' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestFailure.php', + 'PHPUnit_Framework_TestListener' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestListener.php', + 'PHPUnit_Framework_TestResult' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestResult.php', + 'PHPUnit_Framework_TestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestSuite.php', + 'PHPUnit_Framework_TestSuite_DataProvider' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php', + 'PHPUnit_Framework_Warning' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Warning.php', + 'PHPUnit_Runner_BaseTestRunner' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php', + 'PHPUnit_Runner_StandardTestSuiteLoader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php', + 'PHPUnit_Runner_TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php', + 'PHPUnit_Runner_Version' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/Version.php', + 'PHPUnit_TextUI_Command' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/Command.php', + 'PHPUnit_TextUI_ResultPrinter' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php', + 'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php', + 'PHPUnit_Util_Class' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Class.php', + 'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Configuration.php', + 'PHPUnit_Util_DeprecatedFeature' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php', + 'PHPUnit_Util_DeprecatedFeature_Logger' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php', + 'PHPUnit_Util_Diff' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Diff.php', + 'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php', + 'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Fileloader.php', + 'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Filesystem.php', + 'PHPUnit_Util_Filter' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Filter.php', + 'PHPUnit_Util_Getopt' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Getopt.php', + 'PHPUnit_Util_GlobalState' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/GlobalState.php', + 'PHPUnit_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php', + 'PHPUnit_Util_Log_JSON' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/JSON.php', + 'PHPUnit_Util_Log_JUnit' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php', + 'PHPUnit_Util_Log_TAP' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/TAP.php', + 'PHPUnit_Util_PHP' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP.php', + 'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP/Default.php', + 'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php', + 'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Printer.php', + 'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/String.php', + 'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Test.php', + 'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php', + 'PHPUnit_Util_TestDox_ResultPrinter' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php', + 'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php', + 'PHPUnit_Util_TestDox_ResultPrinter_Text' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php', + 'PHPUnit_Util_TestSuiteIterator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php', + 'PHPUnit_Util_Type' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Type.php', + 'PHPUnit_Util_XML' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/XML.php', + 'PHP_CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage.php', + 'PHP_CodeCoverage_Driver' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php', + 'PHP_CodeCoverage_Driver_Xdebug' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php', + 'PHP_CodeCoverage_Exception' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php', + 'PHP_CodeCoverage_Filter' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php', + 'PHP_CodeCoverage_Report_Clover' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php', + 'PHP_CodeCoverage_Report_Factory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php', + 'PHP_CodeCoverage_Report_HTML' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php', + 'PHP_CodeCoverage_Report_HTML_Renderer' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php', + 'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php', + 'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php', + 'PHP_CodeCoverage_Report_HTML_Renderer_File' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php', + 'PHP_CodeCoverage_Report_Node' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php', + 'PHP_CodeCoverage_Report_Node_Directory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php', + 'PHP_CodeCoverage_Report_Node_File' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php', + 'PHP_CodeCoverage_Report_Node_Iterator' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php', + 'PHP_CodeCoverage_Report_PHP' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php', + 'PHP_CodeCoverage_Report_Text' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php', + 'PHP_CodeCoverage_Util' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php', + 'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php', + 'PHP_CodeCoverage_Version' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php', + 'PHP_Timer' => $vendorDir . '/phpunit/php-timer/PHP/Timer.php', + 'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ABSTRACT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_AMPERSAND' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_AND_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ARRAY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ARRAY_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_AS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_AT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BACKTICK' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BAD_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BOOLEAN_AND' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BOOLEAN_OR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BOOL_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_BREAK' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CALLABLE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CARET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CASE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CATCH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLASS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLASS_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLONE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLOSE_BRACKET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLOSE_CURLY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLOSE_SQUARE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CLOSE_TAG' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_COLON' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_COMMA' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_COMMENT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CONCAT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CONST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CONSTANT_ENCAPSED_STRING' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CONTINUE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_CURLY_OPEN' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DEC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DECLARE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DEFAULT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DIR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DIV' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DIV_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DNUMBER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DO' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOC_COMMENT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOLLAR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOLLAR_OPEN_CURLY_BRACES' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOUBLE_ARROW' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOUBLE_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOUBLE_COLON' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_DOUBLE_QUOTES' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ECHO' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ELSE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ELSEIF' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EMPTY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENCAPSED_AND_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDDECLARE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDFOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDFOREACH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDIF' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDSWITCH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ENDWHILE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_END_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EVAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EXCLAMATION_MARK' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EXIT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_EXTENDS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FILE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FINAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FOREACH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FUNCTION' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_FUNC_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_GLOBAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_GOTO' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_GT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_HALT_COMPILER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IF' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IMPLEMENTS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INCLUDE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INCLUDE_ONCE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INLINE_HTML' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INSTANCEOF' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INSTEADOF' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INTERFACE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_INT_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_ISSET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_GREATER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_NOT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_NOT_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_IS_SMALLER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_Includes' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LINE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LIST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LNUMBER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LOGICAL_AND' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LOGICAL_OR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LOGICAL_XOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_LT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_METHOD_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_MINUS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_MINUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_MOD_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_MULT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_MUL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_NAMESPACE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_NEW' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_NS_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_NS_SEPARATOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_NUM_STRING' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OBJECT_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OBJECT_OPERATOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OPEN_BRACKET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OPEN_CURLY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OPEN_SQUARE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OPEN_TAG' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OPEN_TAG_WITH_ECHO' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PAAMAYIM_NEKUDOTAYIM' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PERCENT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PIPE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PLUS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PLUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PRINT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PRIVATE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PROTECTED' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_PUBLIC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_QUESTION_MARK' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_REQUIRE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_REQUIRE_ONCE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_RETURN' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SEMICOLON' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_START_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_STATIC' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_STRING' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_STRING_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_STRING_VARNAME' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_SWITCH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_Stream' => $vendorDir . '/phpunit/php-token-stream/PHP/Token/Stream.php', + 'PHP_Token_Stream_CachingFactory' => $vendorDir . '/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php', + 'PHP_Token_THROW' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_TILDE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_TRAIT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_TRAIT_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_TRY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_UNSET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_UNSET_CAST' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_USE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_VAR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_VARIABLE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_WHILE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php', + 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php', + 'Text_Template' => $vendorDir . '/phpunit/php-text-template/Text/Template.php', ); diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php index 3d8eaaf67a..c2c383ac30 100644 --- a/core/vendor/composer/autoload_namespaces.php +++ b/core/vendor/composer/autoload_namespaces.php @@ -2,32 +2,32 @@ // autoload_namespaces.php generated by Composer -$vendorDir = dirname(__DIR__); -$baseDir = dirname($vendorDir); +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = dirname(dirname($vendorDir)); return array( - 'Drupal\\Driver' => $baseDir . '/../drivers/lib/', - 'Drupal\\Core' => $baseDir . '/lib/', - 'Drupal\\Component' => $baseDir . '/lib/', - '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\\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/', - 'EasyRdf_' => $vendorDir . '/easyrdf/easyrdf/lib/', - 'Doctrine\\Common' => $vendorDir . '/doctrine/common/lib/', - 'Assetic' => $vendorDir . '/kriswallsmith/assetic/src/', + '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\\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'), + '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' => 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 56de95f2dd..5271995cd7 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 ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1 +class ComposerAutoloaderInitc244582ae2d491644d70197d64a9670b { private static $loader; @@ -19,12 +19,12 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInitc244582ae2d491644d70197d64a9670b', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit7f0efddf867398398517e0ca6863b8f1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc244582ae2d491644d70197d64a9670b', 'loadClassLoader')); $vendorDir = dirname(__DIR__); - $baseDir = dirname($vendorDir); + $baseDir = dirname(dirname($vendorDir)); $includePaths = require __DIR__ . '/include_paths.php'; array_push($includePaths, get_include_path()); @@ -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,6 +42,8 @@ public static function getLoader() $loader->register(true); + require $vendorDir . '/kriswallsmith/assetic/src/functions.php'; + return $loader; } } diff --git a/core/vendor/composer/include_paths.php b/core/vendor/composer/include_paths.php index 533f1c8e31..66f70988d7 100644 --- a/core/vendor/composer/include_paths.php +++ b/core/vendor/composer/include_paths.php @@ -2,16 +2,16 @@ // include_paths.php generated by Composer -$vendorDir = dirname(__DIR__); -$baseDir = dirname($vendorDir); +$vendorDir = dirname(dirname(__FILE__)); +$baseDir = dirname(dirname($vendorDir)); 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/php-code-coverage/', - $vendorDir . '/phpunit/phpunit/', - $vendorDir . '/phpunit/phpunit/../../symfony/yaml', + $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/php-code-coverage', + $vendorDir . '/phpunit/phpunit', + $vendorDir . '/symfony/yaml', ); diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index c66ffb31b0..fe8a287294 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -1,55 +1,4 @@ [ - { - "name": "twig/twig", - "version": "v1.12.1", - "version_normalized": "1.12.1.0", - "source": { - "type": "git", - "url": "git://github.com/fabpot/Twig.git", - "reference": "v1.12.1" - }, - "dist": { - "type": "zip", - "url": "https://github.com/fabpot/Twig/archive/v1.12.1.zip", - "reference": "v1.12.1", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "time": "2013-01-15 20:03:52", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-0": { - "Twig_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com" - } - ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ] - }, { "name": "doctrine/common", "version": "2.3.0", @@ -105,7 +54,7 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" @@ -122,30 +71,26 @@ ] }, { - "name": "symfony/process", - "version": "2.1.x-dev", - "version_normalized": "2.1.9999999.9999999-dev", - "target-dir": "Symfony/Component/Process", + "name": "psr/log", + "version": "1.0.0", + "version_normalized": "1.0.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/Process.git", - "reference": "v2.1.8" + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/v2.1.8", - "reference": "v2.1.8", + "url": "https://github.com/php-fig/log/archive/1.0.0.zip", + "reference": "1.0.0", "shasum": "" }, - "require": { - "php": ">=5.3.3" - }, - "time": "2013-02-18 21:27:57", + "time": "2012-12-21 11:40:51", "type": "library", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\Process": "" + "Psr\\Log\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -154,140 +99,88 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Symfony Process Component", - "homepage": "http://symfony.com" + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ] }, { - "name": "kriswallsmith/assetic", - "version": "v1.1.0-alpha1", - "version_normalized": "1.1.0.0-alpha1", + "name": "twig/twig", + "version": "v1.12.3", + "version_normalized": "1.12.3.0", "source": { "type": "git", - "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "v1.1.0-alpha1" + "url": "https://github.com/fabpot/Twig.git", + "reference": "v1.12.3" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/zipball/v1.1.0-alpha1", - "reference": "v1.1.0-alpha1", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3", + "reference": "v1.12.3", "shasum": "" }, "require": { - "php": ">=5.3.1", - "symfony/process": "2.1.*" - }, - "require-dev": { - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "ptachoire/cssembed": "*", - "twig/twig": ">=1.6.0,<2.0" - }, - "suggest": { - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", - "twig/twig": "Assetic provides the integration with the Twig templating engine" + "php": ">=5.2.4" }, - "time": "2012-08-28 05:33:44", + "time": "2013-04-08 12:40:11", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.12-dev" } }, "installation-source": "dist", "autoload": { "psr-0": { - "Assetic": "src/" + "Twig_": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3" ], "authors": [ { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" - } - ], - "description": "Asset Management for PHP", - "homepage": "https://github.com/kriswallsmith/assetic", - "keywords": [ - "assets", - "compression", - "minification" - ] - }, - { - "name": "psr/log", - "version": "1.0.0", - "version_normalized": "1.0.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" - }, - "dist": { - "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", - "shasum": "" - }, - "time": "2012-12-21 11:40:51", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "Psr\\Log\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com" } ], - "description": "Common interface for logging libraries", + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", "keywords": [ - "log", - "psr", - "psr-3" + "templating" ] }, { "name": "symfony/http-foundation", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-02-26 09:42:13", + "time": "2013-04-06 10:15:43", "type": "library", "extra": { "branch-alias": { @@ -322,18 +215,18 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -378,18 +271,18 @@ }, { "name": "symfony/http-kernel", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "v2.2.0" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -417,7 +310,7 @@ "symfony/dependency-injection": "2.2.*", "symfony/finder": "2.2.*" }, - "time": "2013-03-01 06:52:29", + "time": "2013-04-06 10:16:33", "type": "library", "extra": { "branch-alias": { @@ -449,18 +342,18 @@ }, { "name": "symfony/routing", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "v2.2.0-RC3" + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { @@ -477,7 +370,7 @@ "symfony/config": "2.2.*", "symfony/yaml": "2.2.*" }, - "time": "2013-02-11 11:24:47", + "time": "2013-03-23 12:03:22", "type": "library", "extra": { "branch-alias": { @@ -507,57 +400,6 @@ "description": "Symfony Routing Component", "homepage": "http://symfony.com" }, - { - "name": "symfony-cmf/routing", - "version": "dev-master", - "version_normalized": "9999999-dev", - "target-dir": "Symfony/Cmf/Component/Routing", - "source": { - "type": "git", - "url": "https://github.com/symfony-cmf/Routing.git", - "reference": "ea4a10" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/43585d83fb07f9354c098fcae593010567f53d45", - "reference": "ea4a10", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/http-kernel": ">=2.1,<2.3-dev", - "symfony/routing": ">=2.1,<2.3-dev" - }, - "time": "2013-02-22 13:50:34", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "installation-source": "source", - "autoload": { - "psr-0": { - "Symfony\\Cmf\\Component\\Routing": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony CMF Community", - "homepage": "https://github.com/symfony-cmf/Routing/contributors" - } - ], - "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", - "homepage": "http://cmf.symfony.com", - "keywords": [ - "database", - "routing" - ] - }, { "name": "easyrdf/easyrdf", "version": "0.8.0-beta.1", @@ -615,25 +457,28 @@ ] }, { - "name": "symfony/yaml", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "target-dir": "Symfony/Component/Yaml", + "name": "symfony/class-loader", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "v2.2.0-RC3" + "url": "https://github.com/symfony/ClassLoader.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-27 16:49:19", + "require-dev": { + "symfony/finder": ">=2.0,<3.0" + }, + "time": "2013-03-19 08:32:26", "type": "library", "extra": { "branch-alias": { @@ -643,7 +488,7 @@ "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\Yaml\\": "" + "Symfony\\Component\\ClassLoader\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -660,400 +505,458 @@ "homepage": "http://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Symfony ClassLoader Component", "homepage": "http://symfony.com" }, { - "name": "phpunit/php-text-template", - "version": "dev-master", - "version_normalized": "9999999-dev", + "name": "symfony/dependency-injection", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18" + "url": "https://github.com/symfony/DependencyInjection.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/1eeef106193d2f8c539728e566bb4793071a9e18", - "reference": "1eeef106193d2f8c539728e566bb4793071a9e18", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-07 10:56:17", + "require-dev": { + "symfony/config": ">=2.2,<2.3-dev", + "symfony/yaml": ">=2.0,<3.0" + }, + "suggest": { + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "time": "2013-03-23 07:49:54", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "Text/" - ] + "psr-0": { + "Symfony\\Component\\DependencyInjection\\": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ] + "description": "Symfony DependencyInjection Component", + "homepage": "http://symfony.com" }, { - "name": "phpunit/phpunit-mock-objects", - "version": "1.2.x-dev", - "version_normalized": "1.2.9999999.9999999-dev", + "name": "symfony/serializer", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/Serializer", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4" + "url": "https://github.com/symfony/Serializer.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/d49b5683200b5db9b1c64cb06f52f50d147891c4", - "reference": "d49b5683200b5db9b1c64cb06f52f50d147891c4", + "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" - }, - "suggest": { - "ext-soap": "*" + "php": ">=5.3.3" }, - "time": "2013-02-05 07:46:41", + "time": "2013-03-06 21:43:23", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "PHPUnit/" - ] + "psr-0": { + "Symfony\\Component\\Serializer\\": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ] + "description": "Symfony Serializer Component", + "homepage": "http://symfony.com" }, { - "name": "phpunit/php-timer", - "version": "1.0.x-dev", - "version_normalized": "1.0.9999999.9999999-dev", + "name": "symfony/translation", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/Translation", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3" + "url": "https://github.com/symfony/Translation.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/ecf7920b27003a9412b07dad79dbb5ad1249e6c3", - "reference": "ecf7920b27003a9412b07dad79dbb5ad1249e6c3", + "url": "https://api.github.com/repos/symfony/Translation/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-30 06:08:51", + "require-dev": { + "symfony/config": ">=2.0,<2.3-dev", + "symfony/yaml": ">=2.2,<3.0" + }, + "suggest": { + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" + }, + "time": "2013-04-01 08:06:05", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "PHP/" - ] + "psr-0": { + "Symfony\\Component\\Translation\\": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ] + "description": "Symfony Translation Component", + "homepage": "http://symfony.com" }, { - "name": "phpunit/php-token-stream", - "version": "dev-master", - "version_normalized": "9999999-dev", + "name": "symfony/validator", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/Validator", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98" + "url": "https://github.com/symfony/Validator.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c25dd88e1592e66dee2553c99ef244203d5a1b98", - "reference": "c25dd88e1592e66dee2553c99ef244203d5a1b98", + "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": ">=5.3.3", + "symfony/translation": ">=2.0,<3.0" + }, + "require-dev": { + "symfony/config": ">=2.2,<2.3-dev", + "symfony/http-foundation": ">=2.1,<3.0", + "symfony/locale": ">=2.0,<3.0", + "symfony/yaml": ">=2.0,<3.0" + }, + "suggest": { + "doctrine/common": "~2.2", + "symfony/config": "2.2.*", + "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/yaml": "2.2.*" }, - "time": "2013-01-07 10:56:35", + "time": "2013-04-01 08:06:05", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "PHP/" - ] + "psr-0": { + "Symfony\\Component\\Validator\\": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "Symfony Validator Component", + "homepage": "http://symfony.com" + }, + { + "name": "guzzle/common", + "version": "v3.1.2", + "version_normalized": "3.1.2.0", + "target-dir": "Guzzle/Common", + "source": { + "type": "git", + "url": "git://github.com/guzzle/common.git", + "reference": "v3.1.2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/guzzle/common/archive/v3.1.2.zip", + "reference": "v3.1.2", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/event-dispatcher": ">=2.1" + }, + "time": "2013-01-28 00:07:40", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-0": { + "Guzzle\\Common": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Common libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", "keywords": [ - "tokenizer" + "collection", + "common", + "event", + "exception" ] }, { - "name": "phpunit/php-file-iterator", - "version": "dev-master", - "version_normalized": "9999999-dev", + "name": "guzzle/stream", + "version": "v3.1.2", + "version_normalized": "3.1.2.0", + "target-dir": "Guzzle/Stream", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26" + "url": "https://github.com/guzzle/stream", + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2deb24c65ea78e126daa8d45b2089ddc29ec1d26", - "reference": "2deb24c65ea78e126daa8d45b2089ddc29ec1d26", + "url": "https://github.com/guzzle/stream/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { - "php": ">=5.3.3" + "guzzle/common": "self.version", + "php": ">=5.3.2" }, - "time": "2013-01-07 10:47:05", + "time": "2012-12-07 16:45:11", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "File/" - ] + "psr-0": { + "Guzzle\\Stream": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "description": "Guzzle stream wrapper component", + "homepage": "http://guzzlephp.org/", "keywords": [ - "filesystem", - "iterator" + "Guzzle", + "component", + "stream" ] }, { - "name": "phpunit/php-code-coverage", - "version": "1.2.x-dev", - "version_normalized": "1.2.9999999.9999999-dev", + "name": "guzzle/parser", + "version": "v3.1.2", + "version_normalized": "3.1.2.0", + "target-dir": "Guzzle/Parser", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1.2.9" + "url": "git://github.com/guzzle/parser.git", + "reference": "v3.1.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9", - "reference": "1.2.9", + "url": "https://github.com/guzzle/parser/archive/v3.1.2.zip", + "reference": "v3.1.2", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.1.1@stable", - "phpunit/php-token-stream": ">=1.1.3@stable" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.0.5" + "php": ">=5.3.2" }, - "time": "2013-02-26 18:55:56", + "time": "2013-01-12 21:43:21", "type": "library", - "installation-source": "source", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "installation-source": "dist", "autoload": { - "classmap": [ - "PHP/" - ] + "psr-0": { + "Guzzle\\Parser": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } + "MIT" ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "description": "Interchangeable parsers used by Guzzle", + "homepage": "http://guzzlephp.org/", "keywords": [ - "coverage", - "testing", - "xunit" + "URI Template", + "cookie", + "http", + "message", + "url" ] }, { - "name": "phpunit/phpunit", - "version": "3.7.15", - "version_normalized": "3.7.15.0", + "name": "guzzle/http", + "version": "v3.1.2", + "version_normalized": "3.1.2.0", + "target-dir": "Guzzle/Http", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.15" + "url": "git://github.com/guzzle/http.git", + "reference": "v3.1.2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.15", - "reference": "3.7.15", + "url": "https://github.com/guzzle/http/archive/v3.1.2.zip", + "reference": "v3.1.2", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.2,<1.1.0", - "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", - "symfony/yaml": ">=2.2.0" - }, - "require-dev": { - "pear-pear/pear": "1.9.4" + "guzzle/common": "self.version", + "guzzle/parser": "self.version", + "guzzle/stream": "self.version", + "php": ">=5.3.2" }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" + "ext-curl": "*" }, - "time": "2013-03-01 11:55:06", - "bin": [ - "composer/bin/phpunit" - ], + "time": "2013-01-26 08:20:43", "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7.x-dev" + "dev-master": "3.0-dev" } }, "installation-source": "dist", "autoload": { - "classmap": [ - "PHPUnit/" - ] + "psr-0": { + "Guzzle\\Http": "" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", + "description": "HTTP libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", "keywords": [ - "phpunit", - "testing", - "xunit" + "Guzzle", + "client", + "curl", + "http", + "http client" ] }, { - "name": "symfony/class-loader", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "target-dir": "Symfony/Component/ClassLoader", + "name": "symfony/process", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/Process", "source": { "type": "git", - "url": "https://github.com/symfony/ClassLoader.git", - "reference": "v2.2.0" + "url": "https://github.com/symfony/Process.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/Process/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "require-dev": { - "symfony/finder": ">=2.0,<3.0" - }, - "time": "2013-03-01 06:43:14", + "time": "2013-03-23 07:49:54", "type": "library", "extra": { "branch-alias": { @@ -1063,7 +966,7 @@ "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\ClassLoader\\": "" + "Symfony\\Component\\Process\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1080,48 +983,62 @@ "homepage": "http://symfony.com/contributors" } ], - "description": "Symfony ClassLoader Component", + "description": "Symfony Process Component", "homepage": "http://symfony.com" }, { - "name": "symfony/translation", - "version": "dev-master", - "version_normalized": "9999999-dev", - "target-dir": "Symfony/Component/Translation", + "name": "kriswallsmith/assetic", + "version": "v1.1.0-alpha4", + "version_normalized": "1.1.0.0-alpha4", "source": { "type": "git", - "url": "https://github.com/symfony/Translation.git", - "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b" + "url": "https://github.com/kriswallsmith/assetic.git", + "reference": "v1.1.0-alpha4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/10164d84c407fd9ac5918172f86a4b94bf2b9c0b", - "reference": "10164d84c407fd9ac5918172f86a4b94bf2b9c0b", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.0-alpha4", + "reference": "v1.1.0-alpha4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.1", + "symfony/process": ">=2.1.0,<2.3-dev" }, "require-dev": { - "symfony/config": ">=2.0,<2.4-dev", - "symfony/yaml": ">=2.2,<3.0" + "cssmin/cssmin": "*", + "joliclic/javascript-packer": "*", + "kamicane/packager": "*", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "leafo/scssphp-compass": "*", + "mrclay/minify": "*", + "phpunit/phpunit": "3.7.*", + "ptachoire/cssembed": "*", + "twig/twig": ">=1.6.0,<2.0" }, "suggest": { - "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*" + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "twig/twig": "Assetic provides the integration with the Twig templating engine" }, - "time": "2013-02-11 10:13:11", + "time": "2013-02-24 17:22:20", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "1.1-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\Translation\\": "" - } + "Assetic": "src/" + }, + "files": [ + "src/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1129,51 +1046,39 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" } ], - "description": "Symfony Translation Component", - "homepage": "http://symfony.com" + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] }, { - "name": "symfony/validator", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "target-dir": "Symfony/Component/Validator", + "name": "symfony/yaml", + "version": "v2.2.1", + "version_normalized": "2.2.1.0", + "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", - "url": "https://github.com/symfony/Validator.git", - "reference": "v2.2.0" + "url": "https://github.com/symfony/Yaml.git", + "reference": "v2.2.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.2.0", - "reference": "v2.2.0", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.1", + "reference": "v2.2.1", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/translation": ">=2.0,<3.0" - }, - "require-dev": { - "symfony/config": ">=2.2,<2.3-dev", - "symfony/http-foundation": ">=2.1,<3.0", - "symfony/locale": ">=2.0,<3.0", - "symfony/yaml": ">=2.0,<3.0" - }, - "suggest": { - "doctrine/common": "~2.2", - "symfony/config": "2.2.*", - "symfony/http-foundation": "2.2.*", - "symfony/locale": "2.2.*", - "symfony/yaml": "2.2.*" + "php": ">=5.3.3" }, - "time": "2013-02-28 14:29:34", + "time": "2013-03-23 07:49:54", "type": "library", "extra": { "branch-alias": { @@ -1183,7 +1088,7 @@ "installation-source": "dist", "autoload": { "psr-0": { - "Symfony\\Component\\Validator\\": "" + "Symfony\\Component\\Yaml\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1200,293 +1105,413 @@ "homepage": "http://symfony.com/contributors" } ], - "description": "Symfony Validator Component", + "description": "Symfony Yaml Component", "homepage": "http://symfony.com" }, { - "name": "symfony/serializer", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "target-dir": "Symfony/Component/Serializer", + "name": "phpunit/php-text-template", + "version": "1.1.4", + "version_normalized": "1.1.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/Serializer.git", - "reference": "v2.2.0-RC3" + "url": "git://github.com/sebastianbergmann/php-text-template.git", + "reference": "1.1.4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4", + "reference": "1.1.4", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2013-01-19 07:50:02", + "time": "2012-10-31 11:15:28", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" + "installation-source": "dist", + "autoload": { + "classmap": [ + "Text/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ] + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "1.2.3", + "version_normalized": "1.2.3.0", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "1.2.3" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip", + "reference": "1.2.3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "phpunit/php-text-template": ">=1.1.1@stable" }, + "suggest": { + "ext-soap": "*" + }, + "time": "2013-01-13 10:24:48", + "type": "library", "installation-source": "dist", "autoload": { - "psr-0": { - "Symfony\\Component\\Serializer\\": "" + "classmap": [ + "PHPUnit/" + ] + }, + "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.4", + "version_normalized": "1.0.4.0", + "source": { + "type": "git", + "url": "git://github.com/sebastianbergmann/php-timer.git", + "reference": "1.0.4" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4", + "reference": "1.0.4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2012-10-11 04:45:58", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "PHP/" + ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Symfony Serializer Component", - "homepage": "http://symfony.com" + "description": "Utility class for timing", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "timer" + ] }, { - "name": "symfony/dependency-injection", - "version": "v2.2.0", - "version_normalized": "2.2.0.0", - "target-dir": "Symfony/Component/DependencyInjection", + "name": "phpunit/php-token-stream", + "version": "1.1.5", + "version_normalized": "1.1.5.0", "source": { "type": "git", - "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "v2.2.0-RC3" + "url": "git://github.com/sebastianbergmann/php-token-stream.git", + "reference": "1.1.5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.0-RC3", - "reference": "v2.2.0-RC3", + "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5", + "reference": "1.1.5", "shasum": "" }, "require": { + "ext-tokenizer": "*", "php": ">=5.3.3" }, - "require-dev": { - "symfony/config": ">=2.2,<2.3-dev", - "symfony/yaml": ">=2.0,<3.0" - }, - "suggest": { - "symfony/config": "2.2.*", - "symfony/yaml": "2.2.*" - }, - "time": "2013-02-11 11:43:49", + "time": "2012-10-11 04:47:14", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, "installation-source": "dist", "autoload": { - "psr-0": { - "Symfony\\Component\\DependencyInjection\\": "" - } + "classmap": [ + "PHP/" + ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Symfony DependencyInjection Component", - "homepage": "http://symfony.com" + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "http://www.phpunit.de/", + "keywords": [ + "tokenizer" + ] }, { - "name": "guzzle/common", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Common", + "name": "phpunit/php-file-iterator", + "version": "1.3.3", + "version_normalized": "1.3.3.0", "source": { "type": "git", - "url": "git://github.com/guzzle/common.git", - "reference": "v3.1.0" + "url": "git://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "1.3.3" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/common/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3", + "reference": "1.3.3", "shasum": "" }, "require": { - "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.1" + "php": ">=5.3.3" }, - "time": "2013-01-13 05:14:34", + "time": "2012-10-11 04:44:38", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "installation-source": "dist", "autoload": { - "psr-0": { - "Guzzle\\Common": "" - } + "classmap": [ + "File/" + ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ - "MIT" + "BSD-3-Clause" ], - "description": "Common libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", + "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": [ - "collection", - "common", - "event", - "exception" + "filesystem", + "iterator" ] }, { - "name": "guzzle/stream", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Stream", + "name": "phpunit/php-code-coverage", + "version": "1.2.9", + "version_normalized": "1.2.9.0", "source": { "type": "git", - "url": "https://github.com/guzzle/stream", - "reference": "v3.1.0" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "1.2.9" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/stream/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9", + "reference": "1.2.9", "shasum": "" }, "require": { - "guzzle/common": "self.version", - "php": ">=5.3.2" + "php": ">=5.3.3", + "phpunit/php-file-iterator": ">=1.3.0@stable", + "phpunit/php-text-template": ">=1.1.1@stable", + "phpunit/php-token-stream": ">=1.1.3@stable" }, - "time": "2012-12-07 16:45:11", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.0.5" }, + "time": "2013-02-26 18:55:56", + "type": "library", "installation-source": "dist", "autoload": { - "psr-0": { - "Guzzle\\Stream": "" - } + "classmap": [ + "PHP/" + ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Guzzle stream wrapper component", - "homepage": "http://guzzlephp.org/", + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", "keywords": [ - "Guzzle", - "component", - "stream" + "coverage", + "testing", + "xunit" ] }, { - "name": "guzzle/parser", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Parser", + "name": "phpunit/phpunit", + "version": "3.7.19", + "version_normalized": "3.7.19.0", "source": { "type": "git", - "url": "git://github.com/guzzle/parser.git", - "reference": "v3.1.0" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "3.7.19" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/parser/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.19", + "reference": "3.7.19", "shasum": "" }, "require": { - "php": ">=5.3.2" + "ext-dom": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpunit/php-code-coverage": ">=1.2.1,<1.3.0", + "phpunit/php-file-iterator": ">=1.3.1", + "phpunit/php-text-template": ">=1.1.1", + "phpunit/php-timer": ">=1.0.2,<1.1.0", + "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0", + "symfony/yaml": ">=2.0.0,<2.3.0" }, - "time": "2013-01-12 21:43:21", + "require-dev": { + "pear-pear/pear": "1.9.4" + }, + "suggest": { + "ext-json": "*", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "phpunit/php-invoker": ">=1.1.0,<1.2.0" + }, + "time": "2013-03-25 11:45:06", + "bin": [ + "composer/bin/phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.7.x-dev" } }, "installation-source": "dist", "autoload": { - "psr-0": { - "Guzzle\\Parser": "" - } + "classmap": [ + "PHPUnit/" + ] }, "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "", + "../../symfony/yaml/" + ], "license": [ - "MIT" + "BSD-3-Clause" ], - "description": "Interchangeable parsers used by Guzzle", - "homepage": "http://guzzlephp.org/", + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "http://www.phpunit.de/", "keywords": [ - "URI Template", - "cookie", - "http", - "message", - "url" + "phpunit", + "testing", + "xunit" ] }, { - "name": "guzzle/http", - "version": "v3.1.0", - "version_normalized": "3.1.0.0", - "target-dir": "Guzzle/Http", + "name": "symfony-cmf/routing", + "version": "1.1.0-alpha1", + "version_normalized": "1.1.0.0-alpha1", + "target-dir": "Symfony/Cmf/Component/Routing", "source": { "type": "git", - "url": "git://github.com/guzzle/http.git", - "reference": "v3.1.0" + "url": "https://github.com/symfony-cmf/Routing.git", + "reference": "1.1.0-alpha1" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/http/archive/v3.1.0.zip", - "reference": "v3.1.0", + "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/1.1.0-alpha1", + "reference": "1.1.0-alpha1", "shasum": "" }, "require": { - "ext-curl": "*", - "guzzle/common": "self.version", - "guzzle/parser": "self.version", - "guzzle/stream": "self.version", - "php": ">=5.3.2" + "php": ">=5.3.2", + "psr/log": ">=1.0,<2.0", + "symfony/http-kernel": ">=2.2,<2.3-dev", + "symfony/routing": ">=2.2,<2.3-dev" + }, + "suggest": { + "symfony/http-foundation": "ChainRouter/DynamicRouter have optional support for Request instances, several enhancers require a Request instances, >=2.2,<2.3-dev" }, - "time": "2013-01-13 05:09:32", + "time": "2013-05-07 06:30:59", "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.1-dev" } }, "installation-source": "dist", "autoload": { "psr-0": { - "Guzzle\\Http": "" + "Symfony\\Cmf\\Component\\Routing": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -1495,19 +1520,15 @@ ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Symfony CMF Community", + "homepage": "https://github.com/symfony-cmf/Routing/contributors" } ], - "description": "HTTP libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", + "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers", + "homepage": "http://cmf.symfony.com", "keywords": [ - "Guzzle", - "client", - "curl", - "http", - "http client" + "database", + "routing" ] } ] diff --git a/core/vendor/guzzle/common/Guzzle/Common/Collection.php b/core/vendor/guzzle/common/Guzzle/Common/Collection.php index d0857b2cc7..66505802a3 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/Collection.php +++ b/core/vendor/guzzle/common/Guzzle/Common/Collection.php @@ -365,26 +365,78 @@ public function inject($input) /** * Gets a value from the collection using an array path (e.g. foo/baz/bar would retrieve bar from two nested arrays) + * Allows for wildcard searches which recursively combine matches up to the level at which the wildcard occurs. This + * can be useful for accepting any key of a sub-array and combining matching keys from each diverging path. * * @param string $path Path to traverse and retrieve a value from * @param string $separator Character used to add depth to the search + * @param mixed $data Optional data to descend into (used when wildcards are encountered) * * @return mixed|null */ - public function getPath($path, $separator = '/') + public function getPath($path, $separator = '/', $data = null) { - $parts = explode($separator, $path); - $data = &$this->data; + // Assume the data of the collection if no data was passed into the method + if ($data === null) { + $data = &$this->data; + } + + // Break the path into an array if needed + if (!is_array($path)) { + $path = explode($separator, $path); + } // Using an iterative approach rather than recursion for speed - while (null !== ($part = array_shift($parts))) { - // Return null if this path doesn't exist or if there's more depth and the value is not an array - if (!isset($data[$part]) || ($parts && !is_array($data[$part]))) { + while (null !== ($part = array_shift($path))) { + + if (!is_array($data)) { return null; } + + // The value does not exist in the array or the path has more but the value is not an array + if (!isset($data[$part])) { + + // Not using a wildcard and the key was not found, so return null + if ($part != '*') { + return null; + } + + // If using a wildcard search, then diverge and combine paths + $result = array(); + foreach ($data as $value) { + if (!$path) { + $result = array_merge_recursive($result, (array) $value); + } else { + $test = $this->getPath($path, $separator, $value); + if ($test !== null) { + $result = array_merge_recursive($result, (array) $test); + } + } + } + + return $result; + } + + // Descend deeper into the data $data = &$data[$part]; } return $data; } + + /** + * Over write key value pairs in this collection with all of the data from an array or collection. + * + * @param array|\Traversable $data Values to override over this config + * + * @return self + */ + public function overwriteWith($data) + { + foreach ($data as $k => $v) { + $this->set($k, $v); + } + + return $this; + } } diff --git a/core/vendor/guzzle/common/Guzzle/Common/Version.php b/core/vendor/guzzle/common/Guzzle/Common/Version.php index 8fd9512943..9b8a827cc5 100644 --- a/core/vendor/guzzle/common/Guzzle/Common/Version.php +++ b/core/vendor/guzzle/common/Guzzle/Common/Version.php @@ -7,5 +7,5 @@ */ class Version { - const VERSION = '3.1.0'; + const VERSION = '3.1.2'; } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Client.php b/core/vendor/guzzle/http/Guzzle/Http/Client.php index d38ae144aa..38b40e545a 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Client.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Client.php @@ -30,6 +30,11 @@ class Client extends AbstractHasDispatcher implements ClientInterface */ protected $defaultHeaders; + /** + * @var string The user agent string to set on each request + */ + protected $userAgent; + /** * @var Collection Parameter object holding configuration data */ @@ -133,7 +138,7 @@ public function __construct($baseUrl = '', $config = null) } elseif ($certificateAuthority === false) { unset($opts[CURLOPT_CAINFO]); $opts[CURLOPT_SSL_VERIFYPEER] = false; - $opts[CURLOPT_SSL_VERIFYHOST] = 1; + $opts[CURLOPT_SSL_VERIFYHOST] = 2; } elseif ($verifyPeer !== true && $verifyPeer !== false && $verifyPeer !== 1 && $verifyPeer !== 0) { throw new InvalidArgumentException('verifyPeer must be 1, 0 or boolean'); } elseif ($verifyHost !== 0 && $verifyHost !== 1 && $verifyHost !== 2) { @@ -240,6 +245,10 @@ public function createRequest($method = RequestInterface::GET, $uri = null, $hea $url = Url::factory($this->getBaseUrl())->combine($this->expandTemplate($uri, $templateVars)); } + if ($this->userAgent) { + $this->defaultHeaders->set('User-Agent', $this->userAgent); + } + // If default headers are provided, then merge them into existing headers // If a collision occurs, the header is completely replaced if (count($this->defaultHeaders)) { @@ -283,7 +292,7 @@ public function setUserAgent($userAgent, $includeDefault = false) if ($includeDefault) { $userAgent .= ' ' . Utils::getDefaultUserAgent(); } - $this->defaultHeaders->set('User-Agent', $userAgent); + $this->userAgent = $userAgent; return $this; } diff --git a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php index 53cfbfcf0c..3d14d56c02 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php +++ b/core/vendor/guzzle/http/Guzzle/Http/Curl/CurlHandle.php @@ -72,6 +72,13 @@ public static function factory(RequestInterface $request) CURLOPT_SSL_VERIFYHOST => 2 ); + // Add CURLOPT_ENCODING if Accept-Encoding header is provided + if ($acceptEncodingHeader = $request->getHeader('Accept-Encoding')) { + $curlOptions[CURLOPT_ENCODING] = (string) $acceptEncodingHeader; + // Let cURL set the Accept-Encoding header, prevents duplicate values + $request->removeHeader('Accept-Encoding'); + } + // Enable the progress function if the 'progress' param was set if ($requestCurlOptions->get('progress')) { $curlOptions[CURLOPT_PROGRESSFUNCTION] = array($mediator, 'progress'); diff --git a/core/vendor/guzzle/http/Guzzle/Http/QueryString.php b/core/vendor/guzzle/http/Guzzle/Http/QueryString.php index 8f5c37bd9b..25b4661122 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/QueryString.php +++ b/core/vendor/guzzle/http/Guzzle/Http/QueryString.php @@ -220,6 +220,8 @@ public function isUrlEncoding() public function setAggregateFunction($callback) { $this->aggregator = $callback; + + return $this; } /** diff --git a/core/vendor/guzzle/http/Guzzle/Http/RedirectPlugin.php b/core/vendor/guzzle/http/Guzzle/Http/RedirectPlugin.php index fb80f83bfa..de481767a7 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/RedirectPlugin.php +++ b/core/vendor/guzzle/http/Guzzle/Http/RedirectPlugin.php @@ -78,8 +78,10 @@ public function onRequestSent(Event $event) // Send the redirect request and hijack the response of the original request $redirectResponse = $redirectRequest->send(); - $redirectResponse->setPreviousResponse($event['response']); $request->setResponse($redirectResponse); + if (!$redirectResponse->getPreviousResponse()) { + $redirectResponse->setPreviousResponse($response); + } } /** diff --git a/core/vendor/guzzle/http/Guzzle/Http/composer.json b/core/vendor/guzzle/http/Guzzle/Http/composer.json index b824003676..292cd83d18 100644 --- a/core/vendor/guzzle/http/Guzzle/Http/composer.json +++ b/core/vendor/guzzle/http/Guzzle/Http/composer.json @@ -13,11 +13,13 @@ ], "require": { "php": ">=5.3.2", - "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", "guzzle/stream": "self.version" }, + "suggest": { + "ext-curl": "*" + }, "autoload": { "psr-0": { "Guzzle\\Http": "" } }, diff --git a/core/vendor/kriswallsmith/assetic/.travis.yml b/core/vendor/kriswallsmith/assetic/.travis.yml deleted file mode 100644 index a801b153c3..0000000000 --- a/core/vendor/kriswallsmith/assetic/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: php - -php: - - 5.3 - - 5.4 - -before_script: - - wget http://getcomposer.org/composer.phar - - php composer.phar install --dev - - git clone https://github.com/kamicane/packager.git vendor/packager --quiet --depth 1 - - git clone https://github.com/leafo/lessphp.git vendor/lessphp --quiet --depth 1 - - git clone https://github.com/mrclay/minify.git vendor/minify --quiet --depth 1 - - svn checkout http://cssmin.googlecode.com/svn/trunk/ vendor/cssmin --quiet - - wget --quiet -O javascript-packer.zip "http://joliclic.free.fr/php/javascript-packer/telechargement.php?id=2&action=telecharger" && mkdir -p vendor/packer && unzip -qq javascript-packer.zip -d vendor/packer; rm javascript-packer.zip - -script: phpunit --configuration phpunit.travis.xml diff --git a/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md b/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md old mode 100644 new mode 100755 index 4574403e50..960bca74a2 --- a/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md +++ b/core/vendor/kriswallsmith/assetic/CHANGELOG-1.1.md @@ -1,3 +1,14 @@ +1.1.0 +----- + + * Added the possibility to configure additional load paths for less and lessphp + * Added the UglifyCssFilter + * Fixed the handling of directories in the GlobAsset. #256 + * Added Handlebars support + * Added Scssphp-compass support + * Added the CacheBustingWorker + * Added the UglifyJs2Filter + 1.1.0-alpha1 (August 28, 2012) ------------------------------ diff --git a/core/vendor/kriswallsmith/assetic/LICENSE b/core/vendor/kriswallsmith/assetic/LICENSE index 1060e5b03a..50b8e21954 100644 --- a/core/vendor/kriswallsmith/assetic/LICENSE +++ b/core/vendor/kriswallsmith/assetic/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2010-2012 OpenSky Project Inc +Copyright (c) 2010-2013 OpenSky Project Inc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/core/vendor/kriswallsmith/assetic/README.md b/core/vendor/kriswallsmith/assetic/README.md index e12e341956..c9308c05dc 100644 --- a/core/vendor/kriswallsmith/assetic/README.md +++ b/core/vendor/kriswallsmith/assetic/README.md @@ -1,4 +1,4 @@ -# Assetic ![project status](http://stillmaintained.com/kriswallsmith/assetic.png) # +# Assetic [![Build Status](https://travis-ci.org/kriswallsmith/assetic.png?branch=master)](https://travis-ci.org/kriswallsmith/assetic) ![project status](http://stillmaintained.com/kriswallsmith/assetic.png) # Assetic is an asset management framework for PHP. @@ -73,24 +73,36 @@ foreach ($css as $leaf) { The core provides the following filters in the `Assetic\Filter` namespace: * `CoffeeScriptFilter`: compiles CoffeeScript into Javascript + * `CompassFilter`: Compass CSS authoring framework * `CssEmbedFilter`: embeds image data in your stylesheets * `CssImportFilter`: inlines imported stylesheets * `CssMinFilter`: minifies CSS * `CssRewriteFilter`: fixes relative URLs in CSS assets when moving to a new URL + * `DartFilter`: compiles Javascript using dart2js * `GoogleClosure\CompilerApiFilter`: compiles Javascript using the Google Closure Compiler API * `GoogleClosure\CompilerJarFilter`: compiles Javascript using the Google Closure Compiler JAR + * `GssFilter`: compliles CSS using the Google Closure Stylesheets Compiler + * `HandlebarsFilter`: compiles Handlebars templates into Javascript * `JpegoptimFilter`: optimize your JPEGs * `JpegtranFilter`: optimize your JPEGs + * `JSMinFilter`: minifies Javascript + * `JSMinPlusFilter`: minifies Javascript * `LessFilter`: parses LESS into CSS (using less.js with node.js) * `LessphpFilter`: parses LESS into CSS (using lessphp) * `OptiPngFilter`: optimize your PNGs + * `PackagerFilter`: parses Javascript for packager tags * `PackerFilter`: compresses Javascript using Dean Edwards's Packer + * `PhpCssEmbedFilter`: embeds image data in your stylesheet * `PngoutFilter`: optimize your PNGs - * `CompassFilter`: Compass CSS authoring framework * `Sass\SassFilter`: parses SASS into CSS * `Sass\ScssFilter`: parses SCSS into CSS + * `ScssphpFilter`: parses SCSS using scssphp * `SprocketsFilter`: Sprockets Javascript dependency management * `StylusFilter`: parses STYL into CSS + * `TypeScriptFilter`: parses TypeScript into Javascript + * `UglifyCssFilter`: minifies CSS + * `UglifyJs2Filter`: minifies Javascript + * `UglifyJsFilter`: minifies Javascript * `Yui\CssCompressorFilter`: compresses CSS using the YUI compressor * `Yui\JsCompressorFilter`: compresses Javascript using the YUI compressor @@ -198,6 +210,36 @@ $js->dump(); $js->dump(); ``` +Cache Busting +------------- + +You can use the CacheBustingWorker to provide unique names. + +Two strategies are provided: CacheBustingWorker::STRATEGY_CONTENT (content based), CacheBustingWorker::STRATEGY_MODIFICATION (modification time based) + +``` php +setAssetManager($am); +$factory->setFilterManager($fm); +$factory->setDebug(true); +$factory->addWorker(new CacheBustingWorker(CacheBustingWorker::STRATEGY_CONTENT)); + +$css = $factory->createAsset(array( + '@reset', // load the asset manager's "reset" asset + 'css/src/*.scss', // load every scss files from "/path/to/asset/directory/css/src/" +), array( + 'scss', // filter through the filter manager's "scss" filter + '?yui_css', // don't use this filter in debug mode +)); + +echo $css->dump(); +``` + Static Assets ------------- diff --git a/core/vendor/kriswallsmith/assetic/composer.json b/core/vendor/kriswallsmith/assetic/composer.json index dec9cbd271..7e15e91f39 100644 --- a/core/vendor/kriswallsmith/assetic/composer.json +++ b/core/vendor/kriswallsmith/assetic/composer.json @@ -2,7 +2,7 @@ "name": "kriswallsmith/assetic", "minimum-stability": "dev", "description": "Asset Management for PHP", - "keywords": ["assets", "compression", "minification"], + "keywords": [ "assets", "compression", "minification" ], "homepage": "https://github.com/kriswallsmith/assetic", "type": "library", "license": "MIT", @@ -15,27 +15,77 @@ ], "require": { "php": ">=5.3.1", - "symfony/process": "2.1.*" + "symfony/process": ">=2.1.0,<2.3-dev" }, "require-dev": { + "phpunit/phpunit": "3.7.*", "twig/twig": ">=1.6.0,<2.0", "leafo/lessphp": "*", "leafo/scssphp": "*", - "ptachoire/cssembed": "*" + "ptachoire/cssembed": "*", + "leafo/scssphp-compass": "*", + + "cssmin/cssmin": "*", + "mrclay/minify": "*", + "kamicane/packager": "*", + "joliclic/javascript-packer": "*" }, "minimum-stability": "dev", "suggest": { "twig/twig": "Assetic provides the integration with the Twig templating engine", "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris" + "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", + "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" }, "autoload": { - "psr-0": { "Assetic": "src/" } + "psr-0": { "Assetic": "src/" }, + "files": [ "src/functions.php" ] + }, + "config": { + "bin-dir": "bin" }, "extra": { "branch-alias": { "dev-master": "1.1-dev" } - } + }, + "repositories": [ + { + "type": "package", + "package": { + "name": "cssmin/cssmin", + "version": "3.0.1", + "dist": { "url": "http://cssmin.googlecode.com/files/cssmin-v3.0.1.php", "type": "file" }, + "autoload": { "classmap": [ "cssmin-v3.0.1.php" ] } + } + }, + { + "type": "package", + "package": { + "name": "mrclay/minify", + "version": "2.1.5", + "dist": { "url": "http://minify.googlecode.com/files/minify-2.1.5.zip", "type": "zip" }, + "autoload": { "classmap": [ "min/lib/" ] } + } + }, + { + "type": "package", + "package": { + "name": "kamicane/packager", + "version": "1.0", + "dist": { "url": "https://github.com/kamicane/packager/archive/1.0.zip", "type": "zip" }, + "autoload": { "classmap": [ "." ] } + } + }, + { + "type": "package", + "package": { + "name": "joliclic/javascript-packer", + "version": "1.1", + "dist": { "url": "http://joliclic.free.fr/php/javascript-packer/telechargement.php?id=2&action=telecharger", "type": "zip" }, + "autoload": { "classmap": [ "class.JavaScriptPacker.php" ] } + } + } + ] } diff --git a/core/vendor/kriswallsmith/assetic/docs/en/build.md b/core/vendor/kriswallsmith/assetic/docs/en/build.md deleted file mode 100644 index d560172cb7..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/en/build.md +++ /dev/null @@ -1,32 +0,0 @@ -Building and Dumping Assets ---------------------------- - -The is the simplest approach to using Assetic. It involves two steps: - - 1. Create a PHP script in your web directory that uses the Assetic OOP API to - create and output an asset. - 2. Reference that file from your template. - -For example, you could create a file in your web directory at -`assets/javascripts.php` with the following code: - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\FileAsset; - use Assetic\Filter\Yui\JsCompressorFilter as YuiCompressorFilter; - - $js = new AssetCollection(array( - new FileAsset(__DIR__.'/jquery.js'), - new FileAsset(__DIR__.'/application.js'), - ), array( - new YuiCompressorFilter('/path/to/yuicompressor.jar'), - )); - - header('Content-Type: application/js'); - echo $js->dump(); - -In your HTML template you would include this generated Javascript using a -simple ` - -Next: [Basic Concepts](concepts.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/en/concepts.md b/core/vendor/kriswallsmith/assetic/docs/en/concepts.md deleted file mode 100644 index 7af7b1f2f6..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/en/concepts.md +++ /dev/null @@ -1,129 +0,0 @@ -In order to use the Assetic OOP API you must first understand the two central -concepts of Assetic: assets and filters. - -### What is an Asset? - -As asset is an object that has content and metadata which can be loaded and -dumped. Your assets will probably fall into three categories: Javascripts, -stylesheets and images. Most assets will be loaded from files in your -filesystem, but they can also be loaded via HTTP, a database, from a string, -or virtually anything else. All that an asset has to do is fulfill Assetic's -basic asset interface. - -### What is a Filter? - -A filter is an object that acts upon an asset's content when that asset is -loaded and/or dumped. Similar to assets, a filter can do virtually anything, -as long as it implements Assetic's filter interface. - -Here is a list of some of the tools that can be applied to assets using a -filter: - - * CoffeeScript - * CssEmbed - * CssMin - * Google Closure Compiler - * jpegoptim - * jpegtran - * Less - * LessPHP - * optipng - * Packager - * pngout - * SASS - * Sprockets (version 1) - * Stylus - * YUI Compressor - -### Using Assets and Filters - -You need to start by creating an asset object. This will probably mean -instantiating a `FileAsset` instance, which takes a filesystem path as its -first argument: - - $asset = new Assetic\Asset\FileAsset('/path/to/main.css'); - -Once you have an asset you can begin adding filters to it by calling -`ensureFilter()`. For example, you can add a filter that applies the YUI -Compressor to the contents of the asset: - - $yui = new Assetic\Filter\Yui\CssCompressorFilter('/path/to/yui.jar'); - $asset->ensureFilter($yui); - -Once you've added as many filters as you'd like you can output the finished -asset to the browser: - - header('Content-Type: text/css'); - echo $asset->dump(); - -### Asset Collections - -It is a good idea to combine assets of the same type into a single file to -avoid unnecessary HTTP requests. You can do this in Assetic using the -`AssetCollection` class. This class is just like any other asset in Assetic's -eyes as it implements the asset interface, but under the hood it allows you to -combine multiple assets into one. - - use Assetic\Asset\AssetCollection; - - $asset = new AssetCollection(array( - new FileAsset('/path/to/js/jquery.js'), - new FileAsset('/path/to/js/jquery.plugin.js'), - new FileAsset('/path/to/js/application.js'), - )); - -### Nested Asset Collections - -The collection class implements the asset interface and all assets passed into -a collection must implement the same interface, which means you can easily -nest collections within one another: - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\GlobAsset; - use Assetic\Asset\HttpAsset; - - $asset = new AssetCollection(array( - new HttpAsset('http://example.com/jquery.min.js'), - new GlobAsset('/path/to/js/*'), - )); - -The `HttpAsset` class is a special asset class that loads a file over HTTP; -`GlobAsset` is a special asset collection class that loads files based on a -filesystem glob -- both implement the asset interface. - -This concept of nesting asset collection become even more powerful when you -start applying different sets of filters to each collection. Imagine some of -your application's stylesheets are written in SASS, while some are written in -vanilla CSS. You can combine all of these into one seamless CSS asset: - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\GlobAsset; - use Assetic\Filter\SassFilter; - use Assetic\Filter\Yui\CssCompressorFilter; - - $css = new AssetCollection(array( - new GlobAsset('/path/to/sass/*.sass', array(new SassFilter())), - new GlobAsset('/path/to/css/*.css'), - ), array( - new YuiCompressorFilter('/path/to/yuicompressor.jar'), - )); - -You'll notice I've also applied the YUI compressor filter to the combined -asset so all CSS will be minified. - -### Iterating over an Asset Collection - -Once you have an asset collection you can iterate over it like you would a -plain old PHP array: - - echo "Source paths:\n"; - foreach ($collection as $asset) { - echo ' - '.$asset->getSourcePath()."\n"; - } - -The asset collection iterates recursively, which means you will only see the -"leaf" assets during iteration. Iteration also includes a smart filter which -ensures you only see each asset once, even if the same asset has been included -multiple times. - -Next: [Defining Assets "On The Fly"](define.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/en/define.md b/core/vendor/kriswallsmith/assetic/docs/en/define.md deleted file mode 100644 index 3d8d3b13b6..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/en/define.md +++ /dev/null @@ -1,145 +0,0 @@ -Defining Assets "On The Fly" ----------------------------- - -The second approach to using Assetic involves defining your application's -assets "on the fly" in your templates, instead of in an isolated PHP file. -Using this approach, your PHP template would look something like this: - - - -This call to `assetic_javascripts()` serves a dual purpose. It will be read by -the Assetic "formula loader" which will extract an asset "formula" that can be -used to build, dump and output the asset. It will also be executed when the -template is rendered, at which time the path to the output asset is output. - -Assetic includes the following templating helper functions: - - * `assetic_image()` - * `assetic_javascripts()` - * `assetic_stylesheets()` - -Defining assets on the fly is a much more sophisticated technique and -therefore relies on services to do the heavy lifting. The main one being the -asset factory. - -### Asset Factory - -The asset factory knows how to create asset objects using only arrays and -scalar values as input. This is the same string syntax used by the `assetic_*` -template helper functions. - - use Assetic\Factory\AssetFactory; - - $factory = new AssetFactory('/path/to/web'); - $js = $factory->createAsset(array( - 'js/jquery.js', - 'js/jquery.plugin.js', - 'js/application.js', - )); - -### Filter Manager - -You can also apply filters to asset created by the factory. To do this you -must setup a `FilterManager`, which organizes filters by a name. - - use Assetic\FilterManager; - use Assetic\Filter\GoogleClosure\ApiFilter as ClosureFilter; - - $fm = new FilterManager(); - $fm->set('closure', new ClosureFilter()); - $factory->setFilterManager($fm); - - $js = $factory->createAsset('js/*', 'closure'); - -This code creates an instance of the Google Closure Compiler filter and -assigns it the name `closure` using a filter manager. This filter manager is -then injected into the asset factory, making the filter available as `closure` -when creating assets. - -### Debug Mode - -The asset factory also introduces the concept of a debug mode. This mode -allows you to omit certain filters from assets the factory creates depending -on whether it is enabled or not. - -For example, the YUI Compressor is awesome, but it is only appropriate in a -production environment as it is very difficult to debug minified Javascript. - - use Asset\Factory\AssetFactory; - - $factory = new AssetFactory('/path/to/web', true); // debug mode is on - $factory->setFilterManager($fm); - $js = $factory->createAsset('js/*', '?closure'); - -By prefixing the `closure` filter's name with a question mark, we are telling -the factory this filter is optional and should only be applied with debug mode -is off. - -### Asset Manager and Asset References - -The asset factory provides another special string syntax that allows you to -reference assets you defined elsewhere. These are called "asset references" -and involve an asset manager which, similar to the filter manager, organizes -assets by name. - - use Assetic\AssetManager; - use Assetic\Asset\FileAsset; - use Assetic\Factory\AssetFactory; - - $am = new AssetManager(); - $am->set('jquery', new FileAsset('/path/to/jquery.js')); - - $factory = new AssetFactory('/path/to/web'); - $factory->setAssetManager($am); - - $js = $factory->createAsset(array( - '@jquery', - 'js/application.js', - )); - -### Extracting Assets from Templates - -Once you've defined a set of assets in your templates you must use the -"formula loader" service to extract these asset definitions. - - use Assetic\Factory\Loader\FunctionCallsFormulaLoader; - use Assetic\Factory\Resource\FileResource; - - $loader = new FunctionCallsFormulaLoader($factory); - $formulae = $loader->load(new FileResource('/path/to/template.php')); - -These asset formulae aren't much use by themselves. They each include just -enough information for the asset factory to create the intended asset object. -In order for these to be useful they must be wrapped in the special -`LazyAssetManager`. - -### The Lazy Asset Manager - -This service is a composition of the asset factory and one or more formula -loaders. It acts as the glue between these services behind the scenes, but can -be used just like a normal asset manager on the surface. - - use Assetic\Asset\FileAsset; - use Assetic\Factory\LazyAssetManager; - use Assetic\Factory\Loader\FunctionCallsFormulaLoader; - use Assetic\Factory\Resource\DirectoryResource; - - $am = new LazyAssetManager($factory); - $am->set('jquery', new FileAsset('/path/to/jquery.js')); - $am->setLoader('php', new FunctionCallsFormulaLoader($factory)); - $am->addResource(new DirectoryResource('/path/to/templates', '/\.php$/'), 'php'); - -### Asset Writer - -Finally, once you've create an asset manager that knows about every asset -you've defined in your templates, you must use an asset writer to actually -create the files your templates are going to be referencing. - - use Assetic\AssetWriter; - - $writer = new AssetWriter('/path/to/web'); - $writer->writeManagerAssets($am); - -After running this script, all of the assets in your asset manager will be -loaded into memory, filtered with their configured filters and dumped to your -web directory as static files, ready to be served. diff --git a/core/vendor/kriswallsmith/assetic/docs/en/index.md b/core/vendor/kriswallsmith/assetic/docs/en/index.md deleted file mode 100644 index 46dc590f9e..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/en/index.md +++ /dev/null @@ -1,7 +0,0 @@ -Table Of Contents ------------------ - - 1. [Introduction](introduction.md) - 2. [Building and Dumping Assets](build.md) - 3. [Basic Concepts](concepts.md) - 4. [Defining Assets "On The Fly"](define.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/en/introduction.md b/core/vendor/kriswallsmith/assetic/docs/en/introduction.md deleted file mode 100644 index 352f496166..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/en/introduction.md +++ /dev/null @@ -1,21 +0,0 @@ -What is Assetic? ----------------- - -Assetic is an asset management framework for PHP 5.3. Assetic enables you to -use a variety of third party tools that will help bring order to your -application's Javascripts, stylesheets and images. - -How Do I Use Assetic? ---------------------- - -There are two distinct approaches you can take when using Assetic: - - 1. Build, dump and output assets in PHP files that you reference directly - from your templates - 2. Defining assets in your templates ("on the fly") and use a loader to - extract, dump and output them - -The first approach is simpler, but the second, with all its moving parts, -offers more flexibility and opportunity for optimization. - -Next: [Building and Dumping Assets](build.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/ja/build.md b/core/vendor/kriswallsmith/assetic/docs/ja/build.md deleted file mode 100644 index bee59ba659..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/ja/build.md +++ /dev/null @@ -1,30 +0,0 @@ -アセットのビルドとダンプ ---------------------------- - -Asseticを使う一番単純な方法は、次の2ステップからなります。 - - 1. 公開領域内にPHPスクリプトを作成し、Assetic OOP APIを使用してアセットの作成・出力を行う - 2. テンプレートから上記のファイルを参照する - -例えば、公開領域内に`assets/javascripts.php`ファイルを作成し、 -下記のようなコードを記述します。 - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\FileAsset; - use Assetic\Filter\Yui\JsCompressorFilter as YuiCompressorFilter; - - $js = new AssetCollection(array( - new FileAsset(__DIR__.'/jquery.js'), - new FileAsset(__DIR__.'/application.js'), - ), array( - new YuiCompressorFilter('/path/to/yuicompressor.jar'), - )); - - header('Content-Type: application/js'); - echo $js->dump(); - -HTMLテンプレート側では、単に` - -Next: [コンセプト](concepts.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/ja/concepts.md b/core/vendor/kriswallsmith/assetic/docs/ja/concepts.md deleted file mode 100644 index 3479b20eea..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/ja/concepts.md +++ /dev/null @@ -1,121 +0,0 @@ -Assetic OOP APIを使用するためには、まず、[アセット」と「フィルタ」の2つの重要なコンセプトを理解する必要があります。 - -### アセット - -アセットとは、読み込み、及びダンプが可能な、コンテンツとメタデータを内包しているオブジェクトの事を指します。 -大体の場合において3つのカテゴリー、すなわち、Javascriptとスタイルシート、画像のどれかに属することになるでしょう。 -読み込みの方法としては、ファイルシステムからがほとんどですが、 -HTTPやデータベース経由でも、文字列としてでも読み込みが可能で、事実上あらゆるものが読み込み可能です。 -Asseticのアセットインターフェースを満足させさえすれば良いのです。 - - -### フィルタ - -フィルタは、アセットが読み込まれる、かつ/もしくは、ダンプされる際に、 -アセットコンテンツに対して作用するオブジェクトです。 -アセットと同様に、Asseticのフィルタインターフェースを実装することで、 -どのような作用も可能になります。 - -フィルタを用いて、アセットに適用できるツール群の一覧です。 - - * CoffeeScript - * CssEmbed - * CssMin - * Google Closure Compiler - * jpegoptim - * jpegtran - * Less - * LessPHP - * optipng - * Packager - * pngout - * SASS - * Sprockets (version 1) - * Stylus - * YUI Compressor - - -### アセットとフィルタの使用 - -まずはアセットオブジェクトを作成することから始まります。 -多くの場合は`FileAsset`をインスタンス化し、ファイルシステムのパスを第一引数に渡します。 - - $asset = new Assetic\Asset\FileAsset('/path/to/main.css'); - -アセットオブジェクトを作成したら、`ensureFilter()`を呼び、フィルタを追加します。 -例えば、アセットコンテンツにYUI Compressorを適用してみましょう。 - - $yui = new Assetic\Filter\Yui\CssCompressorFilter('/path/to/yui.jar'); - $asset->ensureFilter($yui); - -任意のフィルタを追加したら、完成したアセットをブラウザに出力してみましょう。 - - header('Content-Type: text/css'); - echo $asset->dump(); - -### アセットコレクション - -1つのファイルに同じ種類のアセットをまとめて、不要なHTTPリクエストを抑えてみるのも良いでしょう。 -Asseticでは`AsseticColletion`クラスを使用することで可能となります。 -Assetic内部的には、このクラス自体は他のアセットと同様に、アセットインターフェースを実装したものですが、 -複数のアセットを1つにまとめることが可能になります。 - - use Assetic\Asset\AssetCollection; - - $asset = new AssetCollection(array( - new FileAsset('/path/to/js/jquery.js'), - new FileAsset('/path/to/js/jquery.plugin.js'), - new FileAsset('/path/to/js/application.js'), - )); - -### ネストしたアセットコレクション - -コレクションクラス自体がアセットインターフェースを実装し、コレクション内のアセットも同様に -アセットインターフェースを実装しているので、簡単にネストすることができます。 - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\GlobAsset; - use Assetic\Asset\HttpAsset; - - $asset = new AssetCollection(array( - new HttpAsset('http://example.com/jquery.min.js'), - new GlobAsset('/path/to/js/*'), - )); - -`HttpAsset`は、HTTP経由でファイルを読み込むアセットクラス。 -`GlobAsset`は、ファイルシステムのglobを基にファイル群を読み込むアセットコレクションクラス。 -両者ともにアセットインターフェースを実装しています。 - -このネストしたアセットコレクションという概念は、コレクションそれぞれに異なる -フィルタ群を適用しようとしたときに、効果を発揮します。 -例えば、スタイルシートがSAASで記述されたものと、vanilla CSSを用いて記述されたものからなる -アプリケーションを考えた場合、次のようにして、全てを1つのシームレスなCSSアセットにまとめることができます。 - - use Assetic\Asset\AssetCollection; - use Assetic\Asset\GlobAsset; - use Assetic\Filter\SassFilter; - use Assetic\Filter\Yui\CssCompressorFilter; - - $css = new AssetCollection(array( - new GlobAsset('/path/to/sass/*.sass', array(new SassFilter())), - new GlobAsset('/path/to/css/*.css'), - ), array( - new YuiCompressorFilter('/path/to/yuicompressor.jar'), - )); - -上記の例では、1つにまとめられたCSSを、さらにYUI compressorフィルタを適用することで、全体を圧縮しています。 - -### アセットコレクションのイテレーション - -アセットコレクションは、旧来のPHP配列のように、イテレートできます。 - - echo "Source paths:\n"; - foreach ($collection as $asset) { - echo ' - '.$asset->getSourcePath()."\n"; - } - -アセットコレクションのイテレーションは再帰的で、「葉」にあたるアセットの取得を行います。 -また、気の利いたフィルタを内蔵しているので、同じアセットがコレクション内に複数存在する場合でも、 -一度だけのインクルードが保証されます。 - -Next: [アセットを「オンザフライ」で定義する](define.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/ja/define.md b/core/vendor/kriswallsmith/assetic/docs/ja/define.md deleted file mode 100644 index 3b0443610b..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/ja/define.md +++ /dev/null @@ -1,140 +0,0 @@ -アセットの「オンザフライ」な定義 ----------------------------------------- - -Asseticの使用方法二つ目は、独立したPHPファイルを使用する代わりに、 -テンプレートで「オンザフライ」にアセット定義をする方法です。 -このアプローチでは、PHPテンプレートは下記のようになります。 - - - -`assetic_javascripts()`の呼び出しは2つの目的を兼ねています。 -まず、「フォーミュラローダー」により走査され、アセットの構築、ダンプ、及び出力を行うための「フォーミュラ(処方箋)」が抽出されます。 -また、テンプレートのレンダー時にも実行され、アセットの出力パスが出力されます。 - -Asseticには下記のようなヘルパー関数があります。 - - * `assetic_image()` - * `assetic_javascripts()` - * `assetic_stylesheets()` - -アセットをオンザフライに定義するということは、より高度なテクニックであり、 -そのため、重い仕事をするサービスに依存することになります。 -そのうちの重要なものがアセットファクトリです。 - -### アセットファクトリ - -アセットファクトリは、アセットオブジェクトを、配列とスカラ値のみから、 -どのように作成するのか把握しています。 -`assetic_*`ヘルパー関数で使用する記法と同様のものとなります。 - - use Assetic\Factory\AssetFactory; - - $factory = new AssetFactory('/path/to/web'); - $js = $factory->createAsset(array( - 'js/jquery.js', - 'js/jquery.plugin.js', - 'js/application.js', - )); - -### フィルタマネージャー - -ファクトリによって作成されたアセットに対しても、フィルタを適用することができます。 -そのためには、`FilterManager`を設定して、名前を定義しフィルタを構成します。 - - use Assetic\FilterManager; - use Assetic\Filter\GoogleClosure\ApiFilter as ClosureFilter; - - $fm = new FilterManager(); - $fm->set('closure', new ClosureFilter()); - $factory->setFilterManager($fm); - - $js = $factory->createAsset('js/*', 'closure'); - -上記の例では、Google Closure Compilerフィルタをインスタンス化し、 -フィルタマネージャーを通じて`closure`という名前をつけています。 -このフィルタマネージャーをアセットファクトリに渡すことで、 -アセット作成時には、`closure`という名前でフィルタを使用できるようになります。 - -### デバッグモード - -アセットファクトリは、デバッグモードというコンセプトも取り入れており、 -デバッグモードの設定により、ファクトリが作成するアセットから、 -特定のフィルタを除外することができます。 - -たとえば、YUI Compressorは大変素晴らしいのですが、圧縮されたJavascriptを -デバッグするのは大変難しく、プロダクション環境でのみの使用が適切でしょう。 - - use Asset\Factory\AssetFactory; - - $factory = new AssetFactory('/path/to/web', true); // デバッグモードON - $factory->setFilterManager($fm); - $js = $factory->createAsset('js/*', '?closure'); - -フィルタ名`closure`の前にクエスチョンマークを記述すると、ファクトリに対して、 -このフィルタはオプションであり、 -デバッグモードがOFFの時にのみ適用するように通知することができます。 - -### アセットマネージャーとアセットリファレンス - -アセットファクトリにはもう一つ特別な記法があり、別の場所で定義した -アセットを参照することができるようになります。 -これを「アセットリファレンス」と呼び、アセットマネージャーを通じて、 -フィルタマネージャーと同様の、名前によるアセットの構成が可能です。 - - use Assetic\AssetManager; - use Assetic\Asset\FileAsset; - use Assetic\Factory\AssetFactory; - - $am = new AssetManager(); - $am->set('jquery', new FileAsset('/path/to/jquery.js')); - - $factory = new AssetFactory('/path/to/web'); - $factory->setAssetManager($am); - - $js = $factory->createAsset(array( - '@jquery', - 'js/application.js', - )); - -### テンプレートからのアセット抽出 - -テンプレート内でアセット群を定義したら、「フォーミュラローダー」サービスを使用して、 -アセットの定義を抽出します。 - - use Assetic\Factory\Loader\FunctionCallsFormulaLoader; - use Assetic\Factory\Resource\FileResource; - - $loader = new FunctionCallsFormulaLoader($factory); - $formulae = $loader->load(new FileResource('/path/to/template.php')); - -これらのフォーミュラ自体は、それ自体で使途はあまりなく、 -アセットファクトリが目的のアセットオブジェクトを作成するに足る情報しか持っていません。 -`LazyAssetManager`でラップすることで有益なものとなります。 - -### レイジーなアセットマネージャー - -このサービスは、アセットファクトリと、1つ以上のフォーミュラローダーから成っており、 -裏方のサービス間のグルとして動作しますが、表面上では、通常のアセットマネージャーと同じように使用することができます。 - - use Assetic\Asset\FileAsset; - use Assetic\Factory\LazyAssetManager; - use Assetic\Factory\Loader\FunctionCallsFormulaLoader; - use Assetic\Factory\Resource\DirectoryResource; - - $am = new LazyAssetManager($factory); - $am->set('jquery', new FileAsset('/path/to/jquery.js')); - $am->setLoader('php', new FunctionCallsFormulaLoader($factory)); - $am->addResource(new DirectoryResource('/path/to/templates', '/\.php$/'), 'php'); - -### アセットライター - -作成したアセットマネージャーが、テンプレート内で定義した全てのアセットを把握したら、 -アセットライターを使用して、テンプレートが参照することになる実際のファイルを作成します。 - - use Assetic\AssetWriter; - - $writer = new AssetWriter('/path/to/web'); - $writer->writeManagerAssets($am); - -上記のスクリプトを実行すると、アセットマネージャー内のすべてのアセットがメモリに読み込まれ、 -指定したフィルタが適用された後、公開領域に静的ファイルとしてダンプされ、準備完了となります。 diff --git a/core/vendor/kriswallsmith/assetic/docs/ja/index.md b/core/vendor/kriswallsmith/assetic/docs/ja/index.md deleted file mode 100644 index 138280d2e6..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/ja/index.md +++ /dev/null @@ -1,7 +0,0 @@ -目次 ------ - - 1. [イントロダクション](introduction.md) - 2. [アセットの構築とダンプ](build.md) - 3. [コンセプト](concepts.md) - 4. [アセットを「オンザフライ」で定義する](define.md) diff --git a/core/vendor/kriswallsmith/assetic/docs/ja/introduction.md b/core/vendor/kriswallsmith/assetic/docs/ja/introduction.md deleted file mode 100644 index 0f45a8edc9..0000000000 --- a/core/vendor/kriswallsmith/assetic/docs/ja/introduction.md +++ /dev/null @@ -1,18 +0,0 @@ -Asseticとは ------------------ - -Asseticは、PHP5.3用のアセット管理フレームワークです。 -Asseticを導入することで、Javascriptやスタイルシート、画像をコントロールする -様々なサードパーティー製のツールを使用できるようになります。 - -Asseticの使用方法 ---------------------- - -2つの異なるアプローチがあります。 - - 1. アセットのビルド、ダンプ、出力をPHPファイルで行い、テンプレートからそのファイルを直接参照する方法 - 2. テンプレート内でアセットを(「オンザフライ」に)定義し、抽出やダンプ、出力にローダーを使用する方法 - -前者はいくらかシンプルである一方、後者は動的で柔軟性に富み、最適化が可能となります。 - -Next: [アセットの構築とダンプ](build.md) diff --git a/core/vendor/kriswallsmith/assetic/phpunit.travis.xml b/core/vendor/kriswallsmith/assetic/phpunit.travis.xml deleted file mode 100644 index 3a27eea32a..0000000000 --- a/core/vendor/kriswallsmith/assetic/phpunit.travis.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - ./tests/Assetic/Test/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ./src/Assetic/ - - - diff --git a/core/vendor/kriswallsmith/assetic/phpunit.xml.dist b/core/vendor/kriswallsmith/assetic/phpunit.xml.dist deleted file mode 100644 index f22113e96d..0000000000 --- a/core/vendor/kriswallsmith/assetic/phpunit.xml.dist +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - ./tests/Assetic/Test/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ./src/Assetic/ - - - diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCache.php index f02061fa93..01793901a9 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCache.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCache.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php index 8a9afe8244..9328778806 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -38,6 +38,7 @@ class AssetCollection implements \IteratorAggregate, AssetCollectionInterface * @param array $assets Assets for the current collection * @param array $filters Filters for the current collection * @param string $sourceRoot The root directory + * @param array $vars */ public function __construct($assets = array(), $filters = array(), $sourceRoot = null, array $vars = array()) { @@ -71,7 +72,9 @@ public function removeLeaf(AssetInterface $needle, $graceful = false) unset($this->clones[$asset], $this->assets[$i]); return true; - } elseif ($asset instanceof AssetCollectionInterface && $asset->removeLeaf($needle, true)) { + } + + if ($asset instanceof AssetCollectionInterface && $asset->removeLeaf($needle, true)) { return true; } } @@ -92,7 +95,9 @@ public function replaceLeaf(AssetInterface $needle, AssetInterface $replacement, $this->assets[$i] = $replacement; return true; - } elseif ($asset instanceof AssetCollectionInterface && $asset->replaceLeaf($needle, $replacement, true)) { + } + + if ($asset instanceof AssetCollectionInterface && $asset->replaceLeaf($needle, $replacement, true)) { return true; } } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollectionInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollectionInterface.php index 11baf41c71..8a7927ea79 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollectionInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollectionInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -35,19 +35,25 @@ public function add(AssetInterface $asset); /** * Removes a leaf. * - * @param AssetInterface $needle The leaf to remove + * @param AssetInterface $leaf The leaf to remove + * @param Boolean $graceful Whether the failure should return false or throw an exception + * + * @return Boolean Whether the asset has been found * * @throws \InvalidArgumentException If the asset cannot be found */ - public function removeLeaf(AssetInterface $leaf); + public function removeLeaf(AssetInterface $leaf, $graceful = false); /** * Replaces an existing leaf with a new one. * * @param AssetInterface $needle The current asset to replace * @param AssetInterface $replacement The new asset + * @param Boolean $graceful Whether the failure should return false or throw an exception + * + * @return Boolean Whether the asset has been found * - * @throws InvalidArgumentException If the asset cannot be found + * @throws \InvalidArgumentException If the asset cannot be found */ - public function replaceLeaf(AssetInterface $needle, AssetInterface $replacement); + public function replaceLeaf(AssetInterface $needle, AssetInterface $replacement, $graceful = false); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetInterface.php index 962e87806f..0f36aea09a 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetReference.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetReference.php index b34ff1ef13..57c3930ab6 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetReference.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetReference.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php index 1ce93ae3ee..12b0340617 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -36,7 +36,10 @@ abstract class BaseAsset implements AssetInterface /** * Constructor. * - * @param array $filters Filters for the asset + * @param array $filters Filters for the asset + * @param string $sourceRoot The root directory + * @param string $sourcePath The asset path + * @param array $vars */ public function __construct($filters = array(), $sourceRoot = null, $sourcePath = null, array $vars = array()) { diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php index 0933ade141..00870b0430 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,6 +30,7 @@ class FileAsset extends BaseAsset * @param array $filters An array of filters * @param string $sourceRoot The source asset root directory * @param string $sourcePath The source asset path + * @param array $vars * * @throws \InvalidArgumentException If the supplied root doesn't match the source when guessing the path */ @@ -55,8 +56,7 @@ public function __construct($source, $filters = array(), $sourceRoot = null, $so public function load(FilterInterface $additionalFilter = null) { - $source = PathUtils::resolvePath($this->source, $this->getVars(), - $this->getValues()); + $source = PathUtils::resolvePath($this->source, $this->getVars(), $this->getValues()); if (!is_file($source)) { throw new \RuntimeException(sprintf('The source file "%s" does not exist.', $source)); @@ -67,8 +67,7 @@ public function load(FilterInterface $additionalFilter = null) public function getLastModified() { - $source = PathUtils::resolvePath($this->source, $this->getVars(), - $this->getValues()); + $source = PathUtils::resolvePath($this->source, $this->getVars(), $this->getValues()); if (!is_file($source)) { throw new \RuntimeException(sprintf('The source file "%s" does not exist.', $source)); diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php index 4f8559cac0..daf6f5228d 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -31,6 +31,7 @@ class GlobAsset extends AssetCollection * @param string|array $globs A single glob path or array of paths * @param array $filters An array of filters * @param string $root The root directory + * @param array $vars */ public function __construct($globs, $filters = array(), $root = null, array $vars = array()) { @@ -101,7 +102,9 @@ private function initialize() if (false !== $paths = glob($glob)) { foreach ($paths as $path) { - $this->add(new FileAsset($path, array(), $this->getSourceRoot())); + if (is_file($path)) { + $this->add(new FileAsset($path, array(), $this->getSourceRoot())); + } } } } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php index d1dcfe0c48..ef0d58c038 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -28,8 +28,10 @@ class HttpAsset extends BaseAsset /** * Constructor. * - * @param string $sourceUrl The source URL - * @param array $filters An array of filters + * @param string $sourceUrl The source URL + * @param array $filters An array of filters + * @param Boolean $ignoreErrors + * @param array $vars * * @throws \InvalidArgumentException If the first argument is not an URL */ @@ -53,12 +55,13 @@ public function __construct($sourceUrl, $filters = array(), $ignoreErrors = fals public function load(FilterInterface $additionalFilter = null) { if (false === $content = @file_get_contents(PathUtils::resolvePath( - $this->sourceUrl, $this->getVars(), $this->getValues()))) { + $this->sourceUrl, $this->getVars(), $this->getValues())) + ) { if ($this->ignoreErrors) { return; - } else { - throw new \RuntimeException(sprintf('Unable to load asset from URL "%s"', $this->sourceUrl)); } + + throw new \RuntimeException(sprintf('Unable to load asset from URL "%s"', $this->sourceUrl)); } $this->doLoad($content, $additionalFilter); diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionFilterIterator.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionFilterIterator.php index f9ad79b685..de9c169e8e 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionFilterIterator.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionFilterIterator.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionIterator.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionIterator.php index 09330fef3c..134b0a86f2 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionIterator.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/Iterator/AssetCollectionIterator.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -35,7 +35,7 @@ public function __construct(AssetCollectionInterface $coll, \SplObjectStorage $c $this->output = $coll->getTargetPath(); $this->clones = $clones; - if (false === $pos = strpos($this->output, '.')) { + if (false === $pos = strrpos($this->output, '.')) { $this->output .= '_*'; } else { $this->output = substr($this->output, 0, $pos).'_*'.substr($this->output, $pos); @@ -46,6 +46,7 @@ public function __construct(AssetCollectionInterface $coll, \SplObjectStorage $c * Returns a copy of the current asset with filters and a target URL applied. * * @param Boolean $raw Returns the unmodified asset if true + * @return \Assetic\Asset\AssetInterface */ public function current($raw = false) { diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/StringAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/StringAsset.php index 6d6dc5f79d..7222fe5e07 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/StringAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/StringAsset.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetManager.php b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetManager.php index 07463569ba..57d6d7107a 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetManager.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetManager.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -57,6 +57,8 @@ public function has($name) * * @param string $name The asset name * @param AssetInterface $asset The asset + * + * @throws \InvalidArgumentException If tthe asset name is invalid */ public function set($name, AssetInterface $asset) { diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php index b1a90adc3e..f2c627fc8c 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -30,6 +30,9 @@ class AssetWriter * Constructor. * * @param string $dir The base web directory + * @param array $varValues + * + * @throws \InvalidArgumentException if a variable value is not a string */ public function __construct($dir, array $varValues = array()) { diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ApcCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ApcCache.php index 22855884c4..6a56f39467 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ApcCache.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ApcCache.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ArrayCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ArrayCache.php new file mode 100644 index 0000000000..e322cb3183 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ArrayCache.php @@ -0,0 +1,58 @@ + + */ +class ArrayCache implements CacheInterface +{ + private $cache = array(); + + /** + * @see CacheInterface::has() + */ + public function has($key) + { + return isset($this->cache[$key]); + } + + /** + * @see CacheInterface::get() + */ + public function get($key) + { + if(!$this->has($key)) { + throw new \RuntimeException('There is no cached value for '.$key); + } + + return $this->cache[$key]; + } + + /** + * @see CacheInterface::set() + */ + public function set($key, $value) + { + $this->cache[$key] = $value; + } + + /** + * @see CacheInterface::remove() + */ + public function remove($key) + { + unset($this->cache[$key]); + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/CacheInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/CacheInterface.php index 30448e9ca5..7f301f338a 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/CacheInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/CacheInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ConfigCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ConfigCache.php index de60c9ef70..b5ad0c168b 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ConfigCache.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ConfigCache.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ExpiringCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ExpiringCache.php index 9e95b6dce2..74ca1adfa4 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ExpiringCache.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/ExpiringCache.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/FilesystemCache.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/FilesystemCache.php index 45cfbdb581..7698aed96b 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/FilesystemCache.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Cache/FilesystemCache.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/Exception.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/Exception.php index 3b1c9cdfa3..e9e37c7d16 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/Exception.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/Exception.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/FilterException.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/FilterException.php index 82203de1b6..ced5449787 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/FilterException.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Exception/FilterException.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticExtension.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticExtension.php index 6d91443e3f..575eeeb8b8 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticExtension.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticExtension.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -59,7 +59,7 @@ public function getGlobals() return array( 'assetic' => array( 'debug' => $this->factory->isDebug(), - 'vars' => null !== $this->valueSupplier ? $this->valueSupplier->getValues() : array(), + 'vars' => null !== $this->valueSupplier ? new ValueContainer($this->valueSupplier) : array(), ), ); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php index c5c79a8dbe..c43aa30495 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterFunction.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php index 185b67b80e..577e1f659f 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticFilterInvoker.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php index 8209dfa698..0b32e0ac6d 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php index 90f5d9c98c..3e5fb93fa6 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticTokenParser.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php index 6edd25b974..ddfe8922f6 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -43,6 +43,8 @@ public function load(ResourceInterface $resource) /** * Loads assets from the supplied node. * + * @param \Twig_Node $node + * * @return array An array of asset formulae indexed by name */ private function loadNode(\Twig_Node $node) diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigResource.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigResource.php index 58d4b45249..7a071644c5 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigResource.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/TwigResource.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/ValueContainer.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/ValueContainer.php new file mode 100644 index 0000000000..f959c33ad4 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/ValueContainer.php @@ -0,0 +1,79 @@ + + */ +class ValueContainer implements \ArrayAccess, \IteratorAggregate, \Countable +{ + private $values; + private $valueSupplier; + + public function __construct(ValueSupplierInterface $valueSupplier) + { + $this->valueSupplier = $valueSupplier; + } + + public function offsetExists($offset) + { + $this->initialize(); + + return array_key_exists($offset, $this->values); + } + + public function offsetGet($offset) + { + $this->initialize(); + + if (!array_key_exists($offset, $this->values)) { + throw new \OutOfRangeException(sprintf('The variable "%s" does not exist.', $offset)); + } + + return $this->values[$offset]; + } + + public function offsetSet($offset, $value) + { + throw new \BadMethodCallException('The ValueContainer is read-only.'); + } + + public function offsetUnset($offset) + { + throw new \BadMethodCallException('The ValueContainer is read-only.'); + } + + public function getIterator() + { + $this->initialize(); + + return new \ArrayIterator($this->values); + } + + public function count() + { + $this->initialize(); + + return count($this->values); + } + + private function initialize() + { + if (null === $this->values) { + $this->values = $this->valueSupplier->getValues(); + } + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php index c4393c0e87..9e90f5d52a 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -40,7 +40,6 @@ class AssetFactory * Constructor. * * @param string $root The default root directory - * @param string $output The default output string * @param Boolean $debug Filters prefixed with a "?" will be omitted in debug mode */ public function __construct($root, $debug = false) @@ -286,11 +285,12 @@ protected function parseInput($input, array $options = array()) $path = $input; $input = $this->root.'/'.$path; } + if (false !== strpos($input, '*')) { return $this->createGlobAsset($input, $root, $options['vars']); - } else { - return $this->createFileAsset($input, $root, $path, $options['vars']); } + + return $this->createFileAsset($input, $root, $path, $options['vars']); } protected function createAssetCollection(array $assets = array(), array $options = array()) @@ -338,6 +338,8 @@ protected function getFilter($name) * collection itself. * * @param AssetCollectionInterface $asset An asset collection + * + * @return AssetCollectionInterface */ private function applyWorkers(AssetCollectionInterface $asset) { diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/LazyAssetManager.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/LazyAssetManager.php index d74227966c..922a65d5fa 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/LazyAssetManager.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/LazyAssetManager.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php index d0ad598647..122d53c9a4 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/BasePhpFormulaLoader.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php index 174fdd29a7..cd57def246 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/CachedFormulaLoader.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php index c77040344b..f7adc1a1c7 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FormulaLoaderInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php index 9147806f19..902a5238f1 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Loader/FunctionCallsFormulaLoader.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php index 07f880e7ad..da4a40e1c8 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/CoalescingDirectoryResource.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/DirectoryResource.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/DirectoryResource.php index 914d4a6d1e..83c42be3e1 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/DirectoryResource.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/DirectoryResource.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -121,9 +121,9 @@ public function accept() if ($file->isDir()) { return '.' != $name[0]; - } else { - return null === $this->pattern || 0 < preg_match($this->pattern, $name); } + + return null === $this->pattern || 0 < preg_match($this->pattern, $name); } public function getChildren() diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/FileResource.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/FileResource.php index 1486f3e48d..505500688d 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/FileResource.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/FileResource.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php index 02d797fd20..815c958cc1 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/IteratorResourceInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/ResourceInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/ResourceInterface.php index 23b8a3bdaa..a33610b50f 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/ResourceInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Resource/ResourceInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/CacheBustingWorker.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/CacheBustingWorker.php new file mode 100644 index 0000000000..aac8f884e4 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/CacheBustingWorker.php @@ -0,0 +1,78 @@ + + */ +class CacheBustingWorker implements WorkerInterface +{ + const STRATEGY_CONTENT = 1; + const STRATEGY_MODIFICATION = 2; + + private $strategy; + + public function __construct($strategy = self::STRATEGY_CONTENT) + { + $this->strategy = $strategy; + } + + public function process(AssetInterface $asset) + { + $hash = hash_init('sha1'); + + switch($this->strategy) { + case self::STRATEGY_MODIFICATION: + hash_update($hash, $asset->getLastModified()); + break; + case self::STRATEGY_CONTENT: + hash_update($hash, $asset->dump()); + break; + } + + foreach ($asset as $i => $leaf) { + if ($sourcePath = $leaf->getSourcePath()) { + hash_update($hash, $sourcePath); + } else { + hash_update($hash, $i); + } + } + + $hash = substr(hash_final($hash), 0, 7); + $url = $asset->getTargetPath(); + + $oldExt = pathinfo($url, PATHINFO_EXTENSION); + $newExt = '-'.$hash.'.'.$oldExt; + + if (!$oldExt || 0 < preg_match('/'.preg_quote($newExt, '/').'$/', $url)) { + return; + } + + $asset->setTargetPath(substr($url, 0, (strlen($oldExt) + 1) * -1).$newExt); + } + + public function getStrategy() + { + return $this->strategy; + } + + public function setStrategy($strategy) + { + $this->strategy = $strategy; + + return $this; + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php index 189cab8b7e..856e2ff3c2 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/EnsureFilterWorker.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/WorkerInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/WorkerInterface.php index a1b7fff0f4..786058c4da 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/WorkerInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/Worker/WorkerInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseCssFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseCssFilter.php index c983f665d3..dd48fd1070 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseCssFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseCssFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,12 +21,14 @@ abstract class BaseCssFilter implements FilterInterface /** * Filters all references -- url() and "@import" -- through a callable. * - * @param string $content The CSS - * @param mixed $callback A PHP callable + * @param string $content The CSS + * @param callable $callback A PHP callable + * @param integer $limit + * @param integer $count * * @return string The filtered CSS */ - protected function filterReferences($content, $callback, $limit = -1, & $count = 0) + protected function filterReferences($content, $callback, $limit = -1, &$count = 0) { $content = $this->filterUrls($content, $callback, $limit, $count); $content = $this->filterImports($content, $callback, $limit, $count, false); @@ -38,34 +40,34 @@ protected function filterReferences($content, $callback, $limit = -1, & $count = /** * Filters all CSS url()'s through a callable. * - * @param string $content The CSS - * @param mixed $callback A PHP callable - * @param integer $limit Limit the number of replacements - * @param integer $count Will be populated with the count + * @param string $content The CSS + * @param callable $callback A PHP callable + * @param integer $limit Limit the number of replacements + * @param integer $count Will be populated with the count * * @return string The filtered CSS */ - protected function filterUrls($content, $callback, $limit = -1, & $count = 0) + protected function filterUrls($content, $callback, $limit = -1, &$count = 0) { - return preg_replace_callback('/url\((["\']?)(?.*?)(\\1)\)/', $callback, $content, $limit, $count); + return preg_replace_callback('/url\((["\']?)(?P.*?)(\\1)\)/', $callback, $content, $limit, $count); } /** * Filters all CSS imports through a callable. * - * @param string $content The CSS - * @param mixed $callback A PHP callable - * @param integer $limit Limit the number of replacements - * @param integer $count Will be populated with the count - * @param Boolean $includeUrl Whether to include url() in the pattern + * @param string $content The CSS + * @param callable $callback A PHP callable + * @param integer $limit Limit the number of replacements + * @param integer $count Will be populated with the count + * @param Boolean $includeUrl Whether to include url() in the pattern * * @return string The filtered CSS */ - protected function filterImports($content, $callback, $limit = -1, & $count = 0, $includeUrl = true) + protected function filterImports($content, $callback, $limit = -1, &$count = 0, $includeUrl = true) { $pattern = $includeUrl - ? '/@import (?:url\()?(\'|"|)(?[^\'"\)\n\r]*)\1\)?;?/' - : '/@import (?!url\()(\'|"|)(?[^\'"\)\n\r]*)\1;?/'; + ? '/@import (?:url\()?(\'|"|)(?P[^\'"\)\n\r]*)\1\)?;?/' + : '/@import (?!url\()(\'|"|)(?P[^\'"\)\n\r]*)\1;?/'; return preg_replace_callback($pattern, $callback, $content, $limit, $count); } @@ -73,15 +75,15 @@ protected function filterImports($content, $callback, $limit = -1, & $count = 0, /** * Filters all IE filters (AlphaImageLoader filter) through a callable. * - * @param string $content The CSS - * @param mixed $callback A PHP callable - * @param integer $limit Limit the number of replacements - * @param integer $count Will be populated with the count + * @param string $content The CSS + * @param callable $callback A PHP callable + * @param integer $limit Limit the number of replacements + * @param integer $count Will be populated with the count * * @return string The filtered CSS */ - protected function filterIEFilters($content, $callback, $limit = -1, & $count = 0) + protected function filterIEFilters($content, $callback, $limit = -1, &$count = 0) { - return preg_replace_callback('/src=(["\']?)(?.*?)\\1/', $callback, $content, $limit, $count); + return preg_replace_callback('/src=(["\']?)(?P.*?)\\1/', $callback, $content, $limit, $count); } } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseNodeFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseNodeFilter.php new file mode 100644 index 0000000000..1d86add944 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseNodeFilter.php @@ -0,0 +1,43 @@ +nodePaths; + } + + public function setNodePaths(array $nodePaths) + { + $this->nodePaths = $nodePaths; + } + + public function addNodePath($nodePath) + { + $this->nodePaths[] = $nodePath; + } + + protected function createProcessBuilder(array $arguments = array()) + { + $pb = parent::createProcessBuilder($arguments); + + if ($this->nodePaths) { + $pb->setEnv('NODE_PATH', implode(':', $this->nodePaths)); + } + + return $pb; + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseProcessFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseProcessFilter.php new file mode 100644 index 0000000000..6847916631 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/BaseProcessFilter.php @@ -0,0 +1,51 @@ +timeout = $timeout; + } + + /** + * Creates a new process builder. + * + * @param array $arguments An optional array of arguments + * + * @return ProcessBuilder A new process builder + */ + protected function createProcessBuilder(array $arguments = array()) + { + $pb = new ProcessBuilder($arguments); + + if (null !== $this->timeout) { + $pb->setTimeout($this->timeout); + } + + return $pb; + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CallablesFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CallablesFilter.php index 323d11c927..25413b0284 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CallablesFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CallablesFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -23,6 +23,10 @@ class CallablesFilter implements FilterInterface private $loader; private $dumper; + /** + * @param callable|null $loader + * @param callable|null $dumper + */ public function __construct($loader = null, $dumper = null) { $this->loader = $loader; diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CoffeeScriptFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CoffeeScriptFilter.php index 13a54e7a65..6e6c95a934 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CoffeeScriptFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CoffeeScriptFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Compiles CoffeeScript into Javascript. @@ -21,18 +20,18 @@ * @link http://coffeescript.org/ * @author Kris Wallsmith */ -class CoffeeScriptFilter implements FilterInterface +class CoffeeScriptFilter extends BaseNodeFilter { - private $coffeePath; - private $nodePath; + private $coffeeBin; + private $nodeBin; // coffee options private $bare; - public function __construct($coffeePath = '/usr/bin/coffee', $nodePath = '/usr/bin/node') + public function __construct($coffeeBin = '/usr/bin/coffee', $nodeBin = null) { - $this->coffeePath = $coffeePath; - $this->nodePath = $nodePath; + $this->coffeeBin = $coffeeBin; + $this->nodeBin = $nodeBin; } public function setBare($bare) @@ -45,11 +44,11 @@ public function filterLoad(AssetInterface $asset) $input = tempnam(sys_get_temp_dir(), 'assetic_coffeescript'); file_put_contents($input, $asset->getContent()); - $pb = new ProcessBuilder(array( - $this->nodePath, - $this->coffeePath, - '-cp', - )); + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->coffeeBin) + : array($this->coffeeBin)); + + $pb->add('-cp'); if ($this->bare) { $pb->add('--bare'); @@ -60,7 +59,7 @@ public function filterLoad(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php index b9abd749ec..d5ae6d0242 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,8 +13,6 @@ use Assetic\Exception\FilterException; use Assetic\Asset\AssetInterface; -use Assetic\Filter\FilterInterface; -use Symfony\Component\Process\ProcessBuilder; /** * Loads Compass files. @@ -22,7 +20,7 @@ * @link http://compass-style.org/ * @author Maxime Thirouin */ -class CompassFilter implements FilterInterface +class CompassFilter extends BaseProcessFilter { private $compassPath; private $rubyPath; @@ -42,12 +40,15 @@ class CompassFilter implements FilterInterface private $noLineComments; private $imagesDir; private $javascriptsDir; + private $fontsDir; // compass configuration file options private $plugins = array(); private $loadPaths = array(); private $httpPath; private $httpImagesPath; + private $httpFontsPath; + private $httpGeneratedImagesPath; private $generatedImagesPath; private $httpJavascriptsPath; private $homeEnv = true; @@ -125,6 +126,11 @@ public function setJavascriptsDir($javascriptsDir) $this->javascriptsDir = $javascriptsDir; } + public function setFontsDir($fontsDir) + { + $this->fontsDir = $fontsDir; + } + // compass configuration file options setters public function setPlugins(array $plugins) { @@ -156,6 +162,16 @@ public function setHttpImagesPath($httpImagesPath) $this->httpImagesPath = $httpImagesPath; } + public function setHttpFontsPath($httpFontsPath) + { + $this->httpFontsPath = $httpFontsPath; + } + + public function setHttpGeneratedImagesPath($httpGeneratedImagesPath) + { + $this->httpGeneratedImagesPath = $httpGeneratedImagesPath; + } + public function setGeneratedImagesPath($generatedImagesPath) { $this->generatedImagesPath = $generatedImagesPath; @@ -193,7 +209,7 @@ public function filterLoad(AssetInterface $asset) $compassProcessArgs = array_merge(explode(' ', $this->rubyPath), $compassProcessArgs); } - $pb = new ProcessBuilder($compassProcessArgs); + $pb = $this->createProcessBuilder($compassProcessArgs); $pb->inheritEnvironmentVariables(); if ($this->force) { @@ -258,6 +274,14 @@ public function filterLoad(AssetInterface $asset) $optionsConfig['http_images_path'] = $this->httpImagesPath; } + if ($this->httpFontsPath) { + $optionsConfig['http_fonts_path'] = $this->httpFontsPath; + } + + if ($this->httpGeneratedImagesPath) { + $optionsConfig['http_generated_images_path'] = $this->httpGeneratedImagesPath; + } + if ($this->generatedImagesPath) { $optionsConfig['generated_images_path'] = $this->generatedImagesPath; } @@ -266,6 +290,10 @@ public function filterLoad(AssetInterface $asset) $optionsConfig['http_javascripts_path'] = $this->httpJavascriptsPath; } + if ($this->fontsDir) { + $optionsConfig['fonts_dir'] = $this->fontsDir; + } + // options in configuration file if (count($optionsConfig)) { $config = array(); @@ -322,7 +350,7 @@ public function filterLoad(AssetInterface $asset) $proc = $pb->getProcess(); $code = $proc->run(); - if (0 < $code) { + if (0 !== $code) { unlink($input); if (isset($configFile)) { unlink($configFile); diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php index 7e8a80b158..34bd8827e9 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssEmbedFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * CSSEmbed filter @@ -21,7 +20,7 @@ * @link https://github.com/nzakas/cssembed * @author Maxime Thirouin */ -class CssEmbedFilter implements FilterInterface +class CssEmbedFilter extends BaseProcessFilter { private $jarPath; private $javaPath; @@ -80,7 +79,7 @@ public function filterLoad(AssetInterface $asset) public function filterDump(AssetInterface $asset) { - $pb = new ProcessBuilder(array( + $pb = $this->createProcessBuilder(array( $this->javaPath, '-jar', $this->jarPath, @@ -130,7 +129,7 @@ public function filterDump(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php index 7e5c737a7f..6bddfbee14 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssImportFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssMinFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssMinFilter.php index cc0167239d..e633958636 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssMinFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssMinFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssRewriteFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssRewriteFilter.php index 1fc458e844..8d612c14f6 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssRewriteFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/CssRewriteFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -73,7 +73,7 @@ public function filterDump(AssetInterface $asset) return $matches[0]; } - if ('/' == $matches['url'][0]) { + if (isset($matches['url'][0]) && '/' == $matches['url'][0]) { // root relative return str_replace($matches['url'], $host.$matches['url'], $matches[0]); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/DartFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/DartFilter.php new file mode 100644 index 0000000000..95055816b2 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/DartFilter.php @@ -0,0 +1,67 @@ +dartBin = $dartBin; + } + + public function filterLoad(AssetInterface $asset) + { + $input = tempnam(sys_get_temp_dir(), 'assetic_dart'); + $output = tempnam(sys_get_temp_dir(), 'assetic_dart'); + + file_put_contents($input, $asset->getContent()); + + $pb = $this->createProcessBuilder() + ->add($this->dartBin) + ->add('-o'.$output) + ->add($input) + ; + + $proc = $pb->getProcess(); + $code = $proc->run(); + unlink($input); + + if (0 !== $code) { + if (file_exists($output)) { + unlink($output); + } + + throw FilterException::fromProcess($proc)->setInput($asset->getContent()); + } + + if (!file_exists($output)) { + throw new \RuntimeException('Error creating output file.'); + } + + $asset->setContent(file_get_contents($output)); + unlink($output); + } + + public function filterDump(AssetInterface $asset) + { + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterCollection.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterCollection.php index 1ee743dcde..9dc28cb20b 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterCollection.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterCollection.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterInterface.php index 7bd1a7e3a1..17ff87d99e 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/FilterInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php index 61cc6bd063..59e062e2f8 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/BaseCompilerFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -40,6 +40,7 @@ abstract class BaseCompilerFilter implements FilterInterface const LANGUAGE_ECMASCRIPT5 = 'ECMASCRIPT5'; const LANGUAGE_ECMASCRIPT5_STRICT = 'ECMASCRIPT5_STRICT'; + protected $timeout; protected $compilationLevel; protected $jsExterns; protected $externsUrl; @@ -49,6 +50,11 @@ abstract class BaseCompilerFilter implements FilterInterface protected $warningLevel; protected $language; + public function setTimeout($timeout) + { + $this->timeout = $timeout; + } + public function setCompilationLevel($compilationLevel) { $this->compilationLevel = $compilationLevel; diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php index 0aebe615f7..5ea76812ef 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerApiFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -21,6 +21,19 @@ */ class CompilerApiFilter extends BaseCompilerFilter { + private $proxy; + private $proxyFullUri; + + public function setProxy($proxy) + { + $this->proxy = $proxy; + } + + public function setProxyFullUri($proxyFullUri) + { + $this->proxyFullUri = $proxyFullUri; + } + public function filterDump(AssetInterface $asset) { $query = array( @@ -62,16 +75,24 @@ public function filterDump(AssetInterface $asset) } if (preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'))) { - $context = stream_context_create(array('http' => array( + $contextOptions = array('http' => array( 'method' => 'POST', 'header' => 'Content-Type: application/x-www-form-urlencoded', 'content' => http_build_query($query), - ))); + )); + if (null !== $this->timeout) { + $contextOptions['http']['timeout'] = $this->timeout; + } + if ($this->proxy) { + $contextOptions['http']['proxy'] = $this->proxy; + $contextOptions['http']['request_fulluri'] = (Boolean) $this->proxyFullUri; + } + $context = stream_context_create($contextOptions); $response = file_get_contents('http://closure-compiler.appspot.com/compile', false, $context); $data = json_decode($response); - } elseif (defined('CURLOPT_POST') && !in_array('curl_init', explode(',', ini_get('disable_functions')))) { + } elseif (defined('CURLOPT_POST') && !in_array('curl_init', explode(',', ini_get('disable_functions')))) { $ch = curl_init('http://closure-compiler.appspot.com/compile'); curl_setopt($ch, CURLOPT_POST, true); @@ -79,6 +100,13 @@ public function filterDump(AssetInterface $asset) curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $query); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15); + if (null !== $this->timeout) { + curl_setopt($curl, CURLOPT_TIMEOUT, $this->timeout); + } + if ($this->proxy) { + curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, TRUE); + curl_setopt($ch, CURLOPT_PROXY, $this->proxy); + } $response = curl_exec($ch); curl_close($ch); diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php index 546ecee6d1..d4a1e168cc 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -42,6 +42,10 @@ public function filterDump(AssetInterface $asset) $this->jarPath, )); + if (null !== $this->timeout) { + $pb->setTimeout($this->timeout); + } + if (null !== $this->compilationLevel) { $pb->add('--compilation_level')->add($this->compilationLevel); } @@ -85,7 +89,7 @@ public function filterDump(AssetInterface $asset) $code = $proc->run(); array_map('unlink', $cleanup); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GssFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GssFilter.php index 895b3a2033..3c0b84fc4c 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GssFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/GssFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Filter for the Google Closure Stylesheets Compiler JAR. @@ -21,7 +20,7 @@ * @link http://code.google.com/p/closure-stylesheets/ * @author Matthias Krauser */ -class GssFilter implements FilterInterface +class GssFilter extends BaseProcessFilter { private $jarPath; private $javaPath; @@ -84,7 +83,7 @@ public function filterLoad(AssetInterface $asset) { $cleanup = array(); - $pb = new ProcessBuilder(array( + $pb = $this->createProcessBuilder(array( $this->javaPath, '-jar', $this->jarPath, @@ -129,7 +128,7 @@ public function filterLoad(AssetInterface $asset) $code = $proc->run(); array_map('unlink', $cleanup); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HandlebarsFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HandlebarsFilter.php new file mode 100644 index 0000000000..e16e85836b --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HandlebarsFilter.php @@ -0,0 +1,102 @@ + + */ +class HandlebarsFilter extends BaseNodeFilter +{ + private $handlebarsBin; + private $nodeBin; + + private $minimize = false; + private $simple = false; + + public function __construct($handlebarsBin = '/usr/bin/handlebars', $nodeBin = null) + { + $this->handlebarsBin = $handlebarsBin; + $this->nodeBin = $nodeBin; + } + + public function setMinimize($minimize) + { + $this->minimize = $minimize; + } + + public function setSimple($simple) + { + $this->simple = $simple; + } + + public function filterLoad(AssetInterface $asset) + { + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->handlebarsBin) + : array($this->handlebarsBin)); + + $templateName = basename($asset->getSourcePath()); + + $inputDirPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.uniqid('input_dir'); + $inputPath = $inputDirPath.DIRECTORY_SEPARATOR.$templateName; + $outputPath = tempnam(sys_get_temp_dir(), 'output'); + + mkdir($inputDirPath); + file_put_contents($inputPath, $asset->getContent()); + + $pb->add($inputPath)->add('-f')->add($outputPath); + + if ($this->minimize) { + $pb->add('--min'); + } + + if ($this->simple) { + $pb->add('--simple'); + } + + $process = $pb->getProcess(); + $returnCode = $process->run(); + + unlink($inputPath); + rmdir($inputDirPath); + + if (127 === $returnCode) { + throw new \RuntimeException('Path to node executable could not be resolved.'); + } + + if (0 !== $returnCode) { + if (file_exists($outputPath)) { + unlink($outputPath); + } + throw FilterException::fromProcess($process)->setInput($asset->getContent()); + } + + if (!file_exists($outputPath)) { + throw new \RuntimeException('Error creating output file.'); + } + + $compiledJs = file_get_contents($outputPath); + unlink($outputPath); + + $asset->setContent($compiledJs); + } + + public function filterDump(AssetInterface $asset) + { + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HashableInterface.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HashableInterface.php index da68a0bad2..9442fdba5f 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HashableInterface.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/HashableInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinFilter.php index 1a8a7a79e3..44c08afae5 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinPlusFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinPlusFilter.php index f61d446ca3..21dc48e748 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinPlusFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JSMinPlusFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegoptimFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegoptimFilter.php index 6b97e6ce22..68fac7ce01 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegoptimFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegoptimFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Runs assets through Jpegoptim. @@ -21,7 +20,7 @@ * @link http://www.kokkonen.net/tjko/projects.html * @author Kris Wallsmith */ -class JpegoptimFilter implements FilterInterface +class JpegoptimFilter extends BaseProcessFilter { private $jpegoptimBin; private $stripAll; @@ -53,7 +52,7 @@ public function filterLoad(AssetInterface $asset) public function filterDump(AssetInterface $asset) { - $pb = new ProcessBuilder(array($this->jpegoptimBin)); + $pb = $this->createProcessBuilder(array($this->jpegoptimBin)); if ($this->stripAll) { $pb->add('--strip-all'); diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegtranFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegtranFilter.php index 95a3547662..c495ad1220 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegtranFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/JpegtranFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Runs assets through jpegtran. @@ -21,7 +20,7 @@ * @link http://jpegclub.org/jpegtran/ * @author Kris Wallsmith */ -class JpegtranFilter implements FilterInterface +class JpegtranFilter extends BaseProcessFilter { const COPY_NONE = 'none'; const COPY_COMMENTS = 'comments'; @@ -69,7 +68,7 @@ public function filterLoad(AssetInterface $asset) public function filterDump(AssetInterface $asset) { - $pb = new ProcessBuilder(array($this->jpegtranBin)); + $pb = $this->createProcessBuilder(array($this->jpegtranBin)); if ($this->optimize) { $pb->add('-optimize'); @@ -94,7 +93,7 @@ public function filterDump(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php index cd7e32c672..d247ddd42e 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Loads LESS files. @@ -21,12 +20,20 @@ * @link http://lesscss.org/ * @author Kris Wallsmith */ -class LessFilter implements FilterInterface +class LessFilter extends BaseNodeFilter { private $nodeBin; - private $nodePaths; private $compress; + /** + * Load Paths + * + * A list of paths which less will search for includes. + * + * @var array + */ + protected $loadPaths = array(); + /** * Constructor. * @@ -36,7 +43,7 @@ class LessFilter implements FilterInterface public function __construct($nodeBin = '/usr/bin/node', array $nodePaths = array()) { $this->nodeBin = $nodeBin; - $this->nodePaths = $nodePaths; + $this->setNodePaths($nodePaths); } public function setCompress($compress) @@ -44,6 +51,16 @@ public function setCompress($compress) $this->compress = $compress; } + /** + * Adds a path where less will search for includes + * + * @param string $path Load path (absolute) + */ + public function addLoadPath($path) + { + $this->loadPaths[] = $path; + } + public function filterLoad(AssetInterface $asset) { static $format = <<<'EOF' @@ -75,6 +92,9 @@ public function filterLoad(AssetInterface $asset) $parserOptions['paths'] = array(dirname($root.'/'.$path)); $parserOptions['filename'] = basename($path); } + foreach ($this->loadPaths as $loadPath) { + $parserOptions['paths'][] = $loadPath; + } // tree options $treeOptions = array(); @@ -82,14 +102,9 @@ public function filterLoad(AssetInterface $asset) $treeOptions['compress'] = $this->compress; } - $pb = new ProcessBuilder(); + $pb = $this->createProcessBuilder(); $pb->inheritEnvironmentVariables(); - // node.js configuration - if (0 < count($this->nodePaths)) { - $pb->setEnv('NODE_PATH', implode(':', $this->nodePaths)); - } - $pb->add($this->nodeBin)->add($input = tempnam(sys_get_temp_dir(), 'assetic_less')); file_put_contents($input, sprintf($format, json_encode($parserOptions), @@ -101,7 +116,7 @@ public function filterLoad(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php index 590f041bea..d87ac16373 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/LessphpFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -26,12 +26,47 @@ class LessphpFilter implements FilterInterface { private $presets = array(); + private $formatter; + private $preserveComments; + + /** + * Lessphp Load Paths + * + * @var array + */ + protected $loadPaths = array(); + + /** + * Adds a load path to the paths used by lessphp + * + * @param string $path Load Path + */ + public function addLoadPath($path) + { + $this->loadPaths[] = $path; + } public function setPresets(array $presets) { $this->presets = $presets; } + /** + * @param string $formatter One of "lessjs", "compressed", or "classic". + */ + public function setFormatter($formatter) + { + $this->formatter = $formatter; + } + + /** + * @param boolean $preserveComments + */ + public function setPreserveComments($preserveComments) + { + $this->preserveComments = $preserveComments; + } + public function filterLoad(AssetInterface $asset) { $root = $asset->getSourceRoot(); @@ -42,6 +77,18 @@ public function filterLoad(AssetInterface $asset) $lc->importDir = dirname($root.'/'.$path); } + foreach ($this->loadPaths as $loadPath) { + $lc->addImportDir($loadPath); + } + + if ($this->formatter) { + $lc->setFormatter($this->formatter); + } + + if (null !== $this->preserveComments) { + $lc->setPreserveComments($this->preserveComments); + } + $asset->setContent($lc->parse($asset->getContent(), $this->presets)); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/OptiPngFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/OptiPngFilter.php index 19da807cde..4f7abcf123 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/OptiPngFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/OptiPngFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Runs assets through OptiPNG. @@ -21,7 +20,7 @@ * @link http://optipng.sourceforge.net/ * @author Kris Wallsmith */ -class OptiPngFilter implements FilterInterface +class OptiPngFilter extends BaseProcessFilter { private $optipngBin; private $level; @@ -47,7 +46,7 @@ public function filterLoad(AssetInterface $asset) public function filterDump(AssetInterface $asset) { - $pb = new ProcessBuilder(array($this->optipngBin)); + $pb = $this->createProcessBuilder(array($this->optipngBin)); if (null !== $this->level) { $pb->add('-o')->add($this->level); @@ -62,7 +61,7 @@ public function filterDump(AssetInterface $asset) $proc = $pb->getProcess(); $code = $proc->run(); - if (0 < $code) { + if (0 !== $code) { unlink($input); throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackagerFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackagerFilter.php index c3a331b131..6029833bfb 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackagerFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackagerFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackerFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackerFilter.php index 4fe9aa9ccf..3fd41eacab 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackerFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PackerFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php index 38838477d8..8185beb79a 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PhpCssEmbedFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -11,8 +11,8 @@ namespace Assetic\Filter; -use CssEmbed\CssEmbed; use Assetic\Asset\AssetInterface; +use CssEmbed\CssEmbed; /** * A filter that embed url directly into css diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PngoutFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PngoutFilter.php index 8e5169a9a1..571945f434 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PngoutFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/PngoutFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Runs assets through pngout. @@ -21,7 +20,7 @@ * @link http://advsys.net/ken/utils.htm#pngout * @author Kris Wallsmith */ -class PngoutFilter implements FilterInterface +class PngoutFilter extends BaseProcessFilter { // -c# const COLOR_GREY = '0'; @@ -87,7 +86,7 @@ public function filterLoad(AssetInterface $asset) public function filterDump(AssetInterface $asset) { - $pb = new ProcessBuilder(array($this->pngoutBin)); + $pb = $this->createProcessBuilder(array($this->pngoutBin)); if (null !== $this->color) { $pb->add('-c'.$this->color); @@ -115,7 +114,7 @@ public function filterDump(AssetInterface $asset) $proc = $pb->getProcess(); $code = $proc->run(); - if (0 < $code) { + if (0 !== $code) { unlink($input); throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php index 11fd88e19c..bba8f98e6f 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/SassFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,9 +12,8 @@ namespace Assetic\Filter\Sass; use Assetic\Asset\AssetInterface; -use Assetic\Filter\FilterInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; +use Assetic\Filter\BaseProcessFilter; /** * Loads SASS files. @@ -22,7 +21,7 @@ * @link http://sass-lang.com/ * @author Kris Wallsmith */ -class SassFilter implements FilterInterface +class SassFilter extends BaseProcessFilter { const STYLE_NESTED = 'nested'; const STYLE_EXPANDED = 'expanded'; @@ -106,7 +105,7 @@ public function filterLoad(AssetInterface $asset) $sassProcessArgs = array_merge(explode(' ', $this->rubyPath), $sassProcessArgs); } - $pb = new ProcessBuilder($sassProcessArgs); + $pb = $this->createProcessBuilder($sassProcessArgs); $root = $asset->getSourceRoot(); $path = $asset->getSourcePath(); @@ -163,7 +162,7 @@ public function filterLoad(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php index 452c6d22f1..3906bf5776 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Sass/ScssFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/ScssphpFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/ScssphpFilter.php index 362262d96f..dccf945749 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/ScssphpFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/ScssphpFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -24,19 +24,49 @@ */ class ScssphpFilter implements FilterInterface { + private $compass = false; + + private $importPaths = array(); + + public function enableCompass($enable = true) + { + $this->compass = (Boolean) $enable; + } + + public function isCompassEnabled() + { + return $this->compass; + } + public function filterLoad(AssetInterface $asset) { $root = $asset->getSourceRoot(); $path = $asset->getSourcePath(); $lc = new \scssc(); + if ($this->compass) { + new \scss_compass($lc); + } if ($root && $path) { $lc->addImportPath(dirname($root.'/'.$path)); } + foreach ($this->importPaths as $path) { + $lc->addImportPath($path); + } $asset->setContent($lc->compile($asset->getContent())); } + public function setImportPaths(array $paths) + { + $this->importPaths = $paths; + } + + public function addImportPath($path) + { + $this->importPaths[] = $path; + } + public function filterDump(AssetInterface $asset) { } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php index 29bc71c8fa..8f0d8d96bb 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/SprocketsFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Runs assets through Sprockets. @@ -25,7 +24,7 @@ * * @author Kris Wallsmith */ -class SprocketsFilter implements FilterInterface +class SprocketsFilter extends BaseProcessFilter { private $sprocketsLib; private $rubyBin; @@ -102,7 +101,7 @@ public function filterLoad(AssetInterface $asset) $more )); - $pb = new ProcessBuilder(array( + $pb = $this->createProcessBuilder(array( $this->rubyBin, $input, )); @@ -112,7 +111,7 @@ public function filterLoad(AssetInterface $asset) unlink($tmpAsset); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php index 708e44bff1..f454b563e1 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/StylusFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * Loads STYL files. @@ -21,10 +20,9 @@ * @link http://learnboost.github.com/stylus/ * @author Konstantin Kudryashov */ -class StylusFilter implements FilterInterface +class StylusFilter extends BaseNodeFilter { private $nodeBin; - private $nodePaths; private $compress; /** @@ -36,7 +34,7 @@ class StylusFilter implements FilterInterface public function __construct($nodeBin = '/usr/bin/node', array $nodePaths = array()) { $this->nodeBin = $nodeBin; - $this->nodePaths = $nodePaths; + $this->setNodePaths($nodePaths); } /** @@ -83,14 +81,9 @@ public function filterLoad(AssetInterface $asset) $parserOptions['compress'] = $this->compress; } - $pb = new ProcessBuilder(); + $pb = $this->createProcessBuilder(); $pb->inheritEnvironmentVariables(); - // node.js configuration - if (0 < count($this->nodePaths)) { - $pb->setEnv('NODE_PATH', implode(':', $this->nodePaths)); - } - $pb->add($this->nodeBin)->add($input = tempnam(sys_get_temp_dir(), 'assetic_stylus')); file_put_contents($input, sprintf($format, json_encode($asset->getContent()), @@ -101,7 +94,7 @@ public function filterLoad(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { throw FilterException::fromProcess($proc)->setInput($asset->getContent()); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/TypeScriptFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/TypeScriptFilter.php new file mode 100644 index 0000000000..a2896d36a2 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/TypeScriptFilter.php @@ -0,0 +1,76 @@ + + */ +class TypeScriptFilter extends BaseNodeFilter +{ + private $tscBin; + private $nodeBin; + + public function __construct($tscBin = '/usr/bin/tsc', $nodeBin = null) + { + $this->tscBin = $tscBin; + $this->nodeBin = $nodeBin; + } + + public function filterLoad(AssetInterface $asset) + { + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->tscBin) + : array($this->tscBin)); + + $templateName = basename($asset->getSourcePath()); + + $inputDirPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.uniqid('input_dir'); + $inputPath = $inputDirPath.DIRECTORY_SEPARATOR.$templateName.'.ts'; + $outputPath = tempnam(sys_get_temp_dir(), 'output'); + + mkdir($inputDirPath); + file_put_contents($inputPath, $asset->getContent()); + + $pb->add($inputPath)->add('--out')->add($outputPath); + + $proc = $pb->getProcess(); + $code = $proc->run(); + unlink($inputPath); + rmdir($inputDirPath); + + if (0 !== $code) { + if (file_exists($outputPath)) { + unlink($outputPath); + } + throw FilterException::fromProcess($proc)->setInput($asset->getContent()); + } + + if (!file_exists($outputPath)) { + throw new \RuntimeException('Error creating output file.'); + } + + $compiledJs = file_get_contents($outputPath); + unlink($outputPath); + + $asset->setContent($compiledJs); + } + + public function filterDump(AssetInterface $asset) + { + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyCssFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyCssFilter.php new file mode 100644 index 0000000000..3fd6c4a61c --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyCssFilter.php @@ -0,0 +1,119 @@ + + */ +class UglifyCssFilter extends BaseNodeFilter +{ + private $uglifycssBin; + private $nodeBin; + + private $expandVars; + private $uglyComments; + private $cuteComments; + + /** + * @param string $uglifycssBin Absolute path to the uglifycss executable + * @param string $nodeBin Absolute path to the folder containg node.js executable + */ + public function __construct($uglifycssBin = '/usr/bin/uglifycss', $nodeBin = null) + { + $this->uglifycssBin = $uglifycssBin; + $this->nodeBin = $nodeBin; + } + + /** + * Expand variables + * @param bool $expandVars True to enable + */ + public function setExpandVars($expandVars) + { + $this->expandVars = $expandVars; + } + + /** + * Remove newlines within preserved comments + * @param bool $uglyComments True to enable + */ + public function setUglyComments($uglyComments) + { + $this->uglyComments = $uglyComments; + } + + /** + * Preserve newlines within and around preserved comments + * @param bool $cuteComments True to enable + */ + public function setCuteComments($cuteComments) + { + $this->cuteComments = $cuteComments; + } + + /** + * @see Assetic\Filter\FilterInterface::filterLoad() + */ + public function filterLoad(AssetInterface $asset) + { + } + + /** + * Run the asset through UglifyJs + * + * @see Assetic\Filter\FilterInterface::filterDump() + */ + public function filterDump(AssetInterface $asset) + { + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->uglifycssBin) + : array($this->uglifycssBin)); + + if ($this->expandVars) { + $pb->add('--expand-vars'); + } + + if ($this->uglyComments) { + $pb->add('--ugly-comments'); + } + + if ($this->cuteComments) { + $pb->add('--cute-comments'); + } + + // input and output files + $input = tempnam(sys_get_temp_dir(), 'input'); + + file_put_contents($input, $asset->getContent()); + $pb->add($input); + + $proc = $pb->getProcess(); + $code = $proc->run(); + unlink($input); + + if (127 === $code) { + throw new \RuntimeException('Path to node executable could not be resolved.'); + } + + if (0 !== $code) { + throw FilterException::fromProcess($proc)->setInput($asset->getContent()); + } + + $asset->setContent($proc->getOutput()); + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJs2Filter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJs2Filter.php new file mode 100644 index 0000000000..d30ed1bea0 --- /dev/null +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJs2Filter.php @@ -0,0 +1,105 @@ + + */ +class UglifyJs2Filter extends BaseNodeFilter +{ + private $uglifyjsBin; + private $nodeBin; + private $compress; + private $beautify; + private $mangle; + + public function __construct($uglifyjsBin = '/usr/bin/uglifyjs', $nodeBin = null) + { + $this->uglifyjsBin = $uglifyjsBin; + $this->nodeBin = $nodeBin; + } + + public function setCompress($compress) + { + $this->compress = $compress; + } + + public function setBeautify($beautify) + { + $this->beautify = $beautify; + } + + public function setMangle($mangle) + { + $this->mangle = $mangle; + } + + public function filterLoad(AssetInterface $asset) + { + } + + public function filterDump(AssetInterface $asset) + { + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->uglifyjsBin) + : array($this->uglifyjsBin)); + + if ($this->compress) { + $pb->add('--compress'); + } + + if ($this->beautify) { + $pb->add('--beautify'); + } + + if ($this->mangle) { + $pb->add('--mangle'); + } + + // input and output files + $input = tempnam(sys_get_temp_dir(), 'input'); + $output = tempnam(sys_get_temp_dir(), 'output'); + + file_put_contents($input, $asset->getContent()); + $pb->add('-o')->add($output)->add($input); + + $proc = $pb->getProcess(); + $code = $proc->run(); + unlink($input); + + if (0 !== $code) { + if (file_exists($output)) { + unlink($output); + } + + if (127 === $code) { + throw new \RuntimeException('Path to node executable could not be resolved.'); + } + + throw FilterException::fromProcess($proc)->setInput($asset->getContent()); + } + + if (!file_exists($output)) { + throw new \RuntimeException('Error creating output file.'); + } + + $asset->setContent(file_get_contents($output)); + + unlink($output); + } +} diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJsFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJsFilter.php index 07724caf17..5a0ae33099 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJsFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/UglifyJsFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,7 +13,6 @@ use Assetic\Asset\AssetInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; /** * UglifyJs filter. @@ -21,23 +20,24 @@ * @link https://github.com/mishoo/UglifyJS * @author André Roaldseth */ -class UglifyJsFilter implements FilterInterface +class UglifyJsFilter extends BaseNodeFilter { - private $uglifyJsPath; - private $nodeJsPath; + private $uglifyjsBin; + private $nodeBin; private $noCopyright; private $beautify; private $unsafe; + private $mangle; /** - * @param string $uglifyJsPath Absolute path to the uglifyjs executable - * @param string $nodeJsPath Absolute path to the folder containg node.js executable + * @param string $uglifyjsBin Absolute path to the uglifyjs executable + * @param string $nodeBin Absolute path to the folder containg node.js executable */ - public function __construct($uglifyJsPath, $nodeJsPath = null) + public function __construct($uglifyjsBin = '/usr/bin/uglifyjs', $nodeBin = null) { - $this->uglifyJsPath = $uglifyJsPath; - $this->nodeJsPath = $nodeJsPath; + $this->uglifyjsBin = $uglifyjsBin; + $this->nodeBin = $nodeBin; } /** @@ -67,6 +67,15 @@ public function setUnsafe($unsafe) $this->unsafe = $unsafe; } + /** + * Safely mangle variable and function names for greater file compress. + * @param bool $mangle True to enable + */ + public function setMangle($mangle) + { + $this->mangle = $mangle; + } + /** * @see Assetic\Filter\FilterInterface::filterLoad() */ @@ -81,15 +90,9 @@ public function filterLoad(AssetInterface $asset) */ public function filterDump(AssetInterface $asset) { - $executables = array(); - - if ($this->nodeJsPath !== null) { - $executables[] = $this->nodeJsPath; - } - - $executables[] = $this->uglifyJsPath; - - $pb = new ProcessBuilder($executables); + $pb = $this->createProcessBuilder($this->nodeBin + ? array($this->nodeBin, $this->uglifyjsBin) + : array($this->uglifyjsBin)); if ($this->noCopyright) { $pb->add('--no-copyright'); @@ -103,6 +106,10 @@ public function filterDump(AssetInterface $asset) $pb->add('--unsafe'); } + if (false === $this->mangle) { + $pb->add('--no-mangle'); + } + // input and output files $input = tempnam(sys_get_temp_dir(), 'input'); $output = tempnam(sys_get_temp_dir(), 'output'); @@ -114,7 +121,7 @@ public function filterDump(AssetInterface $asset) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { if (file_exists($output)) { unlink($output); } @@ -124,7 +131,9 @@ public function filterDump(AssetInterface $asset) } throw FilterException::fromProcess($proc)->setInput($asset->getContent()); - } elseif (!file_exists($output)) { + } + + if (!file_exists($output)) { throw new \RuntimeException('Error creating output file.'); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php index 920987aed8..ba9c7bb956 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,9 +12,8 @@ namespace Assetic\Filter\Yui; use Assetic\Asset\AssetInterface; -use Assetic\Filter\FilterInterface; use Assetic\Exception\FilterException; -use Symfony\Component\Process\ProcessBuilder; +use Assetic\Filter\BaseProcessFilter; /** * Base YUI compressor filter. @@ -22,12 +21,13 @@ * @link http://developer.yahoo.com/yui/compressor/ * @author Kris Wallsmith */ -abstract class BaseCompressorFilter implements FilterInterface +abstract class BaseCompressorFilter extends BaseProcessFilter { private $jarPath; private $javaPath; private $charset; private $lineBreak; + private $stackSize; public function __construct($jarPath, $javaPath = '/usr/bin/java') { @@ -45,6 +45,11 @@ public function setLineBreak($lineBreak) $this->lineBreak = $lineBreak; } + public function setStackSize($stackSize) + { + $this->stackSize = $stackSize; + } + public function filterLoad(AssetInterface $asset) { } @@ -60,11 +65,13 @@ public function filterLoad(AssetInterface $asset) */ protected function compress($content, $type, $options = array()) { - $pb = new ProcessBuilder(array( - $this->javaPath, - '-jar', - $this->jarPath, - )); + $pb = $this->createProcessBuilder(array($this->javaPath)); + + if (null !== $this->stackSize) { + $pb->add('-Xss'.$this->stackSize); + } + + $pb->add('-jar')->add($this->jarPath); foreach ($options as $option) { $pb->add($option); @@ -89,13 +96,15 @@ protected function compress($content, $type, $options = array()) $code = $proc->run(); unlink($input); - if (0 < $code) { + if (0 !== $code) { if (file_exists($output)) { unlink($output); } throw FilterException::fromProcess($proc)->setInput($content); - } elseif (!file_exists($output)) { + } + + if (!file_exists($output)) { throw new \RuntimeException('Error creating output file.'); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php index 26f7646b02..96d2739a82 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/CssCompressorFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php index db48cf5702..2326f2e4b6 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Filter/Yui/JsCompressorFilter.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/FilterManager.php b/core/vendor/kriswallsmith/assetic/src/Assetic/FilterManager.php index ee7a37a86c..48fe9fce3d 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/FilterManager.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/FilterManager.php @@ -3,7 +3,7 @@ /* * This file is part of the Assetic package, an OpenSky project. * - * (c) 2010-2012 OpenSky Project Inc + * (c) 2010-2013 OpenSky Project Inc * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php index 8fda83bf41..4a54353d92 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php @@ -1,5 +1,14 @@ getTargetPath(); if ($combine) { + $many = array($one); + } else { $many = array(); foreach ($coll as $leaf) { $many[] = $leaf->getTargetPath(); } - } else { - $many = array($one); } return new TraversableString($one, $many); diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php deleted file mode 100644 index 9484f2a6b8..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCacheTest.php +++ /dev/null @@ -1,175 +0,0 @@ -inner = $this->getMock('Assetic\\Asset\\AssetInterface'); - $this->cache = $this->getMock('Assetic\\Cache\\CacheInterface'); - - $this->asset = new AssetCache($this->inner, $this->cache); - } - - public function testLoadFromCache() - { - $content = 'asdf'; - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->inner->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array($filter))); - $this->cache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(true)); - $this->cache->expects($this->once()) - ->method('get') - ->with($this->isType('string')) - ->will($this->returnValue($content)); - $this->inner->expects($this->once()) - ->method('setContent') - ->with($content); - - $this->asset->load($filter); - } - - public function testLoadToCache() - { - $content = 'asdf'; - - $this->inner->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array())); - $this->cache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(false)); - $this->inner->expects($this->once())->method('load'); - $this->inner->expects($this->once()) - ->method('getContent') - ->will($this->returnValue($content)); - $this->cache->expects($this->once()) - ->method('set') - ->with($this->isType('string'), $content); - - $this->asset->load(); - } - - public function testDumpFromCache() - { - $content = 'asdf'; - - $this->inner->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array())); - $this->cache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(true)); - $this->cache->expects($this->once()) - ->method('get') - ->with($this->isType('string')) - ->will($this->returnValue($content)); - - $this->assertEquals($content, $this->asset->dump(), '->dump() returns the cached value'); - } - - public function testDumpToCache() - { - $content = 'asdf'; - - $this->inner->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array())); - $this->cache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(false)); - $this->inner->expects($this->once()) - ->method('dump') - ->will($this->returnValue($content)); - $this->cache->expects($this->once()) - ->method('set') - ->with($this->isType('string'), $content); - - $this->assertEquals($content, $this->asset->dump(), '->dump() returns the dumped value'); - } - - public function testEnsureFilter() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $this->inner->expects($this->once())->method('ensureFilter'); - $this->asset->ensureFilter($filter); - } - - public function testGetFilters() - { - $this->inner->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array())); - - $this->assertInternalType('array', $this->asset->getFilters(), '->getFilters() returns the inner asset filters'); - } - - public function testGetContent() - { - $this->inner->expects($this->once()) - ->method('getContent') - ->will($this->returnValue('asdf')); - - $this->assertEquals('asdf', $this->asset->getContent(), '->getContent() returns the inner asset content'); - } - - public function testSetContent() - { - $this->inner->expects($this->once()) - ->method('setContent') - ->with('asdf'); - - $this->asset->setContent('asdf'); - } - - public function testGetSourceRoot() - { - $this->inner->expects($this->once()) - ->method('getSourceRoot') - ->will($this->returnValue('asdf')); - - $this->assertEquals('asdf', $this->asset->getSourceRoot(), '->getSourceRoot() returns the inner asset source root'); - } - - public function testGetSourcePath() - { - $this->inner->expects($this->once()) - ->method('getSourcePath') - ->will($this->returnValue('asdf')); - - $this->assertEquals('asdf', $this->asset->getSourcePath(), '->getSourcePath() returns the inner asset source path'); - } - - public function testGetLastModified() - { - $this->inner->expects($this->once()) - ->method('getLastModified') - ->will($this->returnValue(123)); - - $this->assertEquals(123, $this->asset->getLastModified(), '->getLastModified() returns the inner asset last modified'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php deleted file mode 100644 index 3995ee1c43..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php +++ /dev/null @@ -1,333 +0,0 @@ -assertInstanceOf('Assetic\\Asset\\AssetInterface', $coll, 'AssetCollection implements AssetInterface'); - } - - public function testLoadFilter() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once())->method('filterLoad'); - - $coll = new AssetCollection(array(new StringAsset('')), array($filter)); - $coll->load(); - } - - public function testDumpFilter() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once())->method('filterDump'); - - $coll = new AssetCollection(array(new StringAsset('')), array($filter)); - $coll->dump(); - } - - public function testNestedCollectionLoad() - { - $content = 'foobar'; - - $count = 0; - $matches = array(); - $filter = new CallablesFilter(function($asset) use ($content, &$matches, &$count) { - ++$count; - if ($content == $asset->getContent()) { - $matches[] = $asset; - } - }); - - $innerColl = new AssetCollection(array(new StringAsset($content))); - $outerColl = new AssetCollection(array($innerColl), array($filter)); - $outerColl->load(); - - $this->assertEquals(1, count($matches), '->load() applies filters to leaves'); - $this->assertEquals(1, $count, '->load() applies filters to leaves only'); - } - - public function testMixedIteration() - { - $asset = new StringAsset('asset'); - $nestedAsset = new StringAsset('nested'); - $innerColl = new AssetCollection(array($nestedAsset)); - - $contents = array(); - $filter = new CallablesFilter(function($asset) use (&$contents) { - $contents[] = $asset->getContent(); - }); - - $coll = new AssetCollection(array($asset, $innerColl), array($filter)); - $coll->load(); - - $this->assertEquals(array('asset', 'nested'), $contents, '->load() iterates over multiple levels'); - } - - public function testLoadDedupBySourceUrl() - { - $asset1 = new StringAsset('asset', array(), '/some/dir', 'foo.bar'); - $asset2 = new StringAsset('asset', array(), '/some/dir', 'foo.bar'); - - $coll = new AssetCollection(array($asset1, $asset2)); - $coll->load(); - - $this->assertEquals('asset', $coll->getContent(), '->load() detects duplicate assets based on source URL'); - } - - public function testLoadDedupByStrictEquality() - { - $asset = new StringAsset('foo'); - - $coll = new AssetCollection(array($asset, $asset)); - $coll->load(); - - $this->assertEquals('foo', $coll->getContent(), '->load() detects duplicate assets based on strict equality'); - } - - public function testDumpDedupBySourceUrl() - { - $asset1 = new StringAsset('asset', array(), '/some/dir', 'foo.bar'); - $asset2 = new StringAsset('asset', array(), '/some/dir', 'foo.bar'); - - $coll = new AssetCollection(array($asset1, $asset2)); - $coll->load(); - - $this->assertEquals('asset', $coll->dump(), '->dump() detects duplicate assets based on source URL'); - } - - public function testDumpDedupByStrictEquality() - { - $asset = new StringAsset('foo'); - - $coll = new AssetCollection(array($asset, $asset)); - $coll->load(); - - $this->assertEquals('foo', $coll->dump(), '->dump() detects duplicate assets based on strict equality'); - } - - public function testIterationFilters() - { - $count = 0; - $filter = new CallablesFilter(function() use (&$count) { ++$count; }); - - $coll = new AssetCollection(); - $coll->add(new StringAsset('')); - $coll->ensureFilter($filter); - - foreach ($coll as $asset) { - $asset->dump(); - } - - $this->assertEquals(1, $count, 'collection filters are called when child assets are iterated over'); - } - - public function testSetContent() - { - $coll = new AssetCollection(); - $coll->setContent('asdf'); - - $this->assertEquals('asdf', $coll->getContent(), '->setContent() sets the content'); - } - - /** - * @dataProvider getTimestampsAndExpected - */ - public function testGetLastModified($timestamps, $expected) - { - $assets = array(); - - for ($i = 0; $i < count($timestamps); $i++) { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $asset->expects($this->once()) - ->method('getLastModified') - ->will($this->returnValue($timestamps[$i])); - $assets[$i] = $asset; - } - - $coll = new AssetCollection($assets); - - $this->assertEquals($expected, $coll->getLastModified(), '->getLastModifed() returns the highest last modified'); - } - - public function testGetLastModifiedWithValues() - { - $vars = array('locale'); - $asset = new FileAsset(__DIR__.'/../Fixture/messages.{locale}.js', array(), null, null, $vars); - - $coll = new AssetCollection(array($asset), array(), null, $vars); - $coll->setValues(array('locale' => 'en')); - try { - $coll->getLastModified(); - } catch (\InvalidArgumentException $e) { - $this->fail("->getLastModified() shouldn't fail for assets with vars"); - } - } - - public function getTimestampsAndExpected() - { - return array( - array(array(1, 2, 3), 3), - array(array(5, 4, 3), 5), - array(array(3, 8, 5), 8), - array(array(3, 8, null), 8), - ); - } - - public function testRecursiveIteration() - { - $asset1 = $this->getMock('Assetic\\Asset\\AssetInterface'); - $asset2 = $this->getMock('Assetic\\Asset\\AssetInterface'); - $asset3 = $this->getMock('Assetic\\Asset\\AssetInterface'); - $asset4 = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $coll3 = new AssetCollection(array($asset1, $asset2)); - $coll2 = new AssetCollection(array($asset3, $coll3)); - $coll1 = new AssetCollection(array($asset4, $coll2)); - - $i = 0; - foreach ($coll1 as $a) { - $i++; - } - - $this->assertEquals(4, $i, 'iteration with a recursive iterator is recursive'); - } - - public function testRecursiveDeduplication() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $coll3 = new AssetCollection(array($asset, $asset)); - $coll2 = new AssetCollection(array($asset, $coll3)); - $coll1 = new AssetCollection(array($asset, $coll2)); - - $i = 0; - foreach ($coll1 as $a) { - $i++; - } - - $this->assertEquals(1, $i, 'deduplication is performed recursively'); - } - - public function testIteration() - { - $asset1 = new StringAsset('asset1', array(), '/some/dir', 'foo.css'); - $asset2 = new StringAsset('asset2', array(), '/some/dir', 'foo.css'); - $asset3 = new StringAsset('asset3', array(), '/some/dir', 'bar.css'); - - $coll = new AssetCollection(array($asset1, $asset2, $asset3)); - - $count = 0; - foreach ($coll as $a) { - ++$count; - } - - $this->assertEquals(2, $count, 'iterator filters duplicates based on url'); - } - - public function testBasenameCollision() - { - $asset1 = new StringAsset('asset1', array(), '/some/dir', 'foo/foo.css'); - $asset2 = new StringAsset('asset2', array(), '/some/dir', 'bar/foo.css'); - - $coll = new AssetCollection(array($asset1, $asset2)); - - $urls = array(); - foreach ($coll as $leaf) { - $urls[] = $leaf->getTargetPath(); - } - - $this->assertEquals(2, count(array_unique($urls)), 'iterator prevents basename collisions'); - } - - public function testEmptyMtime() - { - $coll = new AssetCollection(); - $this->assertNull($coll->getLastModified(), '->getLastModified() returns null on empty collection'); - } - - public function testLeafManipulation() - { - $coll = new AssetCollection(array(new StringAsset('asdf'))); - - foreach ($coll as $leaf) { - $leaf->setTargetPath('asdf'); - } - - foreach ($coll as $leaf) { - $this->assertEquals('asdf', $leaf->getTargetPath(), 'leaf changes persist between iterations'); - } - } - - public function testRemoveLeaf() - { - $coll = new AssetCollection(array( - $leaf = new StringAsset('asdf'), - )); - - $this->assertTrue($coll->removeLeaf($leaf)); - } - - public function testRemoveRecursiveLeaf() - { - $coll = new AssetCollection(array( - new AssetCollection(array( - $leaf = new StringAsset('asdf'), - )) - )); - - $this->assertTrue($coll->removeLeaf($leaf)); - } - - public function testRemoveInvalidLeaf() - { - $this->setExpectedException('InvalidArgumentException'); - - $coll = new AssetCollection(); - $coll->removeLeaf(new StringAsset('asdf')); - } - - public function testReplaceLeaf() - { - $coll = new AssetCollection(array( - $leaf = new StringAsset('asdf'), - )); - - $this->assertTrue($coll->replaceLeaf($leaf, new StringAsset('foo'))); - } - - public function testReplaceRecursiveLeaf() - { - $coll = new AssetCollection(array( - new AssetCollection(array( - $leaf = new StringAsset('asdf'), - )), - )); - - $this->assertTrue($coll->replaceLeaf($leaf, new StringAsset('foo'))); - } - - public function testReplaceInvalidLeaf() - { - $this->setExpectedException('InvalidArgumentException'); - - $coll = new AssetCollection(); - $coll->replaceLeaf(new StringAsset('foo'), new StringAsset('bar')); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php deleted file mode 100644 index 3a62b77e7a..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetReferenceTest.php +++ /dev/null @@ -1,126 +0,0 @@ -am = $this->getMock('Assetic\\AssetManager'); - $this->ref = new AssetReference($this->am, 'foo'); - } - - /** - * @dataProvider getMethodAndRetVal - */ - public function testMethods($method, $returnValue) - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->once()) - ->method($method) - ->will($this->returnValue($returnValue)); - - $this->assertEquals($returnValue, $this->ref->$method(), '->'.$method.'() returns the asset value'); - } - - public function getMethodAndRetVal() - { - return array( - array('getContent', 'asdf'), - array('getSourceRoot', 'asdf'), - array('getSourcePath', 'asdf'), - array('getTargetPath', 'asdf'), - array('getLastModified', 123), - ); - } - - public function testLazyFilters() - { - $this->am->expects($this->never())->method('get'); - $this->ref->ensureFilter($this->getMock('Assetic\\Filter\\FilterInterface')); - } - - public function testFilterFlush() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->exactly(2)) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->once())->method('ensureFilter'); - $asset->expects($this->once()) - ->method('getFilters') - ->will($this->returnValue(array())); - - $this->ref->ensureFilter($this->getMock('Assetic\\Filter\\FilterInterface')); - - $this->assertInternalType('array', $this->ref->getFilters(), '->getFilters() flushes and returns filters'); - } - - public function testSetContent() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->once()) - ->method('setContent') - ->with('asdf'); - - $this->ref->setContent('asdf'); - } - - public function testLoad() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->exactly(2)) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->once()) - ->method('load') - ->with($filter); - - $this->ref->load($filter); - } - - public function testDump() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->exactly(2)) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->once()) - ->method('dump') - ->with($filter); - - $this->ref->dump($filter); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/FileAssetTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/FileAssetTest.php deleted file mode 100644 index c11d4c015b..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/FileAssetTest.php +++ /dev/null @@ -1,72 +0,0 @@ -assertInstanceOf('Assetic\\Asset\\AssetInterface', $asset, 'Asset implements AssetInterface'); - } - - public function testLazyLoading() - { - $asset = new FileAsset(__FILE__); - $this->assertEmpty($asset->getContent(), 'The asset content is empty before load'); - - $asset->load(); - $this->assertNotEmpty($asset->getContent(), 'The asset content is not empty after load'); - } - - public function testGetLastModifiedType() - { - $asset = new FileAsset(__FILE__); - $this->assertInternalType('integer', $asset->getLastModified(), '->getLastModified() returns an integer'); - } - - public function testGetLastModifiedTypeFileNotFound() - { - $asset = new FileAsset(__DIR__ . "/foo/bar/baz.css"); - - $this->setExpectedException("RuntimeException", "The source file"); - $asset->getLastModified(); - } - - public function testGetLastModifiedValue() - { - $asset = new FileAsset(__FILE__); - $this->assertLessThan(time(), $asset->getLastModified(), '->getLastModified() returns the mtime'); - } - - public function testDefaultBaseAndPath() - { - $asset = new FileAsset(__FILE__); - $this->assertEquals(__DIR__, $asset->getSourceRoot(), '->__construct() defaults base to the asset directory'); - $this->assertEquals(basename(__FILE__), $asset->getSourcePath(), '->__construct() defaults path to the asset basename'); - } - - public function testPathGuessing() - { - $asset = new FileAsset(__FILE__, array(), __DIR__); - $this->assertEquals(basename(__FILE__), $asset->getSourcePath(), '->__construct() guesses the asset path'); - } - - public function testInvalidBase() - { - $this->setExpectedException('InvalidArgumentException'); - - $asset = new FileAsset(__FILE__, array(), __DIR__.'/foo'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php deleted file mode 100644 index e0d7199c4c..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/GlobAssetTest.php +++ /dev/null @@ -1,61 +0,0 @@ -assertInstanceOf('Assetic\\Asset\\AssetInterface', $asset, 'Asset implements AssetInterface'); - } - - public function testIteration() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $this->assertGreaterThan(0, iterator_count($assets), 'GlobAsset initializes for iteration'); - } - - public function testRecursiveIteration() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $this->assertGreaterThan(0, iterator_count($assets), 'GlobAsset initializes for recursive iteration'); - } - - public function testGetLastModifiedType() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $this->assertInternalType('integer', $assets->getLastModified(), '->getLastModified() returns an integer'); - } - - public function testGetLastModifiedValue() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $this->assertLessThan(time(), $assets->getLastModified(), '->getLastModified() returns a file mtime'); - } - - public function testLoad() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $assets->load(); - - $this->assertNotEmpty($assets->getContent(), '->load() loads contents'); - } - - public function testDump() - { - $assets = new GlobAsset(__DIR__.'/*.php'); - $this->assertNotEmpty($assets->dump(), '->dump() dumps contents'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php deleted file mode 100644 index 3ad87d219d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/HttpAssetTest.php +++ /dev/null @@ -1,58 +0,0 @@ -markTestSkipped('The OpenSSL extension is not loaded.'); - } - - $asset = new HttpAsset(self::JQUERY); - $this->assertInternalType('integer', $asset->getLastModified(), '->getLastModified() returns an integer'); - } - - public function testProtocolRelativeUrl() - { - $asset = new HttpAsset(substr(self::JQUERY, 6)); - $asset->load(); - $this->assertNotEmpty($asset->getContent()); - } - - public function testMalformedUrl() - { - $this->setExpectedException('InvalidArgumentException'); - - new HttpAsset(__FILE__); - } - - public function testInvalidUrl() - { - $this->setExpectedException('RuntimeException'); - - $asset = new HttpAsset('http://invalid.com/foobar'); - $asset->load(); - } - - public function testSourceMetadata() - { - $asset = new HttpAsset(self::JQUERY); - $this->assertEquals('https://ajax.googleapis.com', $asset->getSourceRoot(), '->__construct() set the source root'); - $this->assertEquals('ajax/libs/jquery/1.6.1/jquery.min.js', $asset->getSourcePath(), '->__construct() set the source path'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/StringAssetTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/StringAssetTest.php deleted file mode 100644 index 7994a3896a..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/StringAssetTest.php +++ /dev/null @@ -1,79 +0,0 @@ -assertInstanceOf('Assetic\\Asset\\AssetInterface', $asset, 'Asset implements AssetInterface'); - } - - public function testLoadAppliesFilters() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once())->method('filterLoad'); - - $asset = new StringAsset('foo', array($filter)); - $asset->load(); - } - - public function testAutomaticLoad() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once())->method('filterLoad'); - - $asset = new StringAsset('foo', array($filter)); - $asset->dump(); - } - - public function testGetFilters() - { - $asset = new StringAsset(''); - $this->assertInternalType('array', $asset->getFilters(), '->getFilters() returns an array'); - } - - public function testLoadAppliesAdditionalFilter() - { - $asset = new StringAsset(''); - $asset->load(); - - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once()) - ->method('filterLoad') - ->with($asset); - - $asset->load($filter); - } - - public function testDumpAppliesAdditionalFilter() - { - $asset = new StringAsset(''); - - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $filter->expects($this->once()) - ->method('filterDump') - ->with($asset); - - $asset->dump($filter); - } - - public function testLastModified() - { - $asset = new StringAsset(''); - $asset->setLastModified(123); - $this->assertEquals(123, $asset->getLastModified(), '->getLastModified() return the set last modified value'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetManagerTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetManagerTest.php deleted file mode 100644 index d4598554ec..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetManagerTest.php +++ /dev/null @@ -1,53 +0,0 @@ -am = new AssetManager(); - } - - public function testGetAsset() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $this->am->set('foo', $asset); - $this->assertSame($asset, $this->am->get('foo'), '->get() returns an asset'); - } - - public function testGetInvalidAsset() - { - $this->setExpectedException('InvalidArgumentException'); - $this->am->get('foo'); - } - - public function testHas() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $this->am->set('foo', $asset); - - $this->assertTrue($this->am->has('foo'), '->has() returns true if the asset is set'); - $this->assertFalse($this->am->has('bar'), '->has() returns false if the asset is not set'); - } - - public function testInvalidName() - { - $this->setExpectedException('InvalidArgumentException'); - - $this->am->set('@foo', $this->getMock('Assetic\\Asset\\AssetInterface')); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php deleted file mode 100644 index 97cf2c1b49..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php +++ /dev/null @@ -1,207 +0,0 @@ -dir = sys_get_temp_dir().'/assetic_tests_'.rand(11111, 99999); - mkdir($this->dir); - $this->writer = new AssetWriter($this->dir, array( - 'locale' => array('en', 'de', 'fr'), - 'browser' => array('ie', 'firefox', 'other'), - 'gzip' => array('gzip', '') - )); - } - - protected function tearDown() - { - array_map('unlink', glob($this->dir.'/*')); - rmdir($this->dir); - } - - public function testWriteManagerAssets() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $am = $this->getMock('Assetic\\AssetManager'); - - $am->expects($this->once()) - ->method('getNames') - ->will($this->returnValue(array('foo'))); - $am->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - $asset->expects($this->atLeastOnce()) - ->method('getTargetPath') - ->will($this->returnValue('target_url')); - $asset->expects($this->once()) - ->method('dump') - ->will($this->returnValue('content')); - $asset->expects($this->atLeastOnce()) - ->method('getVars') - ->will($this->returnValue(array())); - $asset->expects($this->atLeastOnce()) - ->method('getValues') - ->will($this->returnValue(array())); - - $this->writer->writeManagerAssets($am); - - $this->assertFileExists($this->dir.'/target_url'); - $this->assertEquals('content', file_get_contents($this->dir.'/target_url')); - } - - public function testWriteAssetWithVars() - { - $asset = $this->getMock('Assetic\Asset\AssetInterface'); - $asset->expects($this->atLeastOnce()) - ->method('getVars') - ->will($this->returnValue(array('locale'))); - - $self = $this; - $expectedValues = array( - array('locale' => 'en'), - array('locale' => 'de'), - array('locale' => 'fr'), - ); - $asset->expects($this->exactly(3)) - ->method('setValues') - ->will($this->returnCallback(function($values) use ($self, $expectedValues) { - static $counter = 0; - $self->assertEquals($expectedValues[$counter++], $values); - })); - $asset->expects($this->exactly(3)) - ->method('getValues') - ->will($this->returnCallback(function() use ($expectedValues) { - static $counter = 0; - - return $expectedValues[$counter++]; - })); - - $asset->expects($this->exactly(3)) - ->method('dump') - ->will($this->onConsecutiveCalls('en', 'de', 'fr')); - - $asset->expects($this->atLeastOnce()) - ->method('getTargetPath') - ->will($this->returnValue('target.{locale}')); - - $this->writer->writeAsset($asset); - - $this->assertFileExists($this->dir.'/target.en'); - $this->assertFileExists($this->dir.'/target.de'); - $this->assertFileExists($this->dir.'/target.fr'); - $this->assertEquals('en', file_get_contents($this->dir.'/target.en')); - $this->assertEquals('de', file_get_contents($this->dir.'/target.de')); - $this->assertEquals('fr', file_get_contents($this->dir.'/target.fr')); - } - - public function testAssetWithInputVars() - { - $asset = new FileAsset(__DIR__.'/Fixture/messages.{locale}.js', - array(), null, null, array('locale')); - $asset->setTargetPath('messages.{locale}.js'); - - $this->writer->writeAsset($asset); - - $this->assertFileExists($this->dir.'/messages.en.js'); - $this->assertFileExists($this->dir.'/messages.de.js'); - $this->assertFileExists($this->dir.'/messages.fr.js'); - $this->assertEquals('var messages = {"text.greeting": "Hello %name%!"};', - file_get_contents($this->dir.'/messages.en.js')); - $this->assertEquals('var messages = {"text.greeting": "Hallo %name%!"};', - file_get_contents($this->dir.'/messages.de.js')); - $this->assertEquals('var messages = {"text.greet": "All\u00f4 %name%!"};', - file_get_contents($this->dir.'/messages.fr.js')); - } - - /** - * @dataProvider getCombinationTests - */ - public function testGetCombinations($vars, $expectedCombinations) - { - $ref = new \ReflectionMethod($this->writer, 'getCombinations'); - $ref->setAccessible(true); - - $this->assertEquals($expectedCombinations, $ref->invoke($this->writer, $vars)); - } - - public function getCombinationTests() - { - $tests = array(); - - // no variables - $tests[] = array( - array(), - array(array()) - ); - - // one variables - $tests[] = array( - array('locale'), - array( - array('locale' => 'en'), - array('locale' => 'de'), - array('locale' => 'fr'), - ) - ); - - // two variables - $tests[] = array( - array('locale', 'browser'), - array( - array('locale' => 'en', 'browser' => 'ie'), - array('locale' => 'de', 'browser' => 'ie'), - array('locale' => 'fr', 'browser' => 'ie'), - array('locale' => 'en', 'browser' => 'firefox'), - array('locale' => 'de', 'browser' => 'firefox'), - array('locale' => 'fr', 'browser' => 'firefox'), - array('locale' => 'en', 'browser' => 'other'), - array('locale' => 'de', 'browser' => 'other'), - array('locale' => 'fr', 'browser' => 'other'), - ) - ); - - // three variables - $tests[] = array( - array('locale', 'browser', 'gzip'), - array( - array('locale' => 'en', 'browser' => 'ie', 'gzip' => 'gzip'), - array('locale' => 'de', 'browser' => 'ie', 'gzip' => 'gzip'), - array('locale' => 'fr', 'browser' => 'ie', 'gzip' => 'gzip'), - array('locale' => 'en', 'browser' => 'firefox', 'gzip' => 'gzip'), - array('locale' => 'de', 'browser' => 'firefox', 'gzip' => 'gzip'), - array('locale' => 'fr', 'browser' => 'firefox', 'gzip' => 'gzip'), - array('locale' => 'en', 'browser' => 'other', 'gzip' => 'gzip'), - array('locale' => 'de', 'browser' => 'other', 'gzip' => 'gzip'), - array('locale' => 'fr', 'browser' => 'other', 'gzip' => 'gzip'), - array('locale' => 'en', 'browser' => 'ie', 'gzip' => ''), - array('locale' => 'de', 'browser' => 'ie', 'gzip' => ''), - array('locale' => 'fr', 'browser' => 'ie', 'gzip' => ''), - array('locale' => 'en', 'browser' => 'firefox', 'gzip' => ''), - array('locale' => 'de', 'browser' => 'firefox', 'gzip' => ''), - array('locale' => 'fr', 'browser' => 'firefox', 'gzip' => ''), - array('locale' => 'en', 'browser' => 'other', 'gzip' => ''), - array('locale' => 'de', 'browser' => 'other', 'gzip' => ''), - array('locale' => 'fr', 'browser' => 'other', 'gzip' => ''), - ) - ); - - return $tests; - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ApcCacheTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ApcCacheTest.php deleted file mode 100644 index 659c06fd0c..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ApcCacheTest.php +++ /dev/null @@ -1,42 +0,0 @@ -markTestSkipped('APC must be installed and enabled.'); - } - } - - public function testCache() - { - $cache = new ApcCache(); - - $this->assertFalse($cache->has('foo')); - - $cache->set('foo', 'bar'); - $this->assertEquals('bar', $cache->get('foo')); - - $this->assertTrue($cache->has('foo')); - - $cache->remove('foo'); - $this->assertFalse($cache->has('foo')); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php deleted file mode 100644 index 78ab541238..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ConfigCacheTest.php +++ /dev/null @@ -1,65 +0,0 @@ -dir = sys_get_temp_dir().'/assetic/tests/config_cache'; - $this->cache = new ConfigCache($this->dir); - } - - protected function tearDown() - { - foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->dir, \FilesystemIterator::SKIP_DOTS)) as $file) { - unlink($file->getPathname()); - } - } - - public function testCache() - { - $this->cache->set('foo', array(1, 2, 3)); - $this->assertEquals(array(1, 2, 3), $this->cache->get('foo'), '->get() returns the ->set() value'); - } - - public function testTimestamp() - { - $this->cache->set('bar', array(4, 5, 6)); - $this->assertInternalType('integer', $time = $this->cache->getTimestamp('bar'), '->getTimestamp() returns an integer'); - $this->assertNotEmpty($time, '->getTimestamp() returns a non-empty number'); - } - - public function testInvalidValue() - { - $this->setExpectedException('RuntimeException'); - $this->cache->get('_invalid'); - } - - public function testInvalidTimestamp() - { - $this->setExpectedException('RuntimeException'); - $this->cache->getTimestamp('_invalid'); - } - - public function testHas() - { - $this->cache->set('foo', 'bar'); - $this->assertTrue($this->cache->has('foo')); - $this->assertFalse($this->cache->has('_invalid')); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php deleted file mode 100644 index b67cab3e48..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/ExpiringCacheTest.php +++ /dev/null @@ -1,111 +0,0 @@ -inner = $this->getMock('Assetic\\Cache\\CacheInterface'); - $this->lifetime = 3600; - $this->cache = new ExpiringCache($this->inner, $this->lifetime); - } - - public function testHasExpired() - { - $key = 'asdf'; - $expiresKey = 'asdf.expires'; - $thePast = 0; - - $this->inner->expects($this->once()) - ->method('has') - ->with($key) - ->will($this->returnValue(true)); - $this->inner->expects($this->once()) - ->method('get') - ->with($expiresKey) - ->will($this->returnValue($thePast)); - $this->inner->expects($this->at(2)) - ->method('remove') - ->with($expiresKey); - $this->inner->expects($this->at(3)) - ->method('remove') - ->with($key); - - $this->assertFalse($this->cache->has($key), '->has() returns false if an expired value exists'); - } - - public function testHasNotExpired() - { - $key = 'asdf'; - $expiresKey = 'asdf.expires'; - $theFuture = time() * 2; - - $this->inner->expects($this->once()) - ->method('has') - ->with($key) - ->will($this->returnValue(true)); - $this->inner->expects($this->once()) - ->method('get') - ->with($expiresKey) - ->will($this->returnValue($theFuture)); - - $this->assertTrue($this->cache->has($key), '->has() returns true if a value the not expired'); - } - - public function testSetLifetime() - { - $key = 'asdf'; - $expiresKey = 'asdf.expires'; - $value = 'qwerty'; - - $this->inner->expects($this->at(0)) - ->method('set') - ->with($expiresKey, $this->greaterThanOrEqual(time() + $this->lifetime)); - $this->inner->expects($this->at(1)) - ->method('set') - ->with($key, $value); - - $this->cache->set($key, $value); - } - - public function testRemove() - { - $key = 'asdf'; - $expiresKey = 'asdf.expires'; - - $this->inner->expects($this->at(0)) - ->method('remove') - ->with($expiresKey); - $this->inner->expects($this->at(1)) - ->method('remove') - ->with($key); - - $this->cache->remove($key); - } - - public function testGet() - { - $this->inner->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue('bar')); - - $this->assertEquals('bar', $this->cache->get('foo'), '->get() returns the cached value'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php deleted file mode 100644 index 6bddf9d8fa..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Cache/FilesystemCacheTest.php +++ /dev/null @@ -1,51 +0,0 @@ -assertFalse($cache->has('foo')); - - $cache->set('foo', 'bar'); - $this->assertEquals('bar', $cache->get('foo')); - - $this->assertTrue($cache->has('foo')); - - $cache->remove('foo'); - $this->assertFalse($cache->has('foo')); - } - - public function testSetCreatesDir() - { - $dir = sys_get_temp_dir().'/assetic/fscachetest'; - - $tearDown = function() use ($dir) { - array_map('unlink', glob($dir.'/*')); - @rmdir($dir); - }; - - $tearDown(); - - $cache = new FilesystemCache($dir); - $cache->set('foo', 'bar'); - - $this->assertFileExists($dir.'/foo'); - - $tearDown(); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php deleted file mode 100644 index 58488d83a3..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/AsseticExtensionTest.php +++ /dev/null @@ -1,212 +0,0 @@ -markTestSkipped('Twig is not installed.'); - } - - $this->am = $this->getMock('Assetic\\AssetManager'); - $this->fm = $this->getMock('Assetic\\FilterManager'); - - $this->valueSupplier = $this->getMock('Assetic\ValueSupplierInterface'); - - $this->factory = new AssetFactory(__DIR__.'/templates'); - $this->factory->setAssetManager($this->am); - $this->factory->setFilterManager($this->fm); - - $this->twig = new \Twig_Environment(); - $this->twig->setLoader(new \Twig_Loader_Filesystem(__DIR__.'/templates')); - $this->twig->addExtension(new AsseticExtension($this->factory, array(), $this->valueSupplier)); - } - - public function testReference() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $this->am->expects($this->any()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - - $xml = $this->renderXml('reference.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/', (string) $xml->asset['url']); - } - - public function testGlob() - { - $xml = $this->renderXml('glob.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/', (string) $xml->asset['url']); - } - - public function testAbsolutePath() - { - $xml = $this->renderXml('absolute_path.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/', (string) $xml->asset['url']); - } - - public function testFilters() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->fm->expects($this->at(0)) - ->method('get') - ->with('foo') - ->will($this->returnValue($filter)); - $this->fm->expects($this->at(1)) - ->method('get') - ->with('bar') - ->will($this->returnValue($filter)); - - $xml = $this->renderXml('filters.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/', (string) $xml->asset['url']); - } - - public function testOptionalFilter() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->fm->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($filter)); - - $xml = $this->renderXml('optional_filter.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/', (string) $xml->asset['url']); - } - - public function testOutputPattern() - { - $xml = $this->renderXml('output_pattern.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringStartsWith('css/packed/', (string) $xml->asset['url']); - $this->assertStringEndsWith('.css', (string) $xml->asset['url']); - } - - public function testOutput() - { - $xml = $this->renderXml('output_url.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertEquals('explicit_url.css', (string) $xml->asset['url']); - } - - public function testMixture() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - $this->am->expects($this->any()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - - $xml = $this->renderXml('mixture.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertEquals('packed/mixture', (string) $xml->asset['url']); - } - - public function testDebug() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->fm->expects($this->once()) - ->method('get') - ->with('bar') - ->will($this->returnValue($filter)); - - $xml = $this->renderXml('debug.twig'); - $this->assertEquals(2, count($xml->asset)); - $this->assertStringStartsWith('css/packed_', (string) $xml->asset[0]['url']); - $this->assertStringEndsWith('.css', (string) $xml->asset[0]['url']); - } - - public function testCombine() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->fm->expects($this->once()) - ->method('get') - ->with('bar') - ->will($this->returnValue($filter)); - - $xml = $this->renderXml('combine.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertEquals('css/packed.css', (string) $xml->asset[0]['url']); - } - - public function testImage() - { - $xml = $this->renderXml('image.twig'); - $this->assertEquals(1, count($xml->image)); - $this->assertStringEndsWith('.png', (string) $xml->image[0]['url']); - } - - public function testFilterFunction() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - - $this->fm->expects($this->once()) - ->method('get') - ->with('some_filter') - ->will($this->returnValue($filter)); - - $this->twig->addExtension(new AsseticExtension($this->factory, array( - 'some_func' => array( - 'filter' => 'some_filter', - 'options' => array('output' => 'css/*.css'), - ), - ))); - - $xml = $this->renderXml('function.twig'); - $this->assertEquals(1, count($xml->asset)); - $this->assertStringEndsWith('.css', (string) $xml->asset[0]['url']); - } - - public function testVariables() - { - $this->valueSupplier->expects($this->once()) - ->method('getValues') - ->will($this->returnValue(array('foo' => 'a', 'bar' => 'b'))); - - $xml = $this->renderXml('variables.twig'); - $this->assertEquals(2, $xml->url->count()); - $this->assertEquals("js/7d0828c_foo_1.a.b.js", (string) $xml->url[0]); - $this->assertEquals("js/7d0828c_variable_input.a_2.a.b.js", (string) $xml->url[1]); - } - - /** - * @expectedException Twig_Error - */ - public function testUnclosedTag() - { - $this->renderXml('unclosed_tag.twig'); - } - - private function renderXml($name, $context = array()) - { - return new \SimpleXMLElement($this->twig->loadTemplate($name)->render($context)); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php deleted file mode 100644 index 1e3e018d42..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigFormulaLoaderTest.php +++ /dev/null @@ -1,108 +0,0 @@ -markTestSkipped('Twig is not installed.'); - } - - $this->am = $this->getMock('Assetic\\AssetManager'); - $this->fm = $this->getMock('Assetic\\FilterManager'); - - $factory = new AssetFactory(__DIR__.'/templates'); - $factory->setAssetManager($this->am); - $factory->setFilterManager($this->fm); - - $twig = new \Twig_Environment(); - $twig->addExtension(new AsseticExtension($factory, array( - 'some_func' => array( - 'filter' => 'some_filter', - 'options' => array('output' => 'css/*.css'), - ), - ))); - - $this->loader = new TwigFormulaLoader($twig); - } - - public function testMixture() - { - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $expected = array( - 'mixture' => array( - array('foo', 'foo/*', '@foo'), - array(), - array( - 'output' => 'packed/mixture', - 'name' => 'mixture', - 'debug' => false, - 'combine' => null, - 'vars' => array(), - ), - ), - ); - - $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - $resource->expects($this->once()) - ->method('getContent') - ->will($this->returnValue(file_get_contents(__DIR__.'/templates/mixture.twig'))); - $this->am->expects($this->any()) - ->method('get') - ->with('foo') - ->will($this->returnValue($asset)); - - $formulae = $this->loader->load($resource); - $this->assertEquals($expected, $formulae); - } - - public function testFunction() - { - $expected = array( - 'my_asset' => array( - array('path/to/asset'), - array('some_filter'), - array('output' => 'css/*.css', 'name' => 'my_asset'), - ), - ); - - $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - $resource->expects($this->once()) - ->method('getContent') - ->will($this->returnValue(file_get_contents(__DIR__.'/templates/function.twig'))); - - $formulae = $this->loader->load($resource); - $this->assertEquals($expected, $formulae); - } - - public function testUnclosedTag() - { - $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - $resource->expects($this->once()) - ->method('getContent') - ->will($this->returnValue(file_get_contents(__DIR__.'/templates/unclosed_tag.twig'))); - - $formulae = $this->loader->load($resource); - $this->assertEquals(array(), $formulae); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php deleted file mode 100644 index 771da9f218..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/TwigResourceTest.php +++ /dev/null @@ -1,48 +0,0 @@ -markTestSkipped('Twig is not installed.'); - } - } - - public function testInvalidTemplateNameGetContent() - { - $loader = $this->getMock('Twig_LoaderInterface'); - $loader->expects($this->once()) - ->method('getSource') - ->with('asdf') - ->will($this->throwException(new \Twig_Error_Loader(''))); - - $resource = new TwigResource($loader, 'asdf'); - $this->assertEquals('', $resource->getContent()); - } - - public function testInvalidTemplateNameIsFresh() - { - $loader = $this->getMock('Twig_LoaderInterface'); - $loader->expects($this->once()) - ->method('isFresh') - ->with('asdf', 1234) - ->will($this->throwException(new \Twig_Error_Loader(''))); - - $resource = new TwigResource($loader, 'asdf'); - $this->assertFalse($resource->isFresh(1234)); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/absolute_path.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/absolute_path.twig deleted file mode 100644 index 05dc382db7..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/absolute_path.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets '/path/to/something.css' as='foo' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/combine.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/combine.twig deleted file mode 100644 index e1ab5f9e4b..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/combine.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo.css' 'bar.css' filter='?foo,bar' output='css/packed.css' debug=true combine=true %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/debug.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/debug.twig deleted file mode 100644 index 550292ef13..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/debug.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo.css' 'bar.css' filter='?foo,bar' output='css/packed.css' debug=true %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/filters.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/filters.twig deleted file mode 100644 index d2113847d1..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/filters.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo' filter='foo, bar' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/function.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/function.twig deleted file mode 100644 index 028419746e..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/function.twig +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/glob.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/glob.twig deleted file mode 100644 index 4624933a61..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/glob.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'css/src/*' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/image.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/image.twig deleted file mode 100644 index 902ecf0c4e..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/image.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% image 'images/foo.png' %}{% endimage %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/mixture.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/mixture.twig deleted file mode 100644 index 482e6ece7d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/mixture.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo' 'foo/*' '@foo' output='packed/*' name='mixture' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/optional_filter.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/optional_filter.twig deleted file mode 100644 index 4a4dbb6de3..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/optional_filter.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo' filter='?foo' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_pattern.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_pattern.twig deleted file mode 100644 index cf85897641..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_pattern.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo' output='css/packed/*.css' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_url.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_url.twig deleted file mode 100644 index 51a2a2d65b..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/output_url.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets 'foo' output='explicit_url.css' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/reference.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/reference.twig deleted file mode 100644 index 371c4b7e90..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/reference.twig +++ /dev/null @@ -1,3 +0,0 @@ - -{% stylesheets '@foo' %}{% endstylesheets %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig deleted file mode 100644 index 6c1d30b9df..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/unclosed_tag.twig +++ /dev/null @@ -1,5 +0,0 @@ - -{% block assets %} -{% stylesheets 'foo.css' 'bar.css' filter='?foo,bar' output='css/packed.css' debug=true %} -{% endblock %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/variables.twig b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/variables.twig deleted file mode 100644 index 5d4d2ba531..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Extension/Twig/templates/variables.twig +++ /dev/null @@ -1,5 +0,0 @@ - - {% javascripts "foo.js" "variable_input.{foo}.js" vars=["foo", "bar"] debug=true %} - {{ asset_url }} - {% endjavascripts %} - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php deleted file mode 100644 index 7bfa8bc45d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/AssetFactoryTest.php +++ /dev/null @@ -1,203 +0,0 @@ -am = $this->getMock('Assetic\\AssetManager'); - $this->fm = $this->getMock('Assetic\\FilterManager'); - - $this->factory = new AssetFactory(__DIR__); - $this->factory->setAssetManager($this->am); - $this->factory->setFilterManager($this->fm); - } - - public function testNoAssetManagerReference() - { - $this->setExpectedException('LogicException', 'There is no asset manager.'); - - $factory = new AssetFactory('.'); - $factory->createAsset(array('@foo')); - } - - public function testNoAssetManagerNotReference() - { - $factory = new AssetFactory('.'); - $this->assertInstanceOf('Assetic\\Asset\\AssetInterface', $factory->createAsset(array('foo'))); - } - - public function testNoFilterManager() - { - $this->setExpectedException('LogicException', 'There is no filter manager.'); - - $factory = new AssetFactory('.'); - $factory->createAsset(array('foo'), array('foo')); - } - - public function testCreateAssetReference() - { - $referenced = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $this->am->expects($this->any()) - ->method('get') - ->with('jquery') - ->will($this->returnValue($referenced)); - - $assets = $this->factory->createAsset(array('@jquery')); - $arr = iterator_to_array($assets); - $this->assertInstanceOf('Assetic\\Asset\\AssetReference', $arr[0], '->createAsset() creates a reference'); - } - - /** - * @dataProvider getHttpUrls - */ - public function testCreateHttpAsset($sourceUrl) - { - $assets = $this->factory->createAsset(array($sourceUrl)); - $arr = iterator_to_array($assets); - $this->assertInstanceOf('Assetic\\Asset\\HttpAsset', $arr[0], '->createAsset() creates an HTTP asset'); - } - - public function getHttpUrls() - { - return array( - array('http://example.com/foo.css'), - array('https://example.com/foo.css'), - array('//example.com/foo.css'), - ); - } - - public function testCreateFileAsset() - { - $assets = $this->factory->createAsset(array(basename(__FILE__))); - $arr = iterator_to_array($assets); - $this->assertInstanceOf('Assetic\\Asset\\FileAsset', $arr[0], '->createAsset() creates a file asset'); - } - - public function testCreateGlobAsset() - { - $assets = $this->factory->createAsset(array('*')); - $arr = iterator_to_array($assets); - $this->assertInstanceOf('Assetic\\Asset\\FileAsset', $arr[0], '->createAsset() uses a glob to create a file assets'); - } - - public function testCreateAssetCollection() - { - $asset = $this->factory->createAsset(array('*', basename(__FILE__))); - $this->assertInstanceOf('Assetic\\Asset\\AssetCollection', $asset, '->createAsset() creates an asset collection'); - } - - public function testFilter() - { - $this->fm->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($this->getMock('Assetic\\Filter\\FilterInterface'))); - - $asset = $this->factory->createAsset(array(), array('foo')); - $this->assertEquals(1, count($asset->getFilters()), '->createAsset() adds filters'); - } - - public function testInvalidFilter() - { - $this->setExpectedException('InvalidArgumentException'); - - $this->fm->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->throwException(new \InvalidArgumentException())); - - $asset = $this->factory->createAsset(array(), array('foo')); - } - - public function testOptionalInvalidFilter() - { - $this->factory->setDebug(true); - - $asset = $this->factory->createAsset(array(), array('?foo')); - - $this->assertEquals(0, count($asset->getFilters()), '->createAsset() does not add an optional invalid filter'); - } - - public function testIncludingOptionalFilter() - { - $this->fm->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($this->getMock('Assetic\\Filter\\FilterInterface'))); - - $this->factory->createAsset(array('foo.css'), array('?foo')); - } - - public function testWorkers() - { - $worker = $this->getMock('Assetic\\Factory\\Worker\\WorkerInterface'); - - // called once on the collection and once on each leaf - $worker->expects($this->exactly(3)) - ->method('process') - ->with($this->isInstanceOf('Assetic\\Asset\\AssetInterface')); - - $this->factory->addWorker($worker); - $this->factory->createAsset(array('foo.js', 'bar.js')); - } - - public function testWorkerReturn() - { - $worker = $this->getMock('Assetic\\Factory\\Worker\\WorkerInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $worker->expects($this->at(2)) - ->method('process') - ->with($this->isInstanceOf('Assetic\\Asset\\AssetCollectionInterface')) - ->will($this->returnValue($asset)); - - $this->factory->addWorker($worker); - $coll = $this->factory->createAsset(array('foo.js', 'bar.js')); - - $this->assertEquals(1, count(iterator_to_array($coll))); - } - - public function testNestedFormula() - { - $this->fm->expects($this->once()) - ->method('get') - ->with('foo') - ->will($this->returnValue($this->getMock('Assetic\\Filter\\FilterInterface'))); - - $inputs = array( - 'css/main.css', - array( - // nested formula - array('css/more.sass'), - array('foo'), - ), - ); - - $asset = $this->factory->createAsset($inputs, array(), array('output' => 'css/*.css')); - - $i = 0; - foreach ($asset as $leaf) { - $i++; - } - - $this->assertEquals(2, $i); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php deleted file mode 100644 index 46cdf94c2d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/LazyAssetManagerTest.php +++ /dev/null @@ -1,96 +0,0 @@ -factory = $this->getMockBuilder('Assetic\\Factory\\AssetFactory') - ->disableOriginalConstructor() - ->getMock(); - - $this->am = new LazyAssetManager($this->factory); - } - - public function testGetFromLoader() - { - $resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - $loader = $this->getMock('Assetic\\Factory\\Loader\\FormulaLoaderInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $formula = array( - array('js/core.js', 'js/more.js'), - array('?yui_js'), - array('output' => 'js/all.js') - ); - - $loader->expects($this->once()) - ->method('load') - ->with($resource) - ->will($this->returnValue(array('foo' => $formula))); - $this->factory->expects($this->once()) - ->method('createAsset') - ->with($formula[0], $formula[1], $formula[2] + array('name' => 'foo')) - ->will($this->returnValue($asset)); - - $this->am->setLoader('foo', $loader); - $this->am->addResource($resource, 'foo'); - - $this->assertSame($asset, $this->am->get('foo'), '->get() returns an asset from the loader'); - - // test the "once" expectations - $this->am->get('foo'); - } - - public function testGetResources() - { - $resources = array( - $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'), - $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'), - ); - - $this->am->addResource($resources[0], 'foo'); - $this->am->addResource($resources[1], 'bar'); - - $ret = $this->am->getResources(); - - foreach ($resources as $resource) { - $this->assertTrue(in_array($resource, $ret, true)); - } - } - - public function testGetResourcesEmpty() - { - $this->am->getResources(); - } - - public function testSetFormula() - { - $this->am->setFormula('foo', array()); - $this->am->load(); - $this->assertTrue($this->am->hasFormula('foo'), '->load() does not remove manually added formulae'); - } - - public function testIsDebug() - { - $this->factory->expects($this->once()) - ->method('isDebug') - ->will($this->returnValue(false)); - - $this->assertSame(false, $this->am->isDebug(), '->isDebug() proxies the factory'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php deleted file mode 100644 index 5253003b05..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/CachedFormulaLoaderTest.php +++ /dev/null @@ -1,138 +0,0 @@ -loader = $this->getMock('Assetic\\Factory\\Loader\\FormulaLoaderInterface'); - $this->configCache = $this->getMockBuilder('Assetic\\Cache\\ConfigCache') - ->disableOriginalConstructor() - ->getMock(); - $this->resource = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - } - - public function testNotDebug() - { - $expected = array( - 'foo' => array(array(), array(), array()), - 'bar' => array(array(), array(), array()), - ); - - $this->configCache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(false)); - $this->loader->expects($this->once()) - ->method('load') - ->with($this->resource) - ->will($this->returnValue($expected)); - $this->configCache->expects($this->once()) - ->method('set') - ->with($this->isType('string'), $expected); - - $loader = new CachedFormulaLoader($this->loader, $this->configCache); - $this->assertEquals($expected, $loader->load($this->resource), '->load() returns formulae'); - } - - public function testNotDebugCached() - { - $expected = array( - 'foo' => array(array(), array(), array()), - 'bar' => array(array(), array(), array()), - ); - - $this->configCache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(true)); - $this->resource->expects($this->never()) - ->method('isFresh'); - $this->configCache->expects($this->once()) - ->method('get') - ->with($this->isType('string')) - ->will($this->returnValue($expected)); - - $loader = new CachedFormulaLoader($this->loader, $this->configCache); - $this->assertEquals($expected, $loader->load($this->resource), '->load() returns formulae'); - } - - public function testDebugCached() - { - $timestamp = 123; - $expected = array( - 'foo' => array(array(), array(), array()), - 'bar' => array(array(), array(), array()), - ); - - $this->configCache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(true)); - $this->configCache->expects($this->once()) - ->method('getTimestamp') - ->with($this->isType('string')) - ->will($this->returnValue($timestamp)); - $this->resource->expects($this->once()) - ->method('isFresh') - ->with($timestamp) - ->will($this->returnValue(true)); - $this->loader->expects($this->never()) - ->method('load'); - $this->configCache->expects($this->once()) - ->method('get') - ->with($this->isType('string')) - ->will($this->returnValue($expected)); - - $loader = new CachedFormulaLoader($this->loader, $this->configCache, true); - $this->assertEquals($expected, $loader->load($this->resource), '->load() returns formulae'); - } - - public function testDebugCachedStale() - { - $timestamp = 123; - $expected = array( - 'foo' => array(array(), array(), array()), - 'bar' => array(array(), array(), array()), - ); - - $this->configCache->expects($this->once()) - ->method('has') - ->with($this->isType('string')) - ->will($this->returnValue(true)); - $this->configCache->expects($this->once()) - ->method('getTimestamp') - ->with($this->isType('string')) - ->will($this->returnValue($timestamp)); - $this->resource->expects($this->once()) - ->method('isFresh') - ->with($timestamp) - ->will($this->returnValue(false)); - $this->loader->expects($this->once()) - ->method('load') - ->with($this->resource) - ->will($this->returnValue($expected)); - $this->configCache->expects($this->once()) - ->method('set') - ->with($this->isType('string'), $expected); - - $loader = new CachedFormulaLoader($this->loader, $this->configCache, true); - $this->assertEquals($expected, $loader->load($this->resource), '->load() returns formulae'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php deleted file mode 100644 index 6b631bf505..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/FunctionCallsFormulaLoaderTest.php +++ /dev/null @@ -1,69 +0,0 @@ -getMock('Assetic\\Factory\\Resource\\ResourceInterface'); - $factory = $this->getMockBuilder('Assetic\\Factory\\AssetFactory') - ->disableOriginalConstructor() - ->getMock(); - - $resource->expects($this->once()) - ->method('getContent') - ->will($this->returnValue('')); - $factory->expects($this->once()) - ->method('generateAssetName') - ->will($this->returnValue($name)); - - $loader = new FunctionCallsFormulaLoader($factory); - $formulae = $loader->load($resource); - - $this->assertEquals($expected, $formulae); - } - - public function getJavascriptInputs() - { - return array( - array('assetic_javascripts', '"js/core.js"', 'asdf', array('asdf' => array(array('js/core.js'), array(), array('debug' => false, 'output' => 'js/*.js', 'name' => 'asdf', )))), - array('assetic_javascripts', "'js/core.js'", 'asdf', array('asdf' => array(array('js/core.js'), array(), array('debug' => false, 'output' => 'js/*.js', 'name' => 'asdf', )))), - array('assetic_javascripts', "array('js/core.js')", 'asdf', array('asdf' => array(array('js/core.js'), array(), array('debug' => false, 'output' => 'js/*.js', 'name' => 'asdf', )))), - array('assetic_javascripts', 'array("js/core.js")', 'asdf', array('asdf' => array(array('js/core.js'), array(), array('debug' => false, 'output' => 'js/*.js', 'name' => 'asdf', )))), - array('assetic_image', '"images/logo.gif"', 'asdf', array('asdf' => array(array('images/logo.gif'), array(), array('debug' => false, 'output' => 'images/*', 'name' => 'asdf')))), - ); - } - - public function testComplexFormula() - { - $factory = new AssetFactory(__DIR__.'/templates', true); - $loader = new FunctionCallsFormulaLoader($factory); - $resource = new FileResource(__DIR__.'/templates/debug.php'); - $formulae = $loader->load($resource); - - $this->assertEquals(array( - 'test123' => array( - array('foo.css', 'bar.css'), - array('?foo', 'bar'), - array('name' => 'test123', 'output' => 'css/packed.css', 'debug' => true), - ), - ), $formulae); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/templates/debug.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/templates/debug.php deleted file mode 100644 index 750c25d8da..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Loader/templates/debug.php +++ /dev/null @@ -1,8 +0,0 @@ - - 'test123', 'output' => 'css/packed.css', 'debug' => true)) as $url): ?> - - - diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php deleted file mode 100644 index 32e8887efe..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/CoalescingDirectoryResourceTest.php +++ /dev/null @@ -1,42 +0,0 @@ -assertEquals(array( - realpath(__DIR__.'/Fixtures/dir1/file1.txt'), - realpath(__DIR__.'/Fixtures/dir1/file2.txt'), - realpath(__DIR__.'/Fixtures/dir2/file3.txt'), - ), $paths, 'files from multiple directories are merged'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php deleted file mode 100644 index ccb073d385..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/DirectoryResourceTest.php +++ /dev/null @@ -1,132 +0,0 @@ -assertTrue($resource->isFresh(time() + 5)); - $this->assertFalse($resource->isFresh(0)); - } - - /** - * @dataProvider getPatterns - */ - public function testGetContent($pattern) - { - $resource = new DirectoryResource(__DIR__, $pattern); - $content = $resource->getContent(); - - $this->assertInternalType('string', $content); - } - - public function getPatterns() - { - return array( - array(null), - array('/\.php$/'), - array('/\.foo$/'), - ); - } - - /** - * @dataProvider getPatternsAndEmpty - */ - public function testIteration($pattern, $empty) - { - $resource = new DirectoryResource(__DIR__, $pattern); - - $count = 0; - foreach ($resource as $r) { - ++$count; - $this->assertInstanceOf('Assetic\\Factory\\Resource\\ResourceInterface', $r); - } - - if ($empty) { - $this->assertEmpty($count); - } else { - $this->assertNotEmpty($count); - } - } - - public function getPatternsAndEmpty() - { - return array( - array(null, false), - array('/\.php$/', false), - array('/\.foo$/', true), - ); - } - - public function testRecursiveIteration() - { - $resource = new DirectoryResource(realpath(__DIR__.'/..'), '/^'.preg_quote(basename(__FILE__)).'$/'); - - $count = 0; - foreach ($resource as $r) { - ++$count; - } - - $this->assertEquals(1, $count); - } - - /** - * @dataProvider getPaths - */ - public function testTrailingSlash($path) - { - $resource = new DirectoryResource($path); - $this->assertStringEndsWith(DIRECTORY_SEPARATOR, (string) $resource, 'path ends with a slash'); - } - - public function getPaths() - { - return array( - array(__DIR__), - array(__DIR__.DIRECTORY_SEPARATOR), - ); - } - - public function testInvalidDirectory() - { - $resource = new DirectoryResource(__DIR__.'foo'); - $this->assertEquals(0, iterator_count($resource), 'works for non-existent directory'); - } - - public function testFollowSymlinks() - { - // Create the symlink if it doesn't already exist yet (if someone broke the entire testsuite perhaps) - if (!is_dir(__DIR__.'/Fixtures/dir3')) { - symlink(__DIR__.'/Fixtures/dir2', __DIR__.'/Fixtures/dir3'); - } - - $resource = new DirectoryResource(__DIR__.'/Fixtures'); - - $count = 0; - foreach ($resource as $r) { - ++$count; - } - - $this->assertEquals(6, $count); - } - - public function tearDown() - { - if (is_dir(__DIR__.'/Fixtures/dir3')) { - unlink(__DIR__.'/Fixtures/dir3'); - } - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php deleted file mode 100644 index 4864c8016e..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/FileResourceTest.php +++ /dev/null @@ -1,42 +0,0 @@ -assertTrue($resource->isFresh(time() + 5)); - $this->assertFalse($resource->isFresh(0)); - } - - public function testGetContent() - { - $resource = new FileResource(__FILE__); - $this->assertEquals(file_get_contents(__FILE__), $resource->getContent()); - } - - public function testIsFreshOnInvalidPath() - { - $resource = new FileResource(__FILE__.'foo'); - $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the file does not exist'); - } - - public function testGetContentOnInvalidPath() - { - $resource = new FileResource(__FILE__.'foo'); - $this->assertSame('', $resource->getContent(), '->getContent() returns an empty string when path is invalid'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file1.txt b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file1.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file2.txt b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir1/file2.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file1.txt b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file1.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file3.txt b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Resource/Fixtures/dir2/file3.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php deleted file mode 100644 index bdcffe549b..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Factory/Worker/EnsureFilterWorkerTest.php +++ /dev/null @@ -1,47 +0,0 @@ -getMock('Assetic\\Filter\\FilterInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $asset->expects($this->once()) - ->method('getTargetPath') - ->will($this->returnValue('css/main.css')); - $asset->expects($this->once()) - ->method('ensureFilter') - ->with($filter); - - $worker = new EnsureFilterWorker('/\.css$/', $filter); - $worker->process($asset); - } - - public function testNonMatch() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $asset->expects($this->once()) - ->method('getTargetPath') - ->will($this->returnValue('js/all.js')); - $asset->expects($this->never())->method('ensureFilter'); - - $worker = new EnsureFilterWorker('/\.css$/', $filter); - $worker->process($asset); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php deleted file mode 100644 index 78332599d2..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/BaseImageFilterTest.php +++ /dev/null @@ -1,24 +0,0 @@ -file($data) : $finfo->buffer($data); - - self::assertEquals($expected, $actual, $message); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php deleted file mode 100644 index 9dd9952409..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CallablesFilterTest.php +++ /dev/null @@ -1,39 +0,0 @@ -assertInstanceOf('Assetic\\Filter\\FilterInterface', $filter, 'CallablesFilter implements FilterInterface'); - } - - public function testLoader() - { - $nb = 0; - $filter = new CallablesFilter(function($asset) use (&$nb) { $nb++; }); - $filter->filterLoad($this->getMock('Assetic\\Asset\\AssetInterface')); - $this->assertEquals(1, $nb, '->filterLoad() calls the loader callable'); - } - - public function testDumper() - { - $nb = 0; - $filter = new CallablesFilter(null, function($asset) use (&$nb) { $nb++; }); - $filter->filterDump($this->getMock('Assetic\\Asset\\AssetInterface')); - $this->assertEquals(1, $nb, '->filterDump() calls the loader callable'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CoffeeScriptFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CoffeeScriptFilterTest.php deleted file mode 100644 index 5c46cefad4..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CoffeeScriptFilterTest.php +++ /dev/null @@ -1,73 +0,0 @@ -markTestSkipped('There is no COFFEE_BIN or NODE_BIN environment variable.'); - } - - $this->filter = new CoffeeScriptFilter($_SERVER['COFFEE_BIN'], $_SERVER['NODE_BIN']); - } - - public function testFilterLoad() - { - $expected = << x * x'); - $asset->load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent()); - } - - public function testBare() - { - $expected = << x * x'); - $asset->load(); - - $this->filter->setBare(true); - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CompassFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CompassFilterTest.php deleted file mode 100644 index 4231e8a725..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CompassFilterTest.php +++ /dev/null @@ -1,66 +0,0 @@ - - * @group integration - */ -class CompassFilterTest extends \PHPUnit_Framework_TestCase -{ - protected function setUp() - { - if (!isset($_SERVER['COMPASS_BIN'])) { - $this->markTestSkipped('There is no COMPASS_BIN environment variable.'); - } - } - - public function testFilterLoadWithScss() - { - $asset = new FileAsset(__DIR__.'/fixtures/compass/stylesheet.scss'); - $asset->load(); - - $filter = new CompassFilter($_SERVER['COMPASS_BIN']); - $filter->filterLoad($asset); - - $this->assertContains('.test-class', $asset->getContent()); - $this->assertContains('font-size: 2em;', $asset->getContent()); - } - - public function testFilterLoadWithSass() - { - $asset = new FileAsset(__DIR__.'/fixtures/compass/stylesheet.sass'); - $asset->load(); - - $filter = new CompassFilter($_SERVER['COMPASS_BIN']); - $filter->filterLoad($asset); - - $this->assertContains('.test-class', $asset->getContent()); - $this->assertContains('font-size: 2em;', $asset->getContent()); - } - - public function testCompassMixin() - { - $asset = new FileAsset(__DIR__.'/fixtures/compass/compass.sass'); - $asset->load(); - - $filter = new CompassFilter($_SERVER['COMPASS_BIN']); - $filter->filterLoad($asset); - - $this->assertContains('text-decoration', $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssEmbedFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssEmbedFilterTest.php deleted file mode 100644 index 579abf2734..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssEmbedFilterTest.php +++ /dev/null @@ -1,54 +0,0 @@ -markTestSkipped('There is no CSSEMBED_JAR environment variable.'); - } - } - - public function testCssEmbedDataUri() - { - $data = base64_encode(file_get_contents(__DIR__.'/fixtures/home.png')); - - $asset = new FileAsset(__DIR__ . '/fixtures/cssembed/test.css'); - $asset->load(); - - $filter = new CssEmbedFilter($_SERVER['CSSEMBED_JAR']); - $filter->filterDump($asset); - - $this->assertContains('url(data:image/png;base64,'.$data, $asset->getContent()); - } - - public function testCssEmbedMhtml() - { - $asset = new FileAsset(__DIR__ . '/fixtures/cssembed/test.css'); - $asset->load(); - - $filter = new CssEmbedFilter($_SERVER['CSSEMBED_JAR']); - $filter->setMhtml(true); - $filter->setMhtmlRoot('/test'); - $filter->filterDump($asset); - - $this->assertContains('url(mhtml:/test/!', $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssImportFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssImportFilterTest.php deleted file mode 100644 index ecde8e15da..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssImportFilterTest.php +++ /dev/null @@ -1,67 +0,0 @@ -setTargetPath('foo/bar.css'); - $asset->ensureFilter($filter1); - $asset->ensureFilter($filter2); - - $expected = <<assertEquals($expected, $asset->dump(), '->filterLoad() inlines CSS imports'); - } - - /** - * The order of these two filters is only interchangeable because one acts on - * load and the other on dump. We need a more scalable solution. - */ - public function getFilters() - { - return array( - array(new CssImportFilter(), new CssRewriteFilter()), - array(new CssRewriteFilter(), new CssImportFilter()), - ); - } - - public function testNonCssImport() - { - $asset = new FileAsset(__DIR__.'/fixtures/cssimport/noncssimport.css', array(), __DIR__.'/fixtures/cssimport', 'noncssimport.css'); - $asset->load(); - - $filter = new CssImportFilter(); - $filter->filterLoad($asset); - - $this->assertEquals(file_get_contents(__DIR__.'/fixtures/cssimport/noncssimport.css'), $asset->getContent(), '->filterLoad() skips non css'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssMinFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssMinFilterTest.php deleted file mode 100644 index abba852653..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssMinFilterTest.php +++ /dev/null @@ -1,40 +0,0 @@ -markTestSkipped('CssMin is not installed.'); - } - } - - public function testRelativeSourceUrlImportImports() - { - $asset = new FileAsset(__DIR__.'/fixtures/cssmin/main.css'); - $asset->load(); - - $filter = new CssMinFilter(__DIR__.'/fixtures/cssmin'); - $filter->setFilter('ImportImports', true); - $filter->filterDump($asset); - - $this->assertEquals('body{color:white}body{background:black}', $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssRewriteFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssRewriteFilterTest.php deleted file mode 100644 index 53766bc637..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/CssRewriteFilterTest.php +++ /dev/null @@ -1,127 +0,0 @@ -setTargetPath($targetPath); - $asset->load(); - - $filter = new CssRewriteFilter(); - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals(sprintf($format, $expectedUrl), $asset->getContent(), '->filterDump() rewrites relative urls'); - } - - public function provideUrls() - { - return array( - // url variants - array('body { background: url(%s); }', 'css/body.css', 'css/build/main.css', '../images/bg.gif', '../../images/bg.gif'), - array('body { background: url("%s"); }', 'css/body.css', 'css/build/main.css', '../images/bg.gif', '../../images/bg.gif'), - array('body { background: url(\'%s\'); }', 'css/body.css', 'css/build/main.css', '../images/bg.gif', '../../images/bg.gif'), - - //url with data: - array('body { background: url(\'%s\'); }', 'css/body.css', 'css/build/main.css', 'data:image/png;base64,abcdef=', 'data:image/png;base64,abcdef='), - array('body { background: url(\'%s\'); }', 'css/body.css', 'css/build/main.css', '../images/bg-data:.gif', '../../images/bg-data:.gif'), - - // @import variants - array('@import "%s";', 'css/imports.css', 'css/build/main.css', 'import.css', '../import.css'), - array('@import url(%s);', 'css/imports.css', 'css/build/main.css', 'import.css', '../import.css'), - array('@import url("%s");', 'css/imports.css', 'css/build/main.css', 'import.css', '../import.css'), - array('@import url(\'%s\');', 'css/imports.css', 'css/build/main.css', 'import.css', '../import.css'), - - // path diffs - array('body { background: url(%s); }', 'css/body/bg.css', 'css/build/main.css', '../../images/bg.gif', '../../images/bg.gif'), - array('body { background: url(%s); }', 'css/body.css', 'main.css', '../images/bg.gif', 'images/bg.gif'), - array('body { background: url(%s); }', 'body.css', 'css/main.css', 'images/bg.gif', '../images/bg.gif'), - array('body { background: url(%s); }', 'source/css/body.css', 'output/build/main.css', '../images/bg.gif', '../../source/images/bg.gif'), - array('body { background: url(%s); }', 'css/body.css', 'css/build/main.css', '//example.com/images/bg.gif', '//example.com/images/bg.gif'), - - // url diffs - array('body { background: url(%s); }', 'css/body.css', 'css/build/main.css', 'http://foo.com/bar.gif', 'http://foo.com/bar.gif'), - array('body { background: url(%s); }', 'css/body.css', 'css/build/main.css', '/images/foo.gif', '/images/foo.gif'), - array('body { background: url(%s); }', 'css/body.css', 'css/build/main.css', 'http://foo.com/images/foo.gif', 'http://foo.com/images/foo.gif'), - - // IE AlphaImageLoader filter - array('.fix { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'%s\'); }', 'css/ie.css', 'css/build/ie.css', '../images/fix.png', '../../images/fix.png'), - ); - } - - /** - * @dataProvider provideMultipleUrls - */ - public function testMultipleUrls($format, $sourcePath, $targetPath, $inputUrl1, $inputUrl2, $expectedUrl1, $expectedUrl2) - { - $asset = new StringAsset(sprintf($format, $inputUrl1, $inputUrl2), array(), null, $sourcePath); - $asset->setTargetPath($targetPath); - $asset->load(); - - $filter = new CssRewriteFilter(); - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals(sprintf($format, $expectedUrl1, $expectedUrl2), $asset->getContent(), '->filterDump() rewrites relative urls'); - } - - public function provideMultipleUrls() - { - return array( - // multiple url - array('body { background: url(%s); background: url(%s); }', 'css/body.css', 'css/build/main.css', '../images/bg.gif', '../images/bg2.gif', '../../images/bg.gif', '../../images/bg2.gif'), - array("body { background: url(%s);\nbackground: url(%s); }", 'css/body.css', 'css/build/main.css', '../images/bg.gif', '../images/bg2.gif', '../../images/bg.gif', '../../images/bg2.gif'), - - // multiple import - array('@import "%s"; @import "%s";', 'css/imports.css', 'css/build/main.css', 'import.css', 'import2.css', '../import.css', '../import2.css'), - array("@import \"%s\";\n@import \"%s\";", 'css/imports.css', 'css/build/main.css', 'import.css', 'import2.css', '../import.css', '../import2.css'), - - // mixed urls and imports - array('@import "%s"; body { background: url(%s); }', 'css/body.css', 'css/build/main.css', 'import.css', '../images/bg2.gif', '../import.css', '../../images/bg2.gif'), - array("@import \"%s\";\nbody { background: url(%s); }", 'css/body.css', 'css/build/main.css', 'import.css', '../images/bg2.gif', '../import.css', '../../images/bg2.gif'), - ); - } - - public function testNoTargetPath() - { - $content = 'body { background: url(foo.gif); }'; - - $asset = new StringAsset($content); - $asset->load(); - - $filter = new CssRewriteFilter(); - $filter->filterDump($asset); - - $this->assertEquals($content, $asset->getContent(), '->filterDump() urls are not changed without urls'); - } - - public function testExternalSource() - { - $asset = new StringAsset('body { background: url(../images/bg.gif); }', array(), 'http://www.example.com', 'css/main.css'); - $asset->setTargetPath('css/packed/main.css'); - $asset->load(); - - $filter = new CssRewriteFilter(); - $filter->filterDump($asset); - - $this->assertContains('http://www.example.com/images/bg.gif', $asset->getContent(), '->filterDump() rewrites references in external stylesheets'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/FilterCollectionTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/FilterCollectionTest.php deleted file mode 100644 index 277c773bd5..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/FilterCollectionTest.php +++ /dev/null @@ -1,59 +0,0 @@ -assertInstanceOf('Assetic\\Filter\\FilterInterface', $filter, 'FilterCollection implements FilterInterface'); - } - - public function testEnsure() - { - $filter = $this->getMock('Assetic\\Filter\\FilterInterface'); - $asset = $this->getMock('Assetic\\Asset\\AssetInterface'); - - $filter->expects($this->once())->method('filterLoad'); - - $coll = new FilterCollection(); - $coll->ensure($filter); - $coll->ensure($filter); - $coll->filterLoad($asset); - } - - public function testAll() - { - $filter = new FilterCollection(array( - $this->getMock('Assetic\\Filter\\FilterInterface'), - $this->getMock('Assetic\\Filter\\FilterInterface'), - )); - - $this->assertInternalType('array', $filter->all(), '->all() returns an array'); - } - - public function testEmptyAll() - { - $filter = new FilterCollection(); - $this->assertInternalType('array', $filter->all(), '->all() returns an array'); - } - - public function testCountable() - { - $filters = new FilterCollection(array($this->getMock('Assetic\\Filter\\FilterInterface'))); - - $this->assertEquals(1, count($filters), 'Countable returns the count'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php deleted file mode 100644 index d6f23dba23..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerApiFilterTest.php +++ /dev/null @@ -1,86 +0,0 @@ -load(); - - $filter = new CompilerApiFilter(); - $filter->setCompilationLevel(CompilerApiFilter::COMPILE_SIMPLE_OPTIMIZATIONS); - $filter->setJsExterns(''); - $filter->setExternsUrl(''); - $filter->setExcludeDefaultExterns(true); - $filter->setFormatting(CompilerApiFilter::FORMAT_PRETTY_PRINT); - $filter->setUseClosureLibrary(false); - $filter->setWarningLevel(CompilerApiFilter::LEVEL_VERBOSE); - - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals($expected, $asset->getContent()); - - - $input = <<load(); - - $filter->setLanguage(CompilerApiFilter::LANGUAGE_ECMASCRIPT5); - - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals($expected, $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerJarFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerJarFilterTest.php deleted file mode 100644 index d7707a6b09..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GoogleClosure/CompilerJarFilterTest.php +++ /dev/null @@ -1,78 +0,0 @@ -markTestSkipped('There is no CLOSURE_JAR environment variable.'); - } - - $input = <<load(); - - $filter = new CompilerJarFilter($_SERVER['CLOSURE_JAR']); - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals($expected, $asset->getContent()); - - - $input = <<load(); - - $filter->setLanguage(CompilerJarFilter::LANGUAGE_ECMASCRIPT5); - - $filter->filterLoad($asset); - $filter->filterDump($asset); - - $this->assertEquals($expected, $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GssFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GssFilterTest.php deleted file mode 100644 index 2b4c7bcc84..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/GssFilterTest.php +++ /dev/null @@ -1,45 +0,0 @@ -markTestSkipped('There is no GSS_JAR environment variable.'); - } - - $input = <<load(); - - $filter = new GssFilter($_SERVER['GSS_JAR']); - $filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinFilterTest.php deleted file mode 100644 index b0d6c211e1..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinFilterTest.php +++ /dev/null @@ -1,39 +0,0 @@ -markTestSkipped('JSMin is not installed.'); - } - } - - public function testRelativeSourceUrlImportImports() - { - $asset = new FileAsset(__DIR__.'/fixtures/jsmin/js.js'); - $asset->load(); - - $filter = new JSMinFilter(); - $filter->filterDump($asset); - - $this->assertEquals('var a="abc";;;var bbb="u";', $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinPlusFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinPlusFilterTest.php deleted file mode 100644 index 72e769a8ba..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JSMinPlusFilterTest.php +++ /dev/null @@ -1,39 +0,0 @@ -markTestSkipped('JSMinPlus is not installed.'); - } - } - - public function testRelativeSourceUrlImportImports() - { - $asset = new FileAsset(__DIR__.'/fixtures/jsmin/js.js'); - $asset->load(); - - $filter = new JSMinPlusFilter(); - $filter->filterDump($asset); - - $this->assertEquals('var a="abc",bbb="u"', $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegoptimFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegoptimFilterTest.php deleted file mode 100644 index d0a67612b9..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegoptimFilterTest.php +++ /dev/null @@ -1,45 +0,0 @@ -markTestSkipped('No jpegoptim configuration.'); - } - - $this->filter = new JpegoptimFilter($_SERVER['JPEGOPTIM_BIN']); - } - - public function testFilter() - { - $asset = new FileAsset(__DIR__.'/fixtures/home.jpg'); - $asset->load(); - - $before = $asset->getContent(); - $this->filter->filterDump($asset); - - $this->assertNotEmpty($asset->getContent(), '->filterLoad() sets content'); - $this->assertNotEquals($before, $asset->getContent(), '->filterDump() changes the content'); - $this->assertMimeType('image/jpeg', $asset->getContent(), '->filterDump() creates JPEG data'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegtranFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegtranFilterTest.php deleted file mode 100644 index 10245f686a..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/JpegtranFilterTest.php +++ /dev/null @@ -1,45 +0,0 @@ -markTestSkipped('No jpegtran configuration.'); - } - - $this->filter = new JpegtranFilter($_SERVER['JPEGTRAN_BIN']); - } - - public function testFilter() - { - $asset = new FileAsset(__DIR__.'/fixtures/home.jpg'); - $asset->load(); - - $before = $asset->getContent(); - $this->filter->filterDump($asset); - - $this->assertNotEmpty($asset->getContent(), '->filterLoad() sets content'); - $this->assertNotEquals($before, $asset->getContent(), '->filterDump() changes the content'); - $this->assertMimeType('image/jpeg', $asset->getContent(), '->filterDump() creates JPEG data'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessFilterTest.php deleted file mode 100644 index 41719902a3..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessFilterTest.php +++ /dev/null @@ -1,63 +0,0 @@ -markTestSkipped('No node.js configuration.'); - } - - $this->filter = new LessFilter($_SERVER['NODE_BIN'], array($_SERVER['NODE_PATH'])); - } - - public function testFilterLoad() - { - $asset = new StringAsset('.foo{.bar{width:1+1;}}'); - $asset->load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals(".foo .bar {\n width: 2;\n}\n", $asset->getContent(), '->filterLoad() parses the content'); - } - - public function testImport() - { - $expected = <<load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent(), '->filterLoad() sets an include path based on source url'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessphpFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessphpFilterTest.php deleted file mode 100644 index 9e983e9e87..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/LessphpFilterTest.php +++ /dev/null @@ -1,47 +0,0 @@ -filter = new LessphpFilter(); - } - - public function testPresets() - { - $expected = <<load(); - - $this->filter->setPresets(array( - 'bar' => 'green' - )); - - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent(), '->setPresets() to pass variables into lessphp filter'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/OptiPngFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/OptiPngFilterTest.php deleted file mode 100644 index c2f72c7d6c..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/OptiPngFilterTest.php +++ /dev/null @@ -1,56 +0,0 @@ -markTestSkipped('No OptiPNG configuration.'); - } - - $this->filter = new OptiPngFilter($_SERVER['OPTIPNG_BIN']); - } - - /** - * @dataProvider getImages - */ - public function testFilter($image) - { - $asset = new FileAsset($image); - $asset->load(); - - $before = $asset->getContent(); - $this->filter->filterDump($asset); - - $this->assertNotEmpty($asset->getContent(), '->filterDump() sets content'); - $this->assertNotEquals($before, $asset->getContent(), '->filterDump() changes the content'); - $this->assertMimeType('image/png', $asset->getContent(), '->filterDump() creates PNG data'); - } - - public function getImages() - { - return array( - array(__DIR__.'/fixtures/home.gif'), - array(__DIR__.'/fixtures/home.png'), - ); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackagerFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackagerFilterTest.php deleted file mode 100644 index 7dcdaa07d0..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackagerFilterTest.php +++ /dev/null @@ -1,69 +0,0 @@ -markTestSkipped('Packager is not available.'); - } - } - - public function testPackager() - { - $expected = <<load(); - - $filter = new PackagerFilter(); - $filter->addPackage(__DIR__.'/fixtures/packager/lib'); - $filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent(), '->filterLoad() runs packager'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackerFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackerFilterTest.php deleted file mode 100644 index 8bad914b48..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PackerFilterTest.php +++ /dev/null @@ -1,36 +0,0 @@ -markTestSkipped('JavaScriptPacker is not installed.'); - } - } - - public function testPacker() - { - $asset = new FileAsset(__DIR__.'/fixtures/packer/example.js'); - $asset->load(); - - $filter = new PackerFilter(); - $filter->filterDump($asset); - - $this->assertEquals("var exampleFunction=function(arg1,arg2){alert('exampleFunction called!')}", $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PhpCssEmbedFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PhpCssEmbedFilterTest.php deleted file mode 100644 index 27e2ec9afa..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PhpCssEmbedFilterTest.php +++ /dev/null @@ -1,34 +0,0 @@ -load(); - - $filter = new PhpCssEmbedFilter(); - $filter->filterLoad($asset); - - $this->assertContains('url(data:image/png;base64,'.$data, $asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PngoutFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PngoutFilterTest.php deleted file mode 100644 index 23c07129c0..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/PngoutFilterTest.php +++ /dev/null @@ -1,57 +0,0 @@ -markTestSkipped('No pngout configuration.'); - } - - $this->filter = new PngoutFilter($_SERVER['PNGOUT_BIN']); - } - - /** - * @dataProvider getImages - */ - public function testFilter($image) - { - $asset = new FileAsset($image); - $asset->load(); - - $before = $asset->getContent(); - $this->filter->filterDump($asset); - - $this->assertNotEmpty($asset->getContent(), '->filterLoad() sets content'); - $this->assertNotEquals($before, $asset->getContent(), '->filterLoad() changes the content'); - $this->assertMimeType('image/png', $asset->getContent(), '->filterLoad() creates PNG data'); - } - - public function getImages() - { - return array( - array(__DIR__.'/fixtures/home.gif'), - array(__DIR__.'/fixtures/home.jpg'), - array(__DIR__.'/fixtures/home.png'), - ); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/SassFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/SassFilterTest.php deleted file mode 100644 index 874e5911ca..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/SassFilterTest.php +++ /dev/null @@ -1,70 +0,0 @@ -markTestSkipped('There is no SASS_BIN environment variable.'); - } - - $this->filter = new SassFilter($_SERVER['SASS_BIN']); - } - - public function testSass() - { - $input = <<load(); - - $this->filter->setStyle(SassFilter::STYLE_COMPACT); - $this->filter->filterLoad($asset); - - $this->assertEquals("body { color: red; }\n", $asset->getContent(), '->filterLoad() parses the sass'); - } - - public function testScssGuess() - { - $input = <<<'EOF' -$red: #F00; - -.foo { - color: $red; -} - -EOF; - - $expected = '.foo { color: red; }'; - - $asset = new StringAsset($input, array(), null, 'foo.scss'); - $asset->load(); - - $this->filter->setStyle(SassFilter::STYLE_COMPACT); - $this->filter->filterLoad($asset); - - $this->assertEquals(".foo { color: red; }\n", $asset->getContent(), '->filterLoad() detects SCSS based on source path extension'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/ScssFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/ScssFilterTest.php deleted file mode 100644 index a08fe0e6ba..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Sass/ScssFilterTest.php +++ /dev/null @@ -1,44 +0,0 @@ -markTestSkipped('There is no SASS_BIN environment variable.'); - } - - $asset = new FileAsset(__DIR__.'/../fixtures/sass/main.scss'); - $asset->load(); - - $filter = new ScssFilter($_SERVER['SASS_BIN']); - $filter->setStyle(ScssFilter::STYLE_COMPACT); - $filter->filterLoad($asset); - - $expected = <<assertEquals($expected, $asset->getContent(), '->filterLoad() loads imports'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/ScssphpFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/ScssphpFilterTest.php deleted file mode 100644 index a46bac7577..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/ScssphpFilterTest.php +++ /dev/null @@ -1,62 +0,0 @@ -filter = new ScssphpFilter(); - } - - public function testFilterLoad() - { - $expected = <<load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent(), '->filterLoad() parses the content'); - } - - public function testImport() - { - $expected = <<load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals($expected, $asset->getContent(), '->filterLoad() sets an include path based on source url'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/SprocketsFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/SprocketsFilterTest.php deleted file mode 100644 index 8694dc5e56..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/SprocketsFilterTest.php +++ /dev/null @@ -1,69 +0,0 @@ -markTestSkipped('There is no sprockets configuration.'); - } - - $this->assetRoot = sys_get_temp_dir().'/assetic_sprockets'; - if (is_dir($this->assetRoot)) { - $this->cleanup(); - } else { - mkdir($this->assetRoot); - } - } - - protected function tearDown() - { - $this->cleanup(); - } - - private function cleanup() - { - $it = new \RecursiveDirectoryIterator($this->assetRoot); - foreach (new \RecursiveIteratorIterator($it) as $path => $file) { - if (is_file($path)) { - unlink($path); - } - } - } - - public function testFilterLoad() - { - $asset = new FileAsset(__DIR__.'/fixtures/sprockets/main.js'); - $asset->load(); - - $filter = new SprocketsFilter($_SERVER['SPROCKETS_LIB'], $_SERVER['RUBY_BIN']); - $filter->addIncludeDir(__DIR__.'/fixtures/sprockets/lib1'); - $filter->addIncludeDir(__DIR__.'/fixtures/sprockets/lib2'); - $filter->setAssetRoot($this->assetRoot); - $filter->filterLoad($asset); - - $this->assertContains('/* header.js */', $asset->getContent()); - $this->assertContains('/* include.js */', $asset->getContent()); - $this->assertContains('/* footer.js */', $asset->getContent()); - $this->assertFileExists($this->assetRoot.'/images/image.gif'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/StylusFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/StylusFilterTest.php deleted file mode 100644 index 03fc729449..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/StylusFilterTest.php +++ /dev/null @@ -1,53 +0,0 @@ -markTestSkipped('No node.js configuration.'); - } - - $this->filter = new StylusFilter($_SERVER['NODE_BIN'], array($_SERVER['NODE_PATH'])); - } - - public function testFilterLoad() - { - $asset = new StringAsset("body\n font 12px Helvetica, Arial, sans-serif\n color black"); - $asset->load(); - - $this->filter->filterLoad($asset); - - $this->assertEquals("body {\n font: 12px Helvetica, Arial, sans-serif;\n color: #000;\n}\n", $asset->getContent(), '->filterLoad() parses the content'); - } - - public function testFilterLoadWithCompression() - { - $asset = new StringAsset("body\n font 12px Helvetica, Arial, sans-serif\n color black;"); - $asset->load(); - - $this->filter->setCompress(true); - $this->filter->filterLoad($asset); - - $this->assertEquals("body{font:12px Helvetica,Arial,sans-serif;color:#000}\n", $asset->getContent(), '->filterLoad() parses the content and compress it'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/UglifyJsFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/UglifyJsFilterTest.php deleted file mode 100644 index bc4b24296b..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/UglifyJsFilterTest.php +++ /dev/null @@ -1,100 +0,0 @@ -markTestSkipped('There is no uglifyJs configuration.'); - } - - $this->asset = new FileAsset(__DIR__.'/fixtures/uglifyjs/script.js'); - $this->asset->load(); - - if (isset($_SERVER['NODE_BIN'])) { - $this->filter = new UglifyJsFilter($_SERVER['UGLIFYJS_BIN'], $_SERVER['NODE_BIN']); - } else { - $this->filter = new UglifyJsFilter($_SERVER['UGLIFYJS_BIN']); - } - } - - protected function tearDown() - { - $this->asset = null; - $this->filter = null; - } - - public function testUglify() - { - $this->filter->filterDump($this->asset); - - $expected = <<assertSame($expected, $this->asset->getContent()); - } - - public function testUnsafeUglify() - { - $this->filter->setUnsafe(true); - $this->filter->filterDump($this->asset); - - $expected = <<assertSame($expected, $this->asset->getContent()); - } - - public function testBeautifyUglify() - { - $this->filter->setBeautify(true); - $this->filter->filterDump($this->asset); - - $expected = <<assertSame($expected, $this->asset->getContent()); - } - - public function testNoCopyrightUglify() - { - $this->filter->setNoCopyright(true); - $this->filter->filterDump($this->asset); - - $expected = 'function bar(a){return var2.push(a),a}var foo=new Array(1,2,3,4),bar=Array(a,b,c),var1=new Array(5),var2=new Array(a),foo=function(a){return a};'; - $this->assertSame($expected, $this->asset->getContent()); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/BaseCompressorFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/BaseCompressorFilterTest.php deleted file mode 100644 index 39491b10b4..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/BaseCompressorFilterTest.php +++ /dev/null @@ -1,31 +0,0 @@ -assertInstanceOf('Assetic\\Filter\\FilterInterface', $filter, 'BaseCompressorFilter implements FilterInterface'); - } -} - -class YuiCompressorFilterForTest extends BaseCompressorFilter -{ - public function filterDump(AssetInterface $asset) - { - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/CssCompressorFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/CssCompressorFilterTest.php deleted file mode 100644 index 61f9fd8480..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/CssCompressorFilterTest.php +++ /dev/null @@ -1,23 +0,0 @@ -assertInstanceOf('Assetic\\Filter\\FilterInterface', $filter, 'CssCompressorFilter implements FilterInterface'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/JsCompressorFilterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/JsCompressorFilterTest.php deleted file mode 100644 index c3918371e8..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/Yui/JsCompressorFilterTest.php +++ /dev/null @@ -1,62 +0,0 @@ -assertInstanceOf('Assetic\\Filter\\FilterInterface', $filter, 'JsCompressorFilter implements FilterInterface'); - } - - /** - * @group integration - */ - public function testFilterDump() - { - if (!isset($_SERVER['YUI_COMPRESSOR_JAR'])) { - $this->markTestSkipped('There is no YUI_COMPRESSOR_JAR environment variable.'); - } - - $source = <<load(); - - $filter = new JsCompressorFilter($_SERVER['YUI_COMPRESSOR_JAR']); - $filter->filterDump($asset); - - $this->assertEquals($expected, $asset->getContent(), '->filterDump()'); - } -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/compass.sass b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/compass.sass deleted file mode 100644 index dfc99fbdcd..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/compass.sass +++ /dev/null @@ -1,4 +0,0 @@ -@import "compass/typography/links/hover-link" - -a - @include hover-link diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_sass.sass b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_sass.sass deleted file mode 100644 index 8593aabdcc..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_sass.sass +++ /dev/null @@ -1,4 +0,0 @@ -@import "compass/utilities" - -@mixin mixin-test($fontSize: 1em) - font-size: $fontSize \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_scss.scss b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_scss.scss deleted file mode 100644 index 896ba5b691..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/partials/_scss.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "compass/utilities"; - -@mixin mixin-test($fontSize: 1em) -{ - font-size: $fontSize; -} \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.sass b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.sass deleted file mode 100644 index 569d84eb2d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.sass +++ /dev/null @@ -1,4 +0,0 @@ -@import "partials/sass" - -.test-class - @include mixin-test(2em) \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.scss b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.scss deleted file mode 100644 index 461884c965..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/compass/stylesheet.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "partials/scss"; - -.test-class -{ - @include mixin-test(2em); -} \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssembed/test.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssembed/test.css deleted file mode 100644 index 370982ceaa..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssembed/test.css +++ /dev/null @@ -1,4 +0,0 @@ -.test -{ - background: url(../home.png); -} \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/import.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/import.css deleted file mode 100644 index e2c77fee35..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/import.css +++ /dev/null @@ -1,2 +0,0 @@ -/* import.css */ -body { color: red; } \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/main.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/main.css deleted file mode 100644 index 1a90d49ab2..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/main.css +++ /dev/null @@ -1,4 +0,0 @@ -/* main.css */ -@import "import.css"; -@import url('more/evenmore/deep1.css'); -body { color: black; } \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more.sass b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more.sass deleted file mode 100644 index 1463b1683f..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more.sass +++ /dev/null @@ -1 +0,0 @@ -/* more.sass */ \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/bg.gif b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/bg.gif deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep1.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep1.css deleted file mode 100644 index 433b34153d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep1.css +++ /dev/null @@ -1,2 +0,0 @@ -/* more/evenmore/deep1.css */ -@import url(deep2.css); \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep2.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep2.css deleted file mode 100644 index 645a40eb0f..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/more/evenmore/deep2.css +++ /dev/null @@ -1,4 +0,0 @@ -/* more/evenmore/deep2.css */ -body { - background: url(bg.gif); -} \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/noncssimport.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/noncssimport.css deleted file mode 100644 index 2cea30f013..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssimport/noncssimport.css +++ /dev/null @@ -1,2 +0,0 @@ -/* noncssimport.css */ -@import "more.sass"; \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/fonts.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/fonts.css deleted file mode 100644 index 2d135f6008..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/fonts.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - color: white; -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/main.css b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/main.css deleted file mode 100644 index 8fbabc82dd..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/cssmin/main.css +++ /dev/null @@ -1,5 +0,0 @@ -@import url("fonts.css"); - -body { - background: black; -} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.gif b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.gif deleted file mode 100644 index edda5603d3..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.gif +++ /dev/null @@ -1,5 +0,0 @@ -GIF89a - -fff!, - -p؜f*WuX; \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.jpg b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.jpg deleted file mode 100644 index e0ad369cfb..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.jpg +++ /dev/null @@ -1,3 +0,0 @@ -JFIFddDuckydAdobed - -c 67W8x 9 ?*jr1兒 ,u 1 ɍA0f@[P S`,\|{P]? \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.png b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.png deleted file mode 100644 index bf12e0b9f9..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/home.png +++ /dev/null @@ -1,6 +0,0 @@ -PNG - - IHDR - -2ϽgAMA7tEXtSoftwareAdobe ImageReadyqe<JIDATxb?2`ݻD,΄M:E!.E|Tb5&" -A`s&B5Ċ%IENDB` \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/jsmin/js.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/jsmin/js.js deleted file mode 100644 index 76b743159c..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/jsmin/js.js +++ /dev/null @@ -1,7 +0,0 @@ -var a = "abc"; - -// fsfafwe - -;; - var bbb = "u"; - \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/_include.less b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/_include.less deleted file mode 100644 index 8e508d85b8..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/_include.less +++ /dev/null @@ -1 +0,0 @@ -.foo { color: blue; } diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/main.less b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/main.less deleted file mode 100644 index 86caa7b199..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/less/main.less +++ /dev/null @@ -1,3 +0,0 @@ -@import "_include"; - -.foo { color: red; } diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/app/application.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/app/application.js deleted file mode 100644 index c0a775c362..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/app/application.js +++ /dev/null @@ -1,11 +0,0 @@ -/* ---- - -name: App - -requires: [Util/Util] - -... -*/ - -var bar = foo(); diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/package.yml b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/package.yml deleted file mode 100644 index 331b341f9e..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/package.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: "Util" - -sources: - - "util.js" diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/util.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/util.js deleted file mode 100644 index bb94a5a494..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packager/lib/util.js +++ /dev/null @@ -1,11 +0,0 @@ -/* ---- - -name: Util - -provides: [Util] - -... -*/ - -function foo() {} diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packer/example.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packer/example.js deleted file mode 100644 index d80ab5ad5f..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/packer/example.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Example function - */ -var exampleFunction = function(arg1, arg2) { - // Some comment... - alert('exampleFunction called!'); -} \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/_include.scss b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/_include.scss deleted file mode 100644 index 8e508d85b8..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/_include.scss +++ /dev/null @@ -1 +0,0 @@ -.foo { color: blue; } diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/main.scss b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/main.scss deleted file mode 100644 index 86caa7b199..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sass/main.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "_include"; - -.foo { color: red; } diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/include.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/include.js deleted file mode 100644 index a17b90b208..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/include.js +++ /dev/null @@ -1 +0,0 @@ -/* include.js */ diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif deleted file mode 100644 index f32722af9d..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/assets/images/image.gif +++ /dev/null @@ -1 +0,0 @@ -GIF89a!,D; \ No newline at end of file diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/header.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/header.js deleted file mode 100644 index c60f8d540a..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib1/header.js +++ /dev/null @@ -1,3 +0,0 @@ -/* header.js */ - -//= provide "assets" diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib2/footer.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib2/footer.js deleted file mode 100644 index 5ce2b9c48a..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/lib2/footer.js +++ /dev/null @@ -1 +0,0 @@ -/* footer.js */ diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/main.js b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/main.js deleted file mode 100644 index 6ea483ac4f..0000000000 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Filter/fixtures/sprockets/main.js +++ /dev/null @@ -1,5 +0,0 @@ -//= require
- -//= require "include" - -//= require