From f73806917e9e204e9cf4c81607eebb8cfb745fdf Mon Sep 17 00:00:00 2001
From: Achraf Gharbi <achraf.gharbi@student.ecp.fr>
Date: Tue, 21 Feb 2017 14:59:18 +0100
Subject: [PATCH] Initial entities
Reverse mapping the basic sql db to autogenerate the entities
---
.gitignore | 45 +
.idea/CNinno2k16.iml | 30 +
.idea/modules.xml | 8 +
.idea/vcs.xml | 6 +
.idea/workspace.xml | 3592 +++++++++++++++++
app/config/config.yml | 16 +-
app/config/parameters.yml | 2 +-
composer.json | 12 +-
composer.lock | 257 +-
src/AppBundle/Entity/Album.php | 162 +
src/AppBundle/Entity/Dossier.php | 128 +
src/AppBundle/Entity/Personnes.php | 187 +
src/AppBundle/Entity/Photographe.php | 128 +
src/AppBundle/Entity/Photos.php | 302 ++
.../Resources/config/doctrine/Album.orm.xml | 27 +
.../Resources/config/doctrine/Dossier.orm.xml | 23 +
.../config/doctrine/Personnes.orm.xml | 20 +
.../config/doctrine/Photographe.orm.xml | 23 +
.../Resources/config/doctrine/Photos.orm.xml | 57 +
var/SymfonyRequirements.php | 6 +-
var/bootstrap.php.cache | 1 -
vendor/composer/ClassLoader.php | 31 +
vendor/composer/autoload_files.php | 2 +-
vendor/composer/autoload_namespaces.php | 2 +-
vendor/composer/autoload_psr4.php | 1 +
vendor/composer/autoload_real.php | 2 +-
vendor/composer/autoload_static.php | 18 +-
vendor/composer/installed.json | 1706 ++++----
vendor/doctrine/annotations/README.md | 14 +-
vendor/doctrine/annotations/composer.json | 8 +-
.../Common/Annotations/AnnotationReader.php | 29 +-
.../Common/Annotations/CachedReader.php | 65 +-
.../Doctrine/Common/Annotations/DocParser.php | 58 +-
.../Common/Annotations/TokenParser.php | 11 +-
vendor/doctrine/collections/.travis.yml | 21 -
vendor/doctrine/collections/README.md | 2 +
vendor/doctrine/collections/composer.json | 12 +-
.../Common/Collections/ArrayCollection.php | 35 +-
.../Expr/ClosureExpressionVisitor.php | 38 +
.../Common/Collections/Expr/Comparison.php | 24 +-
.../Common/Collections/ExpressionBuilder.php | 36 +-
vendor/doctrine/collections/phpunit.xml.dist | 31 -
.../AbstractLazyCollectionTest.php | 20 -
.../Collections/ArrayCollectionTest.php | 296 --
.../ClosureExpressionVisitorTest.php | 250 --
.../Common/Collections/CollectionTest.php | 265 --
.../Tests/Common/Collections/CriteriaTest.php | 83 -
.../Collections/ExpressionBuilderTest.php | 125 -
.../Doctrine/Tests/LazyArrayCollection.php | 22 -
.../tests/Doctrine/Tests/TestInit.php | 21 -
vendor/doctrine/common/composer.json | 4 +-
.../Persistence/Mapping/Driver/FileDriver.php | 2 +
.../Common/Persistence/ObjectRepository.php | 4 +-
.../lib/Doctrine/Common/Proxy/Autoloader.php | 8 +-
.../Exception/UnexpectedValueException.php | 36 +-
.../Doctrine/Common/Proxy/ProxyGenerator.php | 88 +-
.../common/lib/Doctrine/Common/Util/Debug.php | 119 +-
.../common/lib/Doctrine/Common/Version.php | 2 +-
vendor/doctrine/dbal/composer.json | 2 +-
.../dbal/lib/Doctrine/DBAL/Connection.php | 63 +-
.../DBAL/Driver/IBMDB2/DB2Statement.php | 40 +-
.../DBAL/Driver/Mysqli/MysqliStatement.php | 58 +-
.../DBAL/Driver/OCI8/OCI8Statement.php | 38 +-
.../DBAL/Driver/PDOSqlsrv/Connection.php | 24 +
.../SQLAnywhere/SQLAnywhereStatement.php | 2 +-
.../DBAL/Driver/SQLSrv/SQLSrvConnection.php | 5 +-
.../DBAL/Driver/SQLSrv/SQLSrvException.php | 18 +-
.../DBAL/Driver/SQLSrv/SQLSrvStatement.php | 97 +-
.../Doctrine/DBAL/Platforms/DB2Platform.php | 24 +-
.../DBAL/Platforms/OraclePlatform.php | 43 +-
.../DBAL/Platforms/SQLServerPlatform.php | 39 +-
.../dbal/lib/Doctrine/DBAL/SQLParserUtils.php | 2 +-
.../DBAL/Schema/OracleSchemaManager.php | 72 +-
.../DBAL/Schema/SQLServerSchemaManager.php | 54 +-
.../dbal/lib/Doctrine/DBAL/Schema/Table.php | 4 +-
.../dbal/lib/Doctrine/DBAL/Version.php | 2 +-
vendor/doctrine/doctrine-bundle/.travis.yml | 7 +-
.../Command/Proxy/RunSqlDoctrineCommand.php | 2 +-
.../DataCollector/DoctrineDataCollector.php | 51 +
.../Compiler/EntityListenerPass.php | 40 +-
.../DependencyInjection/DoctrineExtension.php | 45 +-
vendor/doctrine/doctrine-bundle/Registry.php | 16 +-
.../doctrine-bundle/Resources/config/orm.xml | 2 +-
.../Resources/views/Collector/db.html.twig | 53 +-
.../Twig/DoctrineExtension.php | 11 +-
vendor/doctrine/doctrine-bundle/composer.json | 18 +-
vendor/doctrine/orm/composer.json | 2 +-
.../orm/lib/Doctrine/ORM/AbstractQuery.php | 2 +-
.../AbstractCollectionPersister.php | 11 +-
.../Entity/AbstractEntityPersister.php | 2 +-
...onStrictReadWriteCachedEntityPersister.php | 8 +-
.../Entity/ReadWriteCachedEntityPersister.php | 12 +-
.../lib/Doctrine/ORM/PersistentCollection.php | 2 +
.../AbstractCollectionPersister.php | 6 +-
.../orm/lib/Doctrine/ORM/UnitOfWork.php | 69 +-
.../Composer/ScriptHandler.php | 11 +-
vendor/sensio/distribution-bundle/LICENSE | 2 +-
.../skeleton/app/SymfonyRequirements.php | 6 +-
.../Resources/skeleton/web/config.php | 2 +-
.../sensio/framework-extra-bundle/.travis.yml | 47 +-
.../Compiler/AddParamConverterPass.php | 2 +-
.../SensioFrameworkExtraExtension.php | 60 +-
.../EventListener/ControllerListener.php | 8 +-
.../EventListener/HttpCacheListener.php | 1 +
.../EventListener/ParamConverterListener.php | 8 +-
.../EventListener/SecurityListener.php | 2 +-
.../EventListener/TemplateListener.php | 8 +-
vendor/sensio/framework-extra-bundle/LICENSE | 2 +-
.../ParamConverter/DateTimeParamConverter.php | 4 +-
.../ParamConverter/DoctrineParamConverter.php | 2 +-
.../framework-extra-bundle/composer.json | 10 +-
vendor/swiftmailer/swiftmailer/VERSION | 2 +-
vendor/swiftmailer/swiftmailer/composer.json | 3 +-
.../swiftmailer/swiftmailer/doc/overview.rst | 2 -
.../swiftmailer/swiftmailer/doc/sending.rst | 44 +-
.../lib/classes/Swift/CharacterReader.php | 4 +-
.../Swift/CharacterReader/Utf8Reader.php | 32 +-
.../CharacterStream/ArrayCharacterStream.php | 2 +-
.../lib/classes/Swift/Encoder/QpEncoder.php | 6 +-
.../lib/classes/Swift/Encoding.php | 2 -
.../lib/classes/Swift/Events/CommandEvent.php | 4 +-
.../lib/classes/Swift/MailTransport.php | 2 +
.../swiftmailer/lib/classes/Swift/Message.php | 8 +-
.../Swift/Mime/Headers/AbstractHeader.php | 4 +-
.../classes/Swift/Mime/Headers/DateHeader.php | 2 +-
.../Swift/Mime/Headers/MailboxHeader.php | 8 +-
.../Mime/Headers/ParameterizedHeader.php | 4 +-
.../classes/Swift/Mime/Headers/PathHeader.php | 2 +-
.../lib/classes/Swift/Mime/MimePart.php | 2 +-
.../lib/classes/Swift/Mime/SimpleMessage.php | 36 +-
.../classes/Swift/Mime/SimpleMimeEntity.php | 22 +-
.../Swift/Plugins/ImpersonatePlugin.php | 2 +-
.../classes/Swift/Plugins/MessageLogger.php | 4 +-
.../classes/Swift/Plugins/ThrottlerPlugin.php | 8 +-
.../lib/classes/Swift/Signers/DKIMSigner.php | 62 +-
.../classes/Swift/Signers/DomainKeySigner.php | 16 +-
.../lib/classes/Swift/Signers/SMimeSigner.php | 6 +-
.../ByteArrayReplacementFilter.php | 2 +-
.../StreamFilters/StringReplacementFilter.php | 4 +
.../Swift/Transport/AbstractSmtpTransport.php | 7 +-
.../Esmtp/Auth/NTLMAuthenticator.php | 11 +-
.../Swift/Transport/EsmtpTransport.php | 6 +-
.../classes/Swift/Transport/MailTransport.php | 43 +-
.../classes/Swift/Transport/StreamBuffer.php | 2 +-
.../lib/dependency_maps/mime_deps.php | 2 +-
.../swiftmailer/lib/preferences.php | 2 +-
.../swiftmailer/swiftmailer/phpunit.xml.dist | 4 +-
vendor/symfony/monolog-bundle/CHANGELOG.md | 22 +-
.../DependencyInjection/Configuration.php | 50 +-
.../DependencyInjection/MonologExtension.php | 61 +-
.../symfony/monolog-bundle/MonologBundle.php | 4 +
.../Resources/config/schema/monolog-1.0.xsd | 2 +
vendor/symfony/monolog-bundle/composer.json | 2 +-
.../DeprecationErrorHandler.php | 4 +-
vendor/symfony/phpunit-bridge/LICENSE | 2 +-
.../phpunit-bridge/SymfonyTestsListener.php | 16 +-
.../symfony/phpunit-bridge/bin/simple-phpunit | 8 +-
vendor/symfony/phpunit-bridge/composer.json | 3 +-
vendor/symfony/swiftmailer-bundle/CHANGELOG | 8 +
.../DataCollector/MessageDataCollector.php | 13 +
.../SwiftmailerExtension.php | 44 +-
.../views/Collector/swiftmailer.html.twig | 22 +
.../symfony/.github/PULL_REQUEST_TEMPLATE.md | 2 +-
.../symfony/.github/build-packages.php | 10 +-
vendor/symfony/symfony/.php_cs | 38 -
vendor/symfony/symfony/.travis.yml | 11 +-
vendor/symfony/symfony/CHANGELOG-3.1.md | 84 +
vendor/symfony/symfony/CHANGELOG-3.2.md | 99 +
vendor/symfony/symfony/CONTRIBUTING.md | 2 +
vendor/symfony/symfony/CONTRIBUTORS.md | 111 +-
vendor/symfony/symfony/LICENSE | 2 +-
vendor/symfony/symfony/UPGRADE-3.0.md | 6 +
vendor/symfony/symfony/UPGRADE-3.2.md | 37 +-
vendor/symfony/symfony/UPGRADE-4.0.md | 37 +-
vendor/symfony/symfony/appveyor.yml | 5 +-
vendor/symfony/symfony/composer.json | 6 +-
vendor/symfony/symfony/phpunit | 2 +
.../Doctrine/Form/DoctrineOrmExtension.php | 22 +-
.../src/Symfony/Bridge/Doctrine/LICENSE | 2 +-
.../DoctrineDataCollectorTest.php | 4 +-
.../DataFixtures/ContainerAwareLoaderTest.php | 2 +-
.../CompilerPass/RegisterMappingsPassTest.php | 1 -
.../DoctrineParserCacheTest.php | 6 +-
.../ChoiceList/DoctrineChoiceLoaderTest.php | 10 +-
.../Tests/Form/DoctrineOrmTypeGuesserTest.php | 4 +-
.../MergeDoctrineCollectionListenerTest.php | 2 +-
.../Form/Type/EntityTypePerformanceTest.php | 2 +-
.../Tests/Form/Type/EntityTypeTest.php | 2 +-
.../Doctrine/Tests/Logger/DbalLoggerTest.php | 10 +-
.../Security/User/EntityUserProviderTest.php | 8 +-
.../Constraints/UniqueEntityValidatorTest.php | 69 +-
.../Constraints/UniqueEntityValidator.php | 52 +-
.../src/Symfony/Bridge/Monolog/LICENSE | 2 +-
.../Tests/Handler/ConsoleHandlerTest.php | 12 +-
.../PhpUnit/DeprecationErrorHandler.php | 4 +-
.../src/Symfony/Bridge/PhpUnit/LICENSE | 2 +-
.../Bridge/PhpUnit/SymfonyTestsListener.php | 16 +-
.../Symfony/Bridge/PhpUnit/bin/simple-phpunit | 8 +-
.../src/Symfony/Bridge/PhpUnit/composer.json | 3 +-
.../src/Symfony/Bridge/ProxyManager/LICENSE | 2 +-
.../LazyProxy/Fixtures/php/lazy_service.php | 9 -
.../Fixtures/php/lazy_service_with_hints.php | 13 +-
.../Instantiator/RuntimeInstantiatorTest.php | 2 +-
.../src/Symfony/Bridge/Twig/CHANGELOG.md | 33 +-
.../Bridge/Twig/Command/DebugCommand.php | 2 +-
.../symfony/src/Symfony/Bridge/Twig/LICENSE | 2 +-
.../Symfony/Bridge/Twig/NodeVisitor/Scope.php | 6 +-
.../Bridge/Twig/Tests/AppVariableTest.php | 18 +-
.../Tests/Extension/DumpExtensionTest.php | 6 +-
...xtensionBootstrap3HorizontalLayoutTest.php | 2 +-
.../FormExtensionBootstrap3LayoutTest.php | 2 +-
.../Extension/FormExtensionDivLayoutTest.php | 2 +-
.../FormExtensionTableLayoutTest.php | 2 +-
.../Extension/HttpKernelExtensionTest.php | 4 +-
.../Tests/Extension/RoutingExtensionTest.php | 4 +-
.../Tests/Extension/RuntimeLoaderProvider.php | 2 +-
.../Extension/StopwatchExtensionTest.php | 2 +-
.../Bridge/Twig/Tests/Node/DumpNodeTest.php | 8 +-
.../Bridge/Twig/Tests/Node/FormThemeTest.php | 2 +-
.../Node/SearchAndRenderBlockNodeTest.php | 20 +-
.../Bridge/Twig/Tests/Node/TransNodeTest.php | 4 +-
...ranslationDefaultDomainNodeVisitorTest.php | 4 +-
.../TranslationNodeVisitorTest.php | 2 +-
.../TokenParser/FormThemeTokenParserTest.php | 2 +-
.../Tests/Translation/TwigExtractorTest.php | 10 +-
.../Bridge/Twig/Tests/TwigEngineTest.php | 2 +-
.../src/Symfony/Bridge/Twig/composer.json | 2 +-
.../src/Symfony/Bundle/DebugBundle/LICENSE | 2 +-
.../CacheWarmer/AnnotationsCacheWarmer.php | 19 +-
.../CacheWarmer/SerializerCacheWarmer.php | 24 +-
.../CacheWarmer/ValidatorCacheWarmer.php | 15 +-
.../Command/ConfigDebugCommand.php | 6 +-
.../FrameworkBundle/Command/ServerCommand.php | 4 +-
.../Console/Descriptor/JsonDescriptor.php | 30 +-
.../Console/Descriptor/MarkdownDescriptor.php | 23 +-
.../Console/Descriptor/TextDescriptor.php | 22 +-
.../Console/Descriptor/XmlDescriptor.php | 24 +-
.../Controller/TemplateController.php | 9 +-
.../Compiler/CachePoolClearerPass.php | 18 -
.../Compiler/CachePoolPass.php | 7 +-
.../DependencyInjection/Configuration.php | 27 +-
.../FrameworkExtension.php | 36 +-
.../FrameworkBundle/FrameworkBundle.php | 2 +
.../Symfony/Bundle/FrameworkBundle/LICENSE | 2 +-
.../Resources/config/cache.xml | 9 +-
.../Resources/config/property_info.xml | 2 +-
.../views/Form/button_attributes.html.php | 2 +-
.../Form/widget_container_attributes.html.php | 2 +-
.../Templating/Loader/TemplateLocator.php | 9 +-
.../CacheWarmer/ValidatorCacheWarmerTest.php | 33 +
.../Tests/Command/RouterDebugCommandTest.php | 4 +-
.../Tests/Command/RouterMatchCommandTest.php | 4 +-
.../Command/TranslationDebugCommandTest.php | 14 +-
.../Command/TranslationUpdateCommandTest.php | 12 +-
.../Tests/Console/ApplicationTest.php | 10 +-
.../Controller/ControllerNameParserTest.php | 4 +-
.../Controller/ControllerResolverTest.php | 4 +-
.../Tests/Controller/ControllerTest.php | 88 +-
.../Controller/RedirectControllerTest.php | 8 +-
.../Compiler/AddCacheWarmerPassTest.php | 21 +-
.../AddConstraintValidatorsPassTest.php | 18 +-
.../Compiler/ConfigCachePassTest.php | 12 +-
.../Compiler/LoggingTranslatorPassTest.php | 10 +-
.../Compiler/ProfilerPassTest.php | 5 +-
.../Compiler/PropertyInfoPassTest.php | 4 +-
.../Compiler/SerializerPassTest.php | 11 +-
.../Compiler/TranslatorPassTest.php | 9 +-
.../Compiler/UnusedTagsPassTest.php | 8 +-
.../FrameworkExtensionTest.php | 75 +-
.../Fixtures/Descriptor/builder_1_public.json | 8 +-
.../Fixtures/Descriptor/builder_1_public.md | 9 +-
.../Descriptor/builder_1_services.json | 24 +-
.../Fixtures/Descriptor/builder_1_services.md | 12 +-
.../Fixtures/Descriptor/builder_1_tag1.json | 24 +-
.../Fixtures/Descriptor/builder_1_tag1.md | 3 +-
.../Fixtures/Descriptor/builder_1_tags.json | 20 +-
.../Fixtures/Descriptor/builder_1_tags.md | 6 +-
.../Fixtures/Descriptor/definition_1.json | 8 +-
.../Fixtures/Descriptor/definition_2.json | 16 +-
.../Tests/Fixtures/Descriptor/route_2.json | 4 +-
.../Descriptor/route_collection_1.json | 4 +-
.../Resources/views/translation.html.php | 16 +
.../Bundle/TestBundle/TestBundle.php | 3 +
.../Functional/ConfigDebugCommandTest.php | 10 +
.../Functional/app/ConfigDump/config.yml | 8 +
.../Tests/Routing/RouterTest.php | 4 +-
.../Tests/Templating/DelegatingEngineTest.php | 6 +-
.../Tests/Templating/GlobalVariablesTest.php | 10 +-
.../Templating/Helper/StopwatchHelperTest.php | 2 +-
.../Templating/Loader/TemplateLocatorTest.php | 11 +
.../Templating/TemplateNameParserTest.php | 2 +-
.../Tests/Templating/TimedPhpEngineTest.php | 8 +-
.../Tests/Translation/PhpExtractorTest.php | 37 +-
.../Tests/Translation/TranslatorTest.php | 12 +-
.../ConstraintValidatorFactoryTest.php | 8 +-
.../Translation/PhpExtractor.php | 67 +-
.../Bundle/FrameworkBundle/composer.json | 17 +-
.../DependencyInjection/MainConfiguration.php | 4 +-
.../Security/Factory/RememberMeFactory.php | 3 +-
.../DependencyInjection/SecurityExtension.php | 2 +-
.../src/Symfony/Bundle/SecurityBundle/LICENSE | 2 +-
.../views/Collector/security.html.twig | 8 +-
.../CompleteConfigurationTest.php | 4 +-
.../Tests/SecurityUserValueResolverTest.php | 14 +-
.../Compiler/ExceptionListenerPass.php | 6 +-
.../Compiler/ExtensionPass.php | 39 +-
.../Compiler/RuntimeLoaderPass.php | 1 +
.../DependencyInjection/TwigExtension.php | 97 +-
.../src/Symfony/Bundle/TwigBundle/LICENSE | 2 +-
.../TwigBundle/Resources/config/twig.xml | 32 -
.../Controller/PreviewErrorControllerTest.php | 2 +-
.../Compiler/TwigLoaderPassTest.php | 5 +-
.../DependencyInjection/TwigExtensionTest.php | 51 +-
.../Tests/Functional/CacheWarmingTest.php | 4 +-
.../Functional/NoTemplatingEntryTest.php | 1 +
.../Tests/Loader/FilesystemLoaderTest.php | 24 +-
.../TwigBundle/Tests/TemplateIteratorTest.php | 2 +-
.../Symfony/Bundle/TwigBundle/TwigEngine.php | 8 +-
.../Symfony/Bundle/TwigBundle/composer.json | 7 +-
.../Csp/ContentSecurityPolicyHandler.php | 3 +-
.../Symfony/Bundle/WebProfilerBundle/LICENSE | 2 +-
.../Resources/views/Collector/form.html.twig | 4 +-
.../Resources/views/Profiler/toolbar.css.twig | 5 +-
.../Controller/ProfilerControllerTest.php | 6 +-
.../Csp/ContentSecurityPolicyHandlerTest.php | 17 +-
.../WebProfilerExtensionTest.php | 2 +-
.../WebDebugToolbarListenerTest.php | 14 +-
.../Tests/Profiler/TemplateManagerTest.php | 4 +-
.../src/Symfony/Component/Asset/LICENSE | 2 +-
.../Tests/Context/RequestStackContextTest.php | 12 +-
.../Component/Asset/Tests/PackagesTest.php | 4 +-
.../Component/Asset/Tests/PathPackageTest.php | 2 +-
.../Component/Asset/Tests/UrlPackageTest.php | 2 +-
.../Symfony/Component/BrowserKit/Cookie.php | 4 +-
.../src/Symfony/Component/BrowserKit/LICENSE | 2 +-
.../Component/BrowserKit/Tests/CookieTest.php | 7 +-
.../Cache/Adapter/AdapterInterface.php | 15 +-
.../Component/Cache/Adapter/ChainAdapter.php | 32 +-
.../Cache/Adapter/FilesystemAdapter.php | 6 +
.../Cache/Adapter/FilesystemAdapterTrait.php | 4 +-
.../Component/Cache/Adapter/PdoAdapter.php | 13 +-
.../Cache/Adapter/PhpArrayAdapter.php | 76 +-
.../Cache/Adapter/PhpFilesAdapter.php | 7 +-
.../Component/Cache/Adapter/RedisAdapter.php | 2 +-
.../Cache/Adapter/TagAwareAdapter.php | 42 +-
.../src/Symfony/Component/Cache/CacheItem.php | 8 +-
.../src/Symfony/Component/Cache/LICENSE | 2 +-
.../Tests/Adapter/TagAwareAdapterTest.php | 17 +
.../ClassLoader/ClassCollectionLoader.php | 8 +-
.../src/Symfony/Component/ClassLoader/LICENSE | 2 +-
.../Fixtures/Namespaced/WithStrictTypes.php | 2 +-
.../Builder/ArrayNodeDefinition.php | 26 +-
.../Definition/Builder/EnumNodeDefinition.php | 2 +-
.../Config/Definition/Builder/ExprBuilder.php | 24 +-
.../Definition/Builder/MergeBuilder.php | 6 +-
.../Config/Definition/Builder/NodeBuilder.php | 6 +-
.../Definition/Builder/NodeDefinition.php | 30 +-
.../Builder/NormalizationBuilder.php | 4 +-
.../Builder/NumericNodeDefinition.php | 4 +-
.../Definition/Builder/ValidationBuilder.php | 2 +-
.../Config/Definition/PrototypedArrayNode.php | 74 +-
.../src/Symfony/Component/Config/LICENSE | 2 +-
.../Component/Config/Loader/Loader.php | 2 +-
.../Config/ResourceCheckerConfigCache.php | 5 -
.../Definition/PrototypedArrayNodeTest.php | 161 +
.../Tests/Loader/DelegatingLoaderTest.php | 8 +-
.../Config/Tests/Loader/FileLoaderTest.php | 4 +-
.../Tests/Loader/LoaderResolverTest.php | 8 +-
.../Config/Tests/Loader/LoaderTest.php | 16 +-
.../Tests/ResourceCheckerConfigCacheTest.php | 20 +-
.../Config/Tests/Util/XmlUtilsTest.php | 2 +-
.../Symfony/Component/Console/Application.php | 8 +-
.../Component/Console/Command/Command.php | 39 +-
.../Console/Descriptor/MarkdownDescriptor.php | 5 +-
.../Console/Descriptor/TextDescriptor.php | 28 +-
.../Console/Formatter/OutputFormatter.php | 16 +-
.../Formatter/OutputFormatterStyleStack.php | 2 +-
.../Console/Helper/DescriptorHelper.php | 2 +-
.../Component/Console/Helper/Helper.php | 2 +-
.../Console/Helper/SymfonyQuestionHelper.php | 2 +-
.../Component/Console/Helper/Table.php | 12 +-
.../Component/Console/Helper/TableCell.php | 4 +
.../Component/Console/Helper/TableStyle.php | 18 +-
.../src/Symfony/Component/Console/LICENSE | 2 +-
.../Console/Question/ChoiceQuestion.php | 6 +-
.../Component/Console/Question/Question.php | 12 +-
.../Component/Console/Style/SymfonyStyle.php | 4 +-
.../Symfony/Component/Console/Terminal.php | 4 +-
.../Console/Tester/CommandTester.php | 2 +-
.../Console/Tests/ApplicationTest.php | 6 +-
.../Console/Tests/Command/CommandTest.php | 74 +-
.../Descriptor/AbstractDescriptorTest.php | 2 +-
.../Descriptor/MarkdownDescriptorTest.php | 18 +
.../Tests/Descriptor/ObjectsProvider.php | 3 +
.../Tests/Descriptor/TextDescriptorTest.php | 18 +
.../command/interactive_command_1.php | 2 +-
.../Helper/AbstractQuestionHelperTest.php | 2 +-
.../Console/Tests/Helper/HelperSetTest.php | 2 +-
.../Tests/Helper/ProcessHelperTest.php | 7 +-
.../Console/Tests/Helper/ProgressBarTest.php | 6 +-
.../Tests/Helper/QuestionHelperTest.php | 6 +-
.../Helper/SymfonyQuestionHelperTest.php | 17 +-
.../Console/Tests/Helper/TableTest.php | 81 +-
.../Tests/Output/ConsoleOutputTest.php | 16 +
.../Console/Tests/Output/NullOutputTest.php | 48 +
.../Console/Tests/Style/SymfonyStyleTest.php | 1 +
.../Exception/SyntaxErrorException.php | 10 +-
.../src/Symfony/Component/CssSelector/LICENSE | 2 +-
.../CssSelector/Node/Specificity.php | 2 +-
.../CssSelector/Parser/TokenStream.php | 4 +-
.../XPath/Extension/NodeExtension.php | 2 +-
.../CssSelector/XPath/Translator.php | 4 +-
.../Component/CssSelector/XPath/XPathExpr.php | 8 +-
.../Symfony/Component/Debug/ErrorHandler.php | 31 +-
.../Debug/Exception/FlattenException.php | 2 +-
.../Component/Debug/ExceptionHandler.php | 2 +-
.../ClassNotFoundFatalErrorHandler.php | 2 +-
.../UndefinedMethodFatalErrorHandler.php | 8 +-
.../src/Symfony/Component/Debug/LICENSE | 2 +-
.../Debug/Tests/ErrorHandlerTest.php | 37 +-
.../Debug/Tests/ExceptionHandlerTest.php | 4 +-
.../UndefinedMethodFatalErrorHandlerTest.php | 9 +
.../Compiler/AutowirePass.php | 9 +-
.../Compiler/CheckCircularReferencesPass.php | 1 -
.../Compiler/FactoryReturnTypePass.php | 8 +-
.../Compiler/PriorityTaggedServiceTrait.php | 22 +-
.../Compiler/ServiceReferenceGraph.php | 4 +-
.../DependencyInjection/ContainerBuilder.php | 28 +-
.../DependencyInjection/Definition.php | 56 +-
.../DefinitionDecorator.php | 2 +-
.../DependencyInjection/Dumper/YamlDumper.php | 2 +-
.../Component/DependencyInjection/LICENSE | 2 +-
.../Loader/YamlFileLoader.php | 12 +-
.../schema/dic/services/services-1.0.xsd | 4 +-
.../Tests/Compiler/AutowirePassTest.php | 38 +-
.../Compiler/ExtensionCompilerPassTest.php | 6 +-
.../MergeExtensionConfigurationPassTest.php | 4 +-
.../Tests/Compiler/PassConfigTest.php | 4 +-
.../PriorityTaggedServiceTraitTest.php | 12 +
.../Tests/ContainerBuilderTest.php | 8 +-
.../Tests/ContainerTest.php | 28 +-
.../Tests/DefinitionTest.php | 11 +
.../Tests/Dumper/PhpDumperTest.php | 4 +-
.../Tests/Fixtures/yaml/services6.yml | 2 +
.../RealServiceInstantiatorTest.php | 2 +-
.../Symfony/Component/DomCrawler/Crawler.php | 34 +-
.../src/Symfony/Component/DomCrawler/Form.php | 4 +-
.../DomCrawler/FormFieldRegistry.php | 2 +-
.../src/Symfony/Component/DomCrawler/LICENSE | 2 +-
.../DomCrawler/Tests/CrawlerTest.php | 4 +-
.../EventDispatcher/GenericEvent.php | 4 +-
.../Symfony/Component/EventDispatcher/LICENSE | 2 +-
.../ContainerAwareEventDispatcherTest.php | 14 +-
.../Debug/TraceableEventDispatcherTest.php | 4 +-
.../RegisterListenersPassTest.php | 14 +-
.../Tests/ImmutableEventDispatcherTest.php | 6 +-
.../Component/ExpressionLanguage/Compiler.php | 8 +-
.../Component/ExpressionLanguage/LICENSE | 2 +-
.../Tests/ExpressionLanguageTest.php | 14 +-
.../ParserCache/ParserCacheAdapterTest.php | 22 +-
.../Component/Filesystem/Filesystem.php | 4 +-
.../src/Symfony/Component/Filesystem/LICENSE | 2 +-
.../src/Symfony/Component/Finder/Finder.php | 52 +-
.../src/Symfony/Component/Finder/LICENSE | 2 +-
.../src/Symfony/Component/Form/Button.php | 2 +-
.../Symfony/Component/Form/ButtonBuilder.php | 6 +-
.../Form/ChoiceList/View/ChoiceGroupView.php | 2 +-
.../DateTimeToLocalizedStringTransformer.php | 8 +-
.../Form/Extension/Core/Type/DateType.php | 14 +-
.../Form/Extension/Core/Type/TimeType.php | 2 +-
.../Validator/Constraints/FormValidator.php | 9 +-
.../Validator/Type/BaseValidatorExtension.php | 5 +
.../src/Symfony/Component/Form/Form.php | 2 +-
.../Symfony/Component/Form/FormBuilder.php | 2 +-
.../Component/Form/FormBuilderInterface.php | 8 +-
.../Form/FormConfigBuilderInterface.php | 50 +-
.../Form/FormFactoryBuilderInterface.php | 18 +-
.../Symfony/Component/Form/FormInterface.php | 24 +-
.../src/Symfony/Component/Form/FormView.php | 4 +-
.../Symfony/Component/Form/Guess/Guess.php | 2 +-
.../src/Symfony/Component/Form/LICENSE | 2 +-
.../Form/ResolvedFormTypeInterface.php | 2 +-
.../Symfony/Component/Form/SubmitButton.php | 2 +-
.../Tests/AbstractBootstrap3LayoutTest.php | 16 +-
.../Component/Form/Tests/AbstractFormTest.php | 12 +-
.../Form/Tests/AbstractLayoutTest.php | 18 +-
.../Form/Tests/AbstractRequestHandlerTest.php | 9 +-
.../Component/Form/Tests/ButtonTest.php | 4 +-
.../Factory/CachingFactoryDecoratorTest.php | 40 +-
.../Factory/DefaultChoiceListFactoryTest.php | 4 +-
.../Factory/PropertyAccessDecoratorTest.php | 44 +-
.../Tests/ChoiceList/LazyChoiceListTest.php | 4 +-
.../Component/Form/Tests/CompoundFormTest.php | 2 +-
.../DataMapper/PropertyPathMapperTest.php | 4 +-
.../BaseDateTimeTransformerTest.php | 12 +-
.../DataTransformerChainTest.php | 8 +-
...teTimeToLocalizedStringTransformerTest.php | 9 +
.../FixUrlProtocolListenerTest.php | 6 +-
.../MergeCollectionListenerTest.php | 6 +-
.../EventListener/ResizeFormListenerTest.php | 8 +-
.../Core/EventListener/TrimListenerTest.php | 4 +-
.../Extension/Core/Type/DateTypeTest.php | 53 +-
.../CsrfValidationListenerTest.php | 10 +-
.../Csrf/Type/FormTypeCsrfExtensionTest.php | 4 +-
.../DataCollectorExtensionTest.php | 2 +-
.../DataCollector/FormDataCollectorTest.php | 8 +-
.../DataCollector/FormDataExtractorTest.php | 16 +-
.../Type/DataCollectorTypeExtensionTest.php | 4 +-
.../DependencyInjectionExtensionTest.php | 12 +-
.../Constraints/FormValidatorTest.php | 103 +-
.../EventListener/ValidationListenerTest.php | 12 +-
.../Type/BaseValidatorExtensionTest.php | 10 +
.../Type/FormTypeValidatorExtensionTest.php | 2 +-
.../Extension/Validator/Type/TypeTestCase.php | 2 +-
.../Type/UploadValidatorExtensionTest.php | 2 +-
.../Validator/Util/ServerParamsTest.php | 4 +-
.../Validator/ValidatorTypeGuesserTest.php | 2 +-
.../ViolationMapper/ViolationMapperTest.php | 4 +-
.../Component/Form/Tests/FormBuilderTest.php | 6 +-
.../Component/Form/Tests/FormConfigTest.php | 4 +-
.../Form/Tests/FormFactoryBuilderTest.php | 2 +-
.../Component/Form/Tests/FormFactoryTest.php | 14 +-
.../Component/Form/Tests/FormRegistryTest.php | 8 +-
.../Form/Tests/ResolvedFormTypeTest.php | 32 +-
.../Component/Form/Tests/SimpleFormTest.php | 24 +-
.../Component/HttpFoundation/AcceptHeader.php | 6 +-
.../HttpFoundation/AcceptHeaderItem.php | 10 +-
.../HttpFoundation/BinaryFileResponse.php | 8 +-
.../Component/HttpFoundation/Cookie.php | 18 +-
.../Component/HttpFoundation/File/File.php | 2 +-
.../File/MimeType/ExtensionGuesser.php | 2 +-
.../File/MimeType/MimeTypeGuesser.php | 2 +-
.../Component/HttpFoundation/JsonResponse.php | 12 +-
.../Symfony/Component/HttpFoundation/LICENSE | 2 +-
.../HttpFoundation/RedirectResponse.php | 2 +-
.../Component/HttpFoundation/Request.php | 7 +-
.../Component/HttpFoundation/Response.php | 46 +-
.../HttpFoundation/StreamedResponse.php | 2 +-
.../HttpFoundation/Tests/CookieTest.php | 28 +-
.../HttpFoundation/Tests/File/FileTest.php | 2 +-
.../Tests/ResponseHeaderBagTest.php | 22 +-
.../HttpFoundation/Tests/ResponseTest.php | 4 +-
.../Handler/MemcacheSessionHandlerTest.php | 2 +-
.../Handler/MemcachedSessionHandlerTest.php | 2 +-
.../Storage/Handler/PdoSessionHandlerTest.php | 6 +-
.../Handler/WriteCheckSessionHandlerTest.php | 8 +-
.../Storage/Proxy/SessionHandlerProxyTest.php | 2 +-
.../Component/HttpKernel/Bundle/Bundle.php | 4 +-
.../DataCollector/DumpDataCollector.php | 2 +-
.../DataCollector/RequestDataCollector.php | 43 +-
.../AddRequestFormatsListener.php | 2 +-
.../EventListener/DebugHandlersListener.php | 2 +-
.../Symfony/Component/HttpKernel/Kernel.php | 14 +-
.../src/Symfony/Component/HttpKernel/LICENSE | 2 +-
.../Component/HttpKernel/Profiler/Profile.php | 10 +-
.../HttpKernel/Tests/Bundle/BundleTest.php | 36 +-
.../CacheClearer/ChainCacheClearerTest.php | 2 +-
.../Component/HttpKernel/Tests/ClientTest.php | 27 +-
.../Tests/Config/FileLocatorTest.php | 4 +-
.../Tests/Controller/ArgumentResolverTest.php | 2 +-
.../Controller/ControllerResolverTest.php | 4 +-
.../DataCollector/LoggerDataCollectorTest.php | 2 +-
.../RequestDataCollectorTest.php | 6 +-
.../DataCollector/TimeDataCollectorTest.php | 2 +-
.../Debug/TraceableEventDispatcherTest.php | 4 +-
.../FragmentRendererPassTest.php | 16 +-
.../LazyLoadingFragmentHandlerTest.php | 6 +-
.../MergeExtensionConfigurationPassTest.php | 14 +-
.../AddRequestFormatsListenerTest.php | 4 +-
.../DebugHandlersListenerTest.php | 6 +-
.../EventListener/ExceptionListenerTest.php | 4 +-
.../EventListener/FragmentListenerTest.php | 2 +-
.../EventListener/LocaleListenerTest.php | 14 +-
.../EventListener/ProfilerListenerTest.php | 2 +-
.../EventListener/ResponseListenerTest.php | 2 +-
.../EventListener/RouterListenerTest.php | 20 +-
.../EventListener/SurrogateListenerTest.php | 6 +-
.../EventListener/TestSessionListenerTest.php | 2 +-
.../EventListener/TranslatorListenerTest.php | 6 +-
.../ValidateRequestListenerTest.php | 2 +-
.../Controller/BasicTypesController.php | 9 +
.../Fixtures/Controller/ExtendingRequest.php | 9 +
.../Controller/VariadicController.php | 9 +
.../Tests/Fragment/FragmentHandlerTest.php | 2 +-
.../Fragment/HIncludeFragmentRendererTest.php | 2 +-
.../Fragment/InlineFragmentRendererTest.php | 16 +-
.../HttpKernel/Tests/HttpCache/EsiTest.php | 2 +-
.../HttpKernel/Tests/HttpCache/SsiTest.php | 2 +-
.../HttpKernel/Tests/HttpKernelTest.php | 6 +-
.../Component/HttpKernel/Tests/KernelTest.php | 6 +-
.../src/Symfony/Component/Inflector/LICENSE | 2 +-
.../Component/Intl/Collator/Collator.php | 2 +-
.../Data/Generator/AbstractDataGenerator.php | 3 -
.../Data/Generator/LocaleDataGenerator.php | 3 -
.../Intl/DateFormatter/IntlDateFormatter.php | 2 +-
.../src/Symfony/Component/Intl/LICENSE | 2 +-
.../Intl/NumberFormatter/NumberFormatter.php | 2 +-
.../Bundle/Reader/BundleEntryReaderTest.php | 2 +-
.../Component/Intl/Util/IntlTestHelper.php | 2 +-
.../Component/Intl/Util/SvnRepository.php | 2 +-
.../Ldap/Adapter/EntryManagerInterface.php | 12 +
.../Ldap/Adapter/ExtLdap/Adapter.php | 2 +-
.../Ldap/Adapter/ExtLdap/EntryManager.php | 21 +-
.../Component/Ldap/Adapter/ExtLdap/Query.php | 8 +-
.../Component/Ldap/Adapter/QueryInterface.php | 6 +
.../src/Symfony/Component/Ldap/LICENSE | 2 +-
.../Tests/Adapter/ExtLdap/AdapterTest.php | 12 +
.../Tests/Adapter/ExtLdap/LdapManagerTest.php | 34 +
.../Component/Ldap/Tests/LdapClientTest.php | 6 +-
.../Symfony/Component/Ldap/Tests/LdapTest.php | 4 +-
.../Symfony/Component/OptionsResolver/LICENSE | 2 +-
.../OptionsResolver/OptionsResolver.php | 22 +-
.../src/Symfony/Component/Process/LICENSE | 2 +-
.../src/Symfony/Component/Process/Process.php | 12 +-
.../Component/Process/ProcessBuilder.php | 26 +-
.../Component/Process/ProcessUtils.php | 2 +-
.../Tests/ProcessFailedExceptionTest.php | 18 +-
.../Component/Process/Tests/ProcessTest.php | 2 +-
.../Process/Tests/ProcessUtilsTest.php | 1 +
.../Process/Tests/SignalListener.php | 2 +-
.../Symfony/Component/PropertyAccess/LICENSE | 2 +-
.../PropertyAccess/PropertyAccess.php | 4 +-
.../PropertyAccess/PropertyAccessor.php | 2 +-
.../PropertyAccessorBuilder.php | 8 +-
.../Tests/Fixtures/TypeHinted.php | 21 +
.../Tests/PropertyAccessorCollectionTest.php | 16 +-
.../Tests/PropertyAccessorTest.php | 11 +
.../Extractor/PhpDocExtractor.php | 3 +
.../Extractor/ReflectionExtractor.php | 10 +
.../Symfony/Component/PropertyInfo/LICENSE | 2 +-
.../PropertyInfo/PropertyInfoExtractor.php | 2 +-
.../Tests/Extractors/PhpDocExtractorTest.php | 2 +
.../Extractors/ReflectionExtractorTest.php | 2 +
.../PropertyInfo/Tests/Fixtures/Dummy.php | 15 +
.../Symfony/Component/PropertyInfo/Type.php | 4 +-
.../src/Symfony/Component/Routing/LICENSE | 2 +-
.../Routing/Loader/AnnotationClassLoader.php | 2 +-
.../Matcher/Dumper/DumperCollection.php | 6 +-
.../Matcher/Dumper/DumperPrefixCollection.php | 2 +-
.../Component/Routing/RequestContext.php | 22 +-
.../src/Symfony/Component/Routing/Route.php | 28 +-
.../Routing/RouteCollectionBuilder.php | 4 +-
.../Tests/Generator/UrlGeneratorTest.php | 2 +-
.../Loader/AnnotationClassLoaderTest.php | 7 +-
.../Tests/Loader/PhpFileLoaderTest.php | 2 +-
.../Tests/Loader/XmlFileLoaderTest.php | 2 +-
.../Tests/Loader/YamlFileLoaderTest.php | 2 +-
.../Tests/RouteCollectionBuilderTest.php | 10 +-
.../Component/Routing/Tests/RouterTest.php | 12 +-
.../Symfony/Component/Security/Core/LICENSE | 2 +-
.../AuthenticationProviderManagerTest.php | 24 +-
.../AuthenticationTrustResolverTest.php | 6 +-
.../AnonymousAuthenticationProviderTest.php | 6 +-
.../DaoAuthenticationProviderTest.php | 52 +-
.../LdapBindAuthenticationProviderTest.php | 18 +-
...uthenticatedAuthenticationProviderTest.php | 16 +-
.../RememberMeAuthenticationProviderTest.php | 14 +-
.../UserAuthenticationProviderTest.php | 26 +-
.../Token/AbstractTokenTest.php | 12 +-
.../Token/RememberMeTokenTest.php | 2 +-
.../Token/Storage/TokenStorageTest.php | 2 +-
.../AccessDecisionManagerTest.php | 8 +-
.../AuthorizationCheckerTest.php | 10 +-
.../DebugAccessDecisionManagerTest.php | 2 +-
.../Voter/AuthenticatedVoterTest.php | 6 +-
.../Voter/ExpressionVoterTest.php | 8 +-
.../Authorization/Voter/RoleVoterTest.php | 2 +-
.../Tests/Authorization/Voter/VoterTest.php | 2 +-
.../Core/Tests/Encoder/EncoderFactoryTest.php | 4 +-
.../Tests/Encoder/UserPasswordEncoderTest.php | 12 +-
.../Core/Tests/Role/SwitchUserRoleTest.php | 4 +-
.../Core/Tests/User/ChainUserProviderTest.php | 4 +-
.../Core/Tests/User/LdapUserProviderTest.php | 119 +-
.../Core/Tests/User/UserCheckerTest.php | 16 +-
.../Constraints/UserPasswordValidatorTest.php | 12 +-
.../Security/Core/User/LdapUserProvider.php | 33 +-
.../Symfony/Component/Security/Csrf/LICENSE | 2 +-
.../Csrf/Tests/CsrfTokenManagerTest.php | 4 +-
.../Symfony/Component/Security/Guard/LICENSE | 2 +-
.../GuardAuthenticationListenerTest.php | 22 +-
.../Tests/GuardAuthenticatorHandlerTest.php | 8 +-
.../GuardAuthenticationProviderTest.php | 20 +-
.../Symfony/Component/Security/Http/LICENSE | 2 +-
.../Security/Http/Tests/AccessMapTest.php | 6 +-
...efaultAuthenticationFailureHandlerTest.php | 16 +-
...efaultAuthenticationSuccessHandlerTest.php | 10 +-
.../SimpleAuthenticationHandlerTest.php | 12 +-
.../BasicAuthenticationEntryPointTest.php | 4 +-
.../DigestAuthenticationEntryPointTest.php | 6 +-
.../FormAuthenticationEntryPointTest.php | 14 +-
.../AbstractPreAuthenticatedListenerTest.php | 32 +-
.../Tests/Firewall/AccessListenerTest.php | 54 +-
.../AnonymousAuthenticationListenerTest.php | 22 +-
.../BasicAuthenticationListenerTest.php | 50 +-
.../Tests/Firewall/ChannelListenerTest.php | 32 +-
.../Tests/Firewall/ContextListenerTest.php | 32 +-
.../DigestAuthenticationListenerTest.php | 8 +-
.../Tests/Firewall/ExceptionListenerTest.php | 24 +-
.../Tests/Firewall/LogoutListenerTest.php | 10 +-
.../Tests/Firewall/RememberMeListenerTest.php | 38 +-
.../RemoteUserAuthenticationListenerTest.php | 12 +-
.../SimplePreAuthenticationListenerTest.php | 14 +-
.../Tests/Firewall/SwitchUserListenerTest.php | 36 +-
.../X509AuthenticationListenerTest.php | 16 +-
.../Security/Http/Tests/FirewallMapTest.php | 30 +-
.../Security/Http/Tests/FirewallTest.php | 42 +-
.../Security/Http/Tests/HttpUtilsTest.php | 24 +-
.../CookieClearingLogoutHandlerTest.php | 2 +-
.../DefaultLogoutSuccessHandlerTest.php | 4 +-
.../Tests/Logout/SessionLogoutHandlerTest.php | 6 +-
.../AbstractRememberMeServicesTest.php | 26 +-
...istentTokenBasedRememberMeServicesTest.php | 32 +-
.../Tests/RememberMe/ResponseListenerTest.php | 2 +-
.../TokenBasedRememberMeServicesTest.php | 16 +-
.../SessionAuthenticationStrategyTest.php | 8 +-
.../src/Symfony/Component/Security/LICENSE | 2 +-
...PasswordFormAuthenticationListenerTest.php | 14 +-
.../Serializer/Annotation/MaxDepth.php | 4 +-
.../src/Symfony/Component/Serializer/LICENSE | 2 +-
.../Normalizer/AbstractObjectNormalizer.php | 11 +
.../Tests/Annotation/MaxDepthTest.php | 20 +-
.../Tests/Encoder/JsonDecodeTest.php | 2 +-
.../Tests/Encoder/JsonEncodeTest.php | 2 +-
.../Tests/Mapping/ClassMetadataTest.php | 12 +-
.../Factory/CacheMetadataFactoryTest.php | 6 +-
.../Factory/ClassMetadataFactoryTest.php | 4 +-
.../Normalizer/AbstractNormalizerTest.php | 4 +-
.../Normalizer/ArrayDenormalizerTest.php | 2 +-
.../Normalizer/GetSetMethodNormalizerTest.php | 4 +-
.../JsonSerializableNormalizerTest.php | 2 +-
.../Tests/Normalizer/ObjectNormalizerTest.php | 32 +-
.../Normalizer/PropertyNormalizerTest.php | 4 +-
.../Serializer/Tests/SerializerTest.php | 16 +-
.../Component/Serializer/composer.json | 1 +
.../src/Symfony/Component/Stopwatch/LICENSE | 2 +-
.../Symfony/Component/Stopwatch/Section.php | 6 +-
.../Symfony/Component/Stopwatch/Stopwatch.php | 10 +-
.../Component/Stopwatch/StopwatchEvent.php | 6 +-
.../src/Symfony/Component/Templating/LICENSE | 2 +-
.../Templating/TemplateReferenceInterface.php | 2 +-
.../Templating/Tests/DelegatingEngineTest.php | 2 +-
.../Tests/Loader/CacheLoaderTest.php | 4 +-
.../Tests/Loader/FilesystemLoaderTest.php | 2 +-
.../Templating/Tests/Loader/LoaderTest.php | 2 +-
.../src/Symfony/Component/Translation/LICENSE | 2 +-
.../Translation/MessageCatalogueInterface.php | 6 +-
.../Tests/Dumper/FileDumperTest.php | 2 +-
.../Tests/LoggingTranslatorTest.php | 4 +-
.../Tests/MessageCatalogueTest.php | 14 +-
.../Translation/Tests/TranslatorCacheTest.php | 8 +-
.../Tests/Writer/TranslationWriterTest.php | 2 +-
.../Translation/Util/ArrayConverter.php | 2 +-
.../Validator/Constraints/BicValidator.php | 2 +-
.../src/Symfony/Component/Validator/LICENSE | 2 +-
.../Validator/Mapping/ClassMetadata.php | 19 +-
.../Factory/LazyLoadingMetadataFactory.php | 33 +-
.../Validator/Mapping/GenericMetadata.php | 4 +-
.../Mapping/Loader/XmlFileLoader.php | 2 +-
.../Resources/translations/validators.de.xlf | 2 +-
.../Resources/translations/validators.en.xlf | 2 +-
.../Resources/translations/validators.hr.xlf | 36 +
.../Resources/translations/validators.id.xlf | 4 +
.../Resources/translations/validators.nl.xlf | 2 +-
.../Resources/translations/validators.no.xlf | 44 +-
.../Resources/translations/validators.pl.xlf | 6 +-
.../Tests/Constraints/EmailValidatorTest.php | 2 +-
.../Constraints/ExpressionValidatorTest.php | 2 +-
.../Tests/Mapping/ClassMetadataTest.php | 34 +
.../LazyLoadingMetadataFactoryTest.php | 57 +-
.../Tests/Mapping/Loader/FilesLoaderTest.php | 2 +-
.../Tests/Mapping/Loader/LoaderChainTest.php | 12 +-
.../Mapping/Loader/XmlFileLoaderTest.php | 2 +
.../Mapping/Loader/constraint-mapping.xml | 5 +
.../Tests/Validator/AbstractTest.php | 4 +-
.../Validator/RecursiveValidatorTest.php | 4 +-
.../Validator/Tests/ValidatorBuilderTest.php | 8 +-
.../ContextualValidatorInterface.php | 8 +-
.../RecursiveContextualValidator.php | 4 +-
.../Validator/ValidatorBuilderInterface.php | 30 +-
.../ConstraintViolationBuilderInterface.php | 16 +-
.../VarDumper/Caster/ReflectionCaster.php | 6 +-
.../VarDumper/Caster/ResourceCaster.php | 4 +-
.../Component/VarDumper/Cloner/Data.php | 2 +-
.../src/Symfony/Component/VarDumper/LICENSE | 2 +-
.../Tests/Caster/ExceptionCasterTest.php | 2 +-
.../VarDumper/Tests/CliDumperTest.php | 2 +-
.../src/Symfony/Component/Workflow/LICENSE | 2 +-
.../Tests/Validator/WorkflowValidatorTest.php | 34 +
.../Workflow/Tests/WorkflowBuilderTrait.php | 28 +
.../Component/Workflow/Tests/WorkflowTest.php | 107 +-
.../Workflow/Validator/WorkflowValidator.php | 11 +
.../Symfony/Component/Workflow/Workflow.php | 116 +-
.../Symfony/Component/Workflow/composer.json | 3 +-
.../src/Symfony/Component/Yaml/Inline.php | 4 +-
.../src/Symfony/Component/Yaml/LICENSE | 2 +-
.../src/Symfony/Component/Yaml/Parser.php | 2 +-
.../Component/Yaml/Tests/InlineTest.php | 10 +
.../Component/Yaml/Tests/ParserTest.php | 16 +
vendor/twig/twig/.travis.yml | 42 +-
vendor/twig/twig/LICENSE | 2 +-
vendor/twig/twig/composer.json | 12 +-
vendor/twig/twig/ext/twig/config.m4 | 8 -
vendor/twig/twig/ext/twig/config.w32 | 8 -
vendor/twig/twig/ext/twig/php_twig.h | 35 -
vendor/twig/twig/ext/twig/twig.c | 1127 ------
vendor/twig/twig/lib/Twig/Autoloader.php | 54 -
vendor/twig/twig/lib/Twig/BaseNodeVisitor.php | 18 +-
.../twig/twig/lib/Twig/Cache/Filesystem.php | 14 +-
vendor/twig/twig/lib/Twig/Cache/Null.php | 16 +-
vendor/twig/twig/lib/Twig/CacheInterface.php | 2 +-
vendor/twig/twig/lib/Twig/Compiler.php | 75 +-
.../twig/twig/lib/Twig/CompilerInterface.php | 34 -
vendor/twig/twig/lib/Twig/Environment.php | 833 +---
vendor/twig/twig/lib/Twig/Error.php | 174 +-
vendor/twig/twig/lib/Twig/Error/Loader.php | 8 +-
vendor/twig/twig/lib/Twig/Error/Runtime.php | 4 +-
vendor/twig/twig/lib/Twig/Error/Syntax.php | 25 +-
.../twig/lib/Twig/ExistsLoaderInterface.php | 18 +-
.../twig/twig/lib/Twig/ExpressionParser.php | 118 +-
vendor/twig/twig/lib/Twig/Extension.php | 49 +-
vendor/twig/twig/lib/Twig/Extension/Core.php | 924 +++--
vendor/twig/twig/lib/Twig/Extension/Debug.php | 21 +-
.../twig/twig/lib/Twig/Extension/Escaper.php | 27 +-
.../lib/Twig/Extension/GlobalsInterface.php | 6 +
.../Twig/Extension/InitRuntimeInterface.php | 8 +
.../twig/lib/Twig/Extension/Optimizer.php | 12 +-
.../twig/twig/lib/Twig/Extension/Profiler.php | 7 +-
.../twig/twig/lib/Twig/Extension/Sandbox.php | 16 +-
.../twig/twig/lib/Twig/Extension/Staging.php | 64 +-
.../twig/lib/Twig/Extension/StringLoader.php | 12 +-
.../twig/twig/lib/Twig/ExtensionInterface.php | 37 +-
.../Twig/FileExtensionEscapingStrategy.php | 2 +-
vendor/twig/twig/lib/Twig/Filter.php | 79 +-
vendor/twig/twig/lib/Twig/Filter/Function.php | 40 -
vendor/twig/twig/lib/Twig/Filter/Method.php | 42 -
vendor/twig/twig/lib/Twig/Filter/Node.php | 42 -
.../twig/lib/Twig/FilterCallableInterface.php | 24 -
vendor/twig/twig/lib/Twig/FilterInterface.php | 43 -
vendor/twig/twig/lib/Twig/Function.php | 79 +-
.../twig/twig/lib/Twig/Function/Function.php | 41 -
vendor/twig/twig/lib/Twig/Function/Method.php | 43 -
vendor/twig/twig/lib/Twig/Function/Node.php | 42 -
.../lib/Twig/FunctionCallableInterface.php | 24 -
.../twig/twig/lib/Twig/FunctionInterface.php | 40 -
vendor/twig/twig/lib/Twig/Lexer.php | 120 +-
vendor/twig/twig/lib/Twig/LexerInterface.php | 32 -
vendor/twig/twig/lib/Twig/Loader/Array.php | 39 +-
vendor/twig/twig/lib/Twig/Loader/Chain.php | 72 +-
.../twig/twig/lib/Twig/Loader/Filesystem.php | 59 +-
vendor/twig/twig/lib/Twig/Loader/String.php | 73 -
vendor/twig/twig/lib/Twig/LoaderInterface.php | 21 +-
vendor/twig/twig/lib/Twig/Markup.php | 15 +-
vendor/twig/twig/lib/Twig/Node.php | 89 +-
vendor/twig/twig/lib/Twig/Node/AutoEscape.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Block.php | 6 +-
.../twig/lib/Twig/Node/BlockReference.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Body.php | 2 +-
.../twig/twig/lib/Twig/Node/CheckSecurity.php | 10 +-
vendor/twig/twig/lib/Twig/Node/Do.php | 2 +-
vendor/twig/twig/lib/Twig/Node/Embed.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Expression.php | 4 +-
.../twig/lib/Twig/Node/Expression/Array.php | 4 +-
.../lib/Twig/Node/Expression/AssignName.php | 4 +-
.../twig/lib/Twig/Node/Expression/Binary.php | 6 +-
.../lib/Twig/Node/Expression/Binary/Add.php | 4 +-
.../lib/Twig/Node/Expression/Binary/And.php | 4 +-
.../Node/Expression/Binary/BitwiseAnd.php | 4 +-
.../Twig/Node/Expression/Binary/BitwiseOr.php | 4 +-
.../Node/Expression/Binary/BitwiseXor.php | 4 +-
.../Twig/Node/Expression/Binary/Concat.php | 4 +-
.../lib/Twig/Node/Expression/Binary/Div.php | 4 +-
.../Twig/Node/Expression/Binary/EndsWith.php | 2 +-
.../lib/Twig/Node/Expression/Binary/Equal.php | 2 +-
.../Twig/Node/Expression/Binary/FloorDiv.php | 2 +-
.../Twig/Node/Expression/Binary/Greater.php | 2 +-
.../Node/Expression/Binary/GreaterEqual.php | 2 +-
.../lib/Twig/Node/Expression/Binary/In.php | 2 +-
.../lib/Twig/Node/Expression/Binary/Less.php | 2 +-
.../Twig/Node/Expression/Binary/LessEqual.php | 2 +-
.../Twig/Node/Expression/Binary/Matches.php | 2 +-
.../lib/Twig/Node/Expression/Binary/Mod.php | 4 +-
.../lib/Twig/Node/Expression/Binary/Mul.php | 4 +-
.../Twig/Node/Expression/Binary/NotEqual.php | 2 +-
.../lib/Twig/Node/Expression/Binary/NotIn.php | 2 +-
.../lib/Twig/Node/Expression/Binary/Or.php | 4 +-
.../lib/Twig/Node/Expression/Binary/Power.php | 17 +-
.../lib/Twig/Node/Expression/Binary/Range.php | 2 +-
.../Node/Expression/Binary/StartsWith.php | 2 +-
.../lib/Twig/Node/Expression/Binary/Sub.php | 4 +-
.../Twig/Node/Expression/BlockReference.php | 15 +-
.../twig/lib/Twig/Node/Expression/Call.php | 41 +-
.../lib/Twig/Node/Expression/Conditional.php | 4 +-
.../lib/Twig/Node/Expression/Constant.php | 4 +-
.../Node/Expression/ExtensionReference.php | 32 -
.../twig/lib/Twig/Node/Expression/Filter.php | 15 +-
.../Twig/Node/Expression/Filter/Default.php | 4 +-
.../lib/Twig/Node/Expression/Function.php | 20 +-
.../twig/lib/Twig/Node/Expression/GetAttr.php | 12 +-
.../lib/Twig/Node/Expression/MethodCall.php | 2 +-
.../twig/lib/Twig/Node/Expression/Name.php | 48 +-
.../lib/Twig/Node/Expression/NullCoalesce.php | 4 +-
.../twig/lib/Twig/Node/Expression/Parent.php | 4 +-
.../lib/Twig/Node/Expression/TempName.php | 2 +-
.../twig/lib/Twig/Node/Expression/Test.php | 13 +-
.../Twig/Node/Expression/Test/Constant.php | 2 +-
.../lib/Twig/Node/Expression/Test/Defined.php | 6 +-
.../Twig/Node/Expression/Test/Divisibleby.php | 2 +-
.../lib/Twig/Node/Expression/Test/Even.php | 2 +-
.../lib/Twig/Node/Expression/Test/Null.php | 2 +-
.../lib/Twig/Node/Expression/Test/Odd.php | 2 +-
.../lib/Twig/Node/Expression/Test/Sameas.php | 2 +-
.../twig/lib/Twig/Node/Expression/Unary.php | 6 +-
.../lib/Twig/Node/Expression/Unary/Neg.php | 4 +-
.../lib/Twig/Node/Expression/Unary/Not.php | 4 +-
.../lib/Twig/Node/Expression/Unary/Pos.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Flush.php | 2 +-
vendor/twig/twig/lib/Twig/Node/For.php | 8 +-
vendor/twig/twig/lib/Twig/Node/ForLoop.php | 2 +-
vendor/twig/twig/lib/Twig/Node/If.php | 6 +-
vendor/twig/twig/lib/Twig/Node/Import.php | 2 +-
vendor/twig/twig/lib/Twig/Node/Include.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Macro.php | 43 +-
vendor/twig/twig/lib/Twig/Node/Module.php | 45 +-
vendor/twig/twig/lib/Twig/Node/Print.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Sandbox.php | 4 +-
.../twig/lib/Twig/Node/SandboxedPrint.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Set.php | 6 +-
vendor/twig/twig/lib/Twig/Node/SetTemp.php | 35 -
vendor/twig/twig/lib/Twig/Node/Spaceless.php | 4 +-
vendor/twig/twig/lib/Twig/Node/Text.php | 4 +-
vendor/twig/twig/lib/Twig/Node/With.php | 2 +-
vendor/twig/twig/lib/Twig/NodeInterface.php | 32 -
.../twig/lib/Twig/NodeOutputInterface.php | 2 +-
vendor/twig/twig/lib/Twig/NodeTraverser.php | 18 +-
.../twig/lib/Twig/NodeVisitor/Escaper.php | 35 +-
.../twig/lib/Twig/NodeVisitor/Optimizer.php | 81 +-
.../lib/Twig/NodeVisitor/SafeAnalysis.php | 24 +-
.../twig/lib/Twig/NodeVisitor/Sandbox.php | 21 +-
.../twig/lib/Twig/NodeVisitorInterface.php | 10 +-
vendor/twig/twig/lib/Twig/Parser.php | 139 +-
vendor/twig/twig/lib/Twig/ParserInterface.php | 29 -
.../lib/Twig/Profiler/Dumper/Blackfire.php | 4 +-
.../twig/lib/Twig/Profiler/Dumper/Html.php | 4 +-
.../twig/lib/Twig/Profiler/Dumper/Text.php | 4 +-
.../lib/Twig/Profiler/Node/EnterProfile.php | 5 +-
.../lib/Twig/Profiler/Node/LeaveProfile.php | 5 +-
.../Twig/Profiler/NodeVisitor/Profiler.php | 13 +-
.../twig/twig/lib/Twig/Profiler/Profile.php | 4 +-
.../twig/lib/Twig/Sandbox/SecurityError.php | 2 +-
.../Sandbox/SecurityNotAllowedFilterError.php | 2 +-
.../SecurityNotAllowedFunctionError.php | 2 +-
.../Sandbox/SecurityNotAllowedMethodError.php | 2 +-
.../SecurityNotAllowedPropertyError.php | 2 +-
.../Sandbox/SecurityNotAllowedTagError.php | 2 +-
.../twig/lib/Twig/Sandbox/SecurityPolicy.php | 16 +-
.../Twig/Sandbox/SecurityPolicyInterface.php | 2 +-
vendor/twig/twig/lib/Twig/SimpleFilter.php | 117 -
vendor/twig/twig/lib/Twig/SimpleFunction.php | 96 +-
vendor/twig/twig/lib/Twig/SimpleTest.php | 58 +-
vendor/twig/twig/lib/Twig/Source.php | 4 +-
.../lib/Twig/SourceContextLoaderInterface.php | 31 -
vendor/twig/twig/lib/Twig/Template.php | 350 +-
.../twig/twig/lib/Twig/TemplateInterface.php | 48 -
vendor/twig/twig/lib/Twig/TemplateWrapper.php | 2 +-
vendor/twig/twig/lib/Twig/Test.php | 37 -
vendor/twig/twig/lib/Twig/Test/Function.php | 38 -
.../lib/Twig/Test/IntegrationTestCase.php | 37 +-
vendor/twig/twig/lib/Twig/Test/Method.php | 40 -
vendor/twig/twig/lib/Twig/Test/Node.php | 40 -
.../twig/twig/lib/Twig/Test/NodeTestCase.php | 16 +-
.../twig/lib/Twig/TestCallableInterface.php | 22 -
vendor/twig/twig/lib/Twig/TestInterface.php | 27 -
vendor/twig/twig/lib/Twig/Token.php | 12 +-
vendor/twig/twig/lib/Twig/TokenParser.php | 2 +-
.../twig/lib/Twig/TokenParser/AutoEscape.php | 37 +-
.../twig/twig/lib/Twig/TokenParser/Block.php | 10 +-
vendor/twig/twig/lib/Twig/TokenParser/Do.php | 4 +-
.../twig/twig/lib/Twig/TokenParser/Embed.php | 4 +-
.../twig/lib/Twig/TokenParser/Extends.php | 10 +-
.../twig/twig/lib/Twig/TokenParser/Filter.php | 4 +-
.../twig/twig/lib/Twig/TokenParser/Flush.php | 4 +-
vendor/twig/twig/lib/Twig/TokenParser/For.php | 14 +-
.../twig/twig/lib/Twig/TokenParser/From.php | 10 +-
vendor/twig/twig/lib/Twig/TokenParser/If.php | 8 +-
.../twig/twig/lib/Twig/TokenParser/Import.php | 4 +-
.../twig/lib/Twig/TokenParser/Include.php | 6 +-
.../twig/twig/lib/Twig/TokenParser/Macro.php | 6 +-
.../twig/lib/Twig/TokenParser/Sandbox.php | 6 +-
vendor/twig/twig/lib/Twig/TokenParser/Set.php | 8 +-
.../twig/lib/Twig/TokenParser/Spaceless.php | 4 +-
vendor/twig/twig/lib/Twig/TokenParser/Use.php | 6 +-
.../twig/twig/lib/Twig/TokenParser/With.php | 4 +-
.../twig/twig/lib/Twig/TokenParserBroker.php | 120 -
.../lib/Twig/TokenParserBrokerInterface.php | 44 -
.../twig/lib/Twig/TokenParserInterface.php | 4 +-
vendor/twig/twig/lib/Twig/TokenStream.php | 66 +-
.../lib/Twig/Util/DeprecationCollector.php | 27 +-
web/config.php | 2 +-
998 files changed, 14000 insertions(+), 11275 deletions(-)
create mode 100644 .gitignore
create mode 100644 .idea/CNinno2k16.iml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
create mode 100644 .idea/workspace.xml
create mode 100644 src/AppBundle/Entity/Album.php
create mode 100644 src/AppBundle/Entity/Dossier.php
create mode 100644 src/AppBundle/Entity/Personnes.php
create mode 100644 src/AppBundle/Entity/Photographe.php
create mode 100644 src/AppBundle/Entity/Photos.php
create mode 100644 src/AppBundle/Resources/config/doctrine/Album.orm.xml
create mode 100644 src/AppBundle/Resources/config/doctrine/Dossier.orm.xml
create mode 100644 src/AppBundle/Resources/config/doctrine/Personnes.orm.xml
create mode 100644 src/AppBundle/Resources/config/doctrine/Photographe.orm.xml
create mode 100644 src/AppBundle/Resources/config/doctrine/Photos.orm.xml
delete mode 100644 vendor/doctrine/collections/.travis.yml
delete mode 100644 vendor/doctrine/collections/phpunit.xml.dist
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/AbstractLazyCollectionTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CollectionTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CriteriaTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/LazyArrayCollection.php
delete mode 100644 vendor/doctrine/collections/tests/Doctrine/Tests/TestInit.php
delete mode 100644 vendor/symfony/symfony/.php_cs
delete mode 100644 vendor/twig/twig/ext/twig/config.m4
delete mode 100644 vendor/twig/twig/ext/twig/config.w32
delete mode 100644 vendor/twig/twig/ext/twig/php_twig.h
delete mode 100644 vendor/twig/twig/ext/twig/twig.c
delete mode 100644 vendor/twig/twig/lib/Twig/Autoloader.php
delete mode 100644 vendor/twig/twig/lib/Twig/CompilerInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/Filter/Function.php
delete mode 100644 vendor/twig/twig/lib/Twig/Filter/Method.php
delete mode 100644 vendor/twig/twig/lib/Twig/Filter/Node.php
delete mode 100644 vendor/twig/twig/lib/Twig/FilterCallableInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/FilterInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/Function/Function.php
delete mode 100644 vendor/twig/twig/lib/Twig/Function/Method.php
delete mode 100644 vendor/twig/twig/lib/Twig/Function/Node.php
delete mode 100644 vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/FunctionInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/LexerInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/Loader/String.php
delete mode 100644 vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
delete mode 100644 vendor/twig/twig/lib/Twig/Node/SetTemp.php
delete mode 100644 vendor/twig/twig/lib/Twig/NodeInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/ParserInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/SimpleFilter.php
delete mode 100644 vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/TemplateInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/Test.php
delete mode 100644 vendor/twig/twig/lib/Twig/Test/Function.php
delete mode 100644 vendor/twig/twig/lib/Twig/Test/Method.php
delete mode 100644 vendor/twig/twig/lib/Twig/Test/Node.php
delete mode 100644 vendor/twig/twig/lib/Twig/TestCallableInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/TestInterface.php
delete mode 100644 vendor/twig/twig/lib/Twig/TokenParserBroker.php
delete mode 100644 vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ed4d3c6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,45 @@
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+/var/sessions/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+!var/sessions/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
diff --git a/.idea/CNinno2k16.iml b/.idea/CNinno2k16.iml
new file mode 100644
index 00000000..8bdca0ca
--- /dev/null
+++ b/.idea/CNinno2k16.iml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library name="PHP Runtime" type="php">
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
+ </CLASSES>
+ <SOURCES>
+ <root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="PHARS">
+ <CLASSES>
+ <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" />
+ <root url="phar://$MODULE_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/phar/phar-sample.phar/" />
+ </CLASSES>
+ <SOURCES>
+ <root url="phar://$MODULE_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar/" />
+ <root url="phar://$MODULE_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/phar/phar-sample.phar/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..bd8f0236
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/CNinno2k16.iml" filepath="$PROJECT_DIR$/.idea/CNinno2k16.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..dc40c8aa
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,3592 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="d4ead572-e826-420a-9106-f3624033ce76" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/profiler/51/e5/d0e551" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/Wantlet" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/files/swiftmailer.png" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/files/textfile.zip" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/phar/phar-sample.phar" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/CNinno2k16.iml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Album.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Dossier.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Personnes.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Photographe.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Entity/Photos.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Resources/config/doctrine/Album.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Resources/config/doctrine/Dossier.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Resources/config/doctrine/Personnes.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Resources/config/doctrine/Photographe.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/AppBundle/Resources/config/doctrine/Photos.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/03/03d624bafecab20b3d9107798016578483978dffb22eb981c129bbcb445f1c80.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/05/05a4905ca545265d1a906e152dc2a88f3274d2ae07966e6a9af92036b04756f7.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/09/09e4a74477711178c771f328a972b8e633012528ebb42aceb7ad980fcb33af7f.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/13/130bd198f0f8057be94c17d39218ca2930953e14d4cf0273ad72544f5c32cc08.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/1a/1a0bd5f4fd94255358f0b7814cb39ff7c81b4ab60ea384f67fadb334ec96f440.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/2c/2c857bf5a753a44742383529fdc5e96ab221cfafa3cc67dd633f8bd7c63a073b.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/35/3536bb0add0197531e01bb9bce793bb340744646d659253d85fdc6337ac13914.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/35/35682a2c7f572630ea1dc056d517969771672802c14b228039f3aa9cb60ac765.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/3e/3eea7c9f7b94f3422ababfe8a716e3e71857cc445ecd6e325c83c88d41e163ad.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/49/49035e8b6a305a7779148266147824a9d45c521efa9daab4cf9db57b9eb5d42b.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/4a/4aa77ff326dad5ac0d781c5379743290755aa7cbf32d4e0c40a8456392d58327.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/4c/4cee8fadedcd3c8da7634c70ce85a62d0066d172772c5f5ba5de782cf75aefed.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/56/56208c193e6f5385ab4ed185926b135e98aed40395244eb2b52ac107cdd5ec40.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/58/58d3c05850c90d0466728dbd1a48f0b3fc2885006628ec300c1ffceecfacd3c7.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/5e/5eb5abc7db6b6c04ad1d0e228f2bd62983b61945e590f17f6263c58156754956.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/6e/6e50b8f7b2634bb0578256027957d2792e1ca0fe57b2314c0cb79ef6dedfa297.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/6e/6edc2fbae3d96f9172ea57e08c7c9d80a0dc3e7c5eb046ff1deeac4bb2e0c7c2.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/78/78ff63b4717288bd066fafe8b0d600cf8caabad9bb8acb35d112efdd65094332.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/7b/7bef3a83be1c07cbef8f922931da53b3ea8c804c0484af01af1ed07f2bc9e773.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/7c/7cc3a53b3a8f703291b2a93283b870745986eb8128c48a1317345b07eae6d544.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/81/8157abf8d9a2c395491ac8e6474c1fbf3a6a46346e3ed1b8ea3b955762607506.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/91/91cfb0d57c1b0ba789bb3a8b078080030be21cc9aea1bb6656bafc0d33d1f356.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/ad/ad6961341676dedf9150627a835cd5746a7ad7d7a79c1f5a5d45325c927f7c98.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/af/af54e58c80916fc5c90e54e8539b42d3ccbe767e18e5d24311b1070bebbb1ac1.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/b5/b597350eceedb71de220a87825586c26e965cf35554233b1512eec353193d4e1.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/d7/d7fd159c62e20aef657da8349c02d064e4ade2f2ed0be5c990cd373de06e42bb.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/dd/dd06e4d718d91116b0da1a24f91e9535eba8e101e62e19096b31125f666afa25.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/ec/ecd0a69f86acbd37a0d42806057fb7f0a3b3a5c7bf343990263657b32bfaaed4.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/ed/edb37211225af5793ed4461cd772b7d089f430333d56f822ae112cd88298d950.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/f3/f38f9c149bfddf30f372e72e76a1a4f4966d0b1eeabcc4fba12e33e28f239520.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/cache/dev/twig/fc/fc61e43cea8ef8b96b9c40112d668f4279f0d97865e03f5c45c3c57aa60d3999.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/var/sessions/dev/sess_ha6m83tpetp4c38dcb29g7h8r1" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/CHANGELOG.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/CONTRIBUTING.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/common/humbug.json.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Statement.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Mapping/ContainerAwareEntityListenerResolver.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Mapping/EntityListenerServiceResolver.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/doc/configuration.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/doc/entity-listeners.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/doc/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/doc/installation.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/Builder/BundleConfigurationBuilder.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/BundleTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/Command/CreateDatabaseDoctrineTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/ContainerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DataCollector/DoctrineDataCollectorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/DoctrineExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/AnnotationsBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/Entity/Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/AnnotationsBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/Entity/Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Entity/Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/Test.orm.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/XmlBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/YamlBundle/Entity/Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/Test.orm.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/Bundles/YamlBundle/YamlBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_auto_commit.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_logging.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_connectstring.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_oracle_instancename.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_savepoints.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_schema_filter.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_pool_sharding_connection.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_types.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listener_tag.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_attach_entity_listeners_two_connections.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_attach_lazy_entity_listener.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_abstract.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_private.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_lazy_resolver_without_interface.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_entity_listener_resolver.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_filters.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_functions.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_hydration_mode.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports_import.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_multiple_em_bundle_mappings.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_namingstrategy.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_proxy.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_quotestrategy.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_repository_factory.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_resolve_target_entity.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_second_level_cache.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager_without_dbname.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_bundle_mappings.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_default_table_options.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/xml/orm_single_em_dql_functions.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_auto_commit.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_logging.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_oracle_connectstring.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_oracle_instancename.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_savepoints.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_schema_filter.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_multiple_connections.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_pool_sharding_connection.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_connection.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/dbal_types.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_attach_entity_listener.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_attach_entity_listener_tag.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_attach_entity_listeners_two_connections.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_attach_lazy_entity_listener.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_entity_listener_lazy_abstract.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_entity_listener_lazy_private.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_entity_listener_lazy_resolver_without_interface.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_entity_listener_resolver.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_filters.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_functions.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_hydration_mode.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_imports.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_imports_import.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_multiple_em_bundle_mappings.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_namingstrategy.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_quotestrategy.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_repository_factory.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_resolve_target_entity.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_second_level_cache.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_multiple_entity_managers.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_simple_single_entity_manager_without_dbname.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_service_single_entity_manager.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_bundle_mappings.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_default_table_options.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/Fixtures/config/yml/orm_single_em_dql_functions.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/TestDatetimeFunction.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/TestFilter.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/TestNumericFunction.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/TestStringFunction.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/TestType.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/XMLSchemaTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/XmlDoctrineExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/DependencyInjection/YamlDoctrineExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/Mapping/ContainerAwareEntityListenerResolverTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/Mapping/DisconnectedMetadataFactoryTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/RegistryTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/TestCase.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Tests/Twig/DoctrineExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/UPGRADE.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/CHANGELOG.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/annotations/cache.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/annotations/converters.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/annotations/routing.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/annotations/security.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/annotations/view.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Resources/doc/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Configuration/ConfigurationAnnotationTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Configuration/RouteTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/DependencyInjection/SensioFrameworkExtraExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/ControllerListenerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerCacheAtClass.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerCacheAtClassAndMethod.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerCacheAtMethod.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerMultipleCacheAtClass.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerMultipleCacheAtMethod.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerNullableParameter.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/Fixture/FooControllerParamConverterAtClassAndMethod.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/HttpCacheListenerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/ParamConverterListenerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/PsrResponseListenerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/EventListener/SecurityListenerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/ActionArgumentsBundle/Controller/NullableArgumentsController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Controller/InvokableClassLevelController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Controller/InvokableContainerController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Controller/InvokableController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Controller/MultipleActionsClassLevelTemplateController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Controller/SimpleController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/FooBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/Invokable/predefined.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/InvokableContainer/another_variable.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/InvokableContainer/variable.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/Simple/another.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/Simple/some.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/Simple/streamed.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/FooBundle/Resources/views/overwritten.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/TestKernel.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/config/config.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Fixtures/config/routing.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Functional/NullableAnnotationTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Functional/TemplateAnnotationTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Request/ParamConverter/DateTimeParamConverterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Request/ParamConverter/ParamConverterManagerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Request/ParamConverter/PsrServerRequestParamConverterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Request/ParamConverter/TestUserRepository.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Routing/AnnotatedRouteControllerLoaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Routing/Fixtures/FoobarController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/Fixture/BarBundle/Controller/BarController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/Fixture/Controller/OutOfBundleController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/Fixture/FooBarBundle/Controller/FooBarController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/Fixture/FooBundle/Action/FooAction.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/Fixture/FooBundle/Controller/FooController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Tests/Templating/TemplateGuesserTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/phpunit.xml.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/.php_cs.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/CHANGES" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/README" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/IdenticalBinaryConstraint.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/StreamCollector.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/SwiftMailerSmokeTestCase.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/SwiftMailerTestCase.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/charsets/iso-8859-1/one.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/charsets/utf-8/one.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/charsets/utf-8/three.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/charsets/utf-8/two.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/dkim/dkim.test.priv" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/dkim/dkim.test.pub" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/files/data.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/CA.srl" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/ca.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/ca.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/create-cert.sh" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/encrypt.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/encrypt.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/encrypt2.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/encrypt2.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/intermediate.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/intermediate.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/sign.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/sign.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/sign2.crt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/_samples/smime/sign2.key" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance.conf.php.default" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/AttachmentAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/DependencyContainerAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/EmbeddedFileAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/EncodingAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/MimePartAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bootstrap.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug111Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug118Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug206Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug274Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug34Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug35Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug38Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug518Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug51Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug534Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug650Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug71Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/Bug76Test.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/bug/Swift/BugFileByteStreamConsecutiveReadCallsTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/fixtures/MimeEntityFixture.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/smoke.conf.php.default" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/DependencyContainerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Encoder/Rfc2231EncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SendEventTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/KeyCache/SimpleKeyCacheInputStreamTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MailerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/MessageTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/Base64HeaderEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Loggers/ArrayLoggerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Loggers/EchoLoggerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/DependencyInjection/Compiler/DebugHandlerPass.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Resources/doc/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Compiler/AddProcessorsPassTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Compiler/AddSwiftMailerTransportPassTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Compiler/FixEmptyLoggerPassTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Compiler/LoggerChannelPassTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/ConfigurationTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/DependencyInjectionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/FixtureMonologExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/handlers_with_channels.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/multiple_email_recipients.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/multiple_handlers.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/new_and_priority.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/new_and_priority_import.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/new_at_end.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/new_at_end_import.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/overwriting.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/overwriting_import.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/parameterized_handlers.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/process_psr_3_messages_disabled.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/xml/single_email_recipient.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/handlers_with_channels.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/multiple_email_recipients.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/multiple_handlers.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/new_and_priority.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/new_and_priority_import.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/new_at_end.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/new_at_end_import.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/overwriting.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/overwriting_import.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/parameterized_handlers.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/process_psr_3_messages_disabled.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/Fixtures/yml/single_email_recipient.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/MonologExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/XmlMonologExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Tests/DependencyInjection/YamlMonologExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Resources/doc/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/Command/SendEmailCommandTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/antiflood.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/empty.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/full.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/mail.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/many_mailers.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/null.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/null_mailer.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/one_mailer.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/redirect.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/redirect_multi.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/redirect_single.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/sender_address.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/sendmail.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/smtp.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/spool.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/spool_memory.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/spool_service.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/spool_service_invalid.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/stream_options.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/php/urls.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/antiflood.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/empty.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/full.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/mail.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/many_mailers.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/null.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/null_mailer.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/one_mailer.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/redirect.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/redirect_multi.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/redirect_single.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/sender_address.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/sendmail.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/smtp.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/spool.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/spool_memory.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/spool_service.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/spool_service_invalid.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/stream_options.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/xml/urls.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/antiflood.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/empty.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/full.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/mail.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/many_mailers.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/null.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/null_mailer.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/one_mailer.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/redirect.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/redirect_multi.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/redirect_single.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/sender_address.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/sendmail.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/smtp.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/spool.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/spool_memory.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/spool_service.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/spool_service_invalid.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/stream_options.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/Fixtures/config/yml/urls.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Tests/DependencyInjection/SwiftmailerExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/.php_cs.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/README.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/phpunit.xml.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Fixtures/CompositeObjectNoToStringIdEntity.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/Resources/config/validation.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/CustomPathBundle/src/CustomPathBundle.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflow_with_multiple_transitions_with_same_name.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflow_with_multiple_transitions_with_same_name.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflow_with_multiple_transitions_with_same_name.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Category.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/categories.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/SubCategory.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/templates.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AnnotatedControllerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/AnnotatedController.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/PropertyInfoTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/bundles.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/config.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AnnotatedController/routing.yml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views/layout.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views/layout.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildChildTwigBundle/Resources/views/layout.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/ChildTwigBundle/Resources/views/layout.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/CHANGELOG.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplicationMbString.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommandMbString.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/command_mbstring.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_argument_with_style.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.json" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.md" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.txt" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/input_option_with_style_array.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/FooVariadic.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Filesystem/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Finder/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Exception/NotBoundException.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/.gitignore" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/.php_cs.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/CHANGELOG" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/advanced.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/api.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/coding_standards.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/deprecated.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/abs.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/batch.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/capitalize.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/convert_encoding.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/date.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/date_modify.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/default.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/escape.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/first.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/format.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/join.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/json_encode.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/keys.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/last.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/length.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/lower.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/merge.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/nl2br.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/number_format.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/raw.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/replace.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/reverse.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/round.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/slice.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/sort.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/split.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/striptags.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/title.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/trim.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/upper.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/filters/url_encode.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/attribute.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/block.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/constant.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/cycle.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/date.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/dump.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/include.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/max.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/min.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/parent.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/random.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/range.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/source.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/functions/template_from_string.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/installation.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/internals.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/intro.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/recipes.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/autoescape.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/block.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/do.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/embed.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/extends.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/filter.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/flush.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/for.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/from.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/if.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/import.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/include.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/macro.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/sandbox.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/set.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/spaceless.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/use.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/verbatim.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tags/with.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/templates.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/constant.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/defined.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/divisibleby.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/empty.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/even.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/index.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/iterable.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/null.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/odd.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/doc/tests/sameas.rst" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExtensionSet.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/phpunit.xml.dist" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/CompilerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/ErrorTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/FilesystemHelper.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/block.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/child_contents_outside_blocks.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/syntax_error_in_reused_template.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_parent.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/_self.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/negative_numbers.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/power.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/extensions/anonymous_functions.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_keys.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/static_calls.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block_with_template.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block_without_name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/magic_call.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/magic_static_call.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/static_calls.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs_argument.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/complex_dynamic_parent.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/dynamic_parent.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/with/basic.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/with/expression.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/with/nested.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/with/with_no_hash.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/with/with_only.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined_for_attribute.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined_for_blocks.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined_for_blocks_with_template.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined_for_constants.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/null_coalesce.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/LegacyFixtures/autoescape/filename.legacy.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/LegacyFixtures/functions/undefined_block.legacy.test" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/LexerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/spare_parent.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_quater/named_absolute.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/NullCoalesceTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/ParserTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/BlackfireTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/HtmlTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/TextTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/RuntimeFactoryLoaderTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/TemplateTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/vendor/twig/twig/test/Twig/Tests/escapingTest.php" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/2/6/CRI7S1AjyPr9MstQbuuI" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/2/W/raPtGWHWtaSEzFxm01Iu" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/3/1/M2m-0cV9jZG61T-4qO65" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/3/R/ElaY6n5Qf36XIwrb5WH-" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/4/W/fNhKIhj1TKf1UGnI9R0h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/6/7/qHAiStv0eZviu4Am-BQE" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/7/3/XCeEp9ltKLuCz6bLd49q" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/8/K/FAss4NgqR-Vbcd5a6y9A" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/8/O/nbprMvHUGVt4AufNwG4H" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/8/Z/K4lCyRMH1Wqhb0QcbkTd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/A/L/16CeewTeVnw1NJvvngOI" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/A/S/X65GKAJJLFZbqEzGBqi+" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/B/+/DTjt6S0keIlNWmYpHj3U" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/B/C/GPSW4kcuLaOS5LZ7Pn9f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/B/F/bgrMO+mLhQ5crEfC14mt" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/B/G/yAJUtiClYe3PgVdnCHs5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/C/J/emdJ0dZMyCepbCg9D5o4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/E/O/iwNe7qNQoFd4abAwLFmr" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/E/W/GGgYe2GX7Z9Se2D3Pnjm" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/F/3/eO7rn8-v2LHpyDVQeF4k" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/F/G/HXiZN7t62K9FlrXj290R" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/F/J/+Q+taUZB7Y1g87kUpNRV" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/F/N/kxtVrRtrlcOl0-i0KDdY" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/F/O/AQIj6CQoXHaBmuPB8zrF" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/G/1/S7Edfb5WTOwtFCWNqTLZ" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/G/Z/5aD0qS-iEuCdLgIW0+QK" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/H/D/NqBojvGVHnEnyEE07sol" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/H/L/drVAhhieNq2stuPAcp78" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/J/M/0tQ1C1VRDG2VUn-4-qD2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/K/B/WhemDGPN5uB4W4lEQg5X" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/K/L/XBB0geO2PKhpV9a78uuh" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/L/B/NpjyIzdIbCJHUTN5ZoYX" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/L/H/XU6P7wKskHlgaT7RrU73" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/L/R/r0UuURYyqcRn-7OfB58S" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/M/H/1Dj3H3J4bf42D7jNoeVX" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/M/L/G0qJtvpAj7ZcDf1JmCFG" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/M/V/vGlvwRqZjblYab4340hj" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/O/P/miIOV8EZZN5FneRHZr1+" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/O/Q/wiB8S3SuPm-bRYCAHF0N" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/O/U/eNTMjsffFt-O21iX0AV7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/P/K/AvUUb04HN7VIWaz3KGpe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/P/O/QmpHmY2nDArMMffZ1HTD" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/Q/W/NKnhDgq9-yJm8R0NE9jU" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/R/E/hLmH4qEdPwliXz5nTs5J" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/R/G/TpDi3Bw1UkYNV3ra-p5a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/R/J/c6R5Ak5h39NbxQ8NaAiG" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/S/5/WQHvFVQCVQhLW8NP32Gy" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/S/G/+72qC3WRspDeTTuyQb0e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/S/S/MaCSgf5x+ywuoVKrzfE4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/T/+/3NAWAwhbPdFEYojHaTWk" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/T/2/GD+9hxlV-uV4+kkHyLum" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/T/G/4n-9LMYDd+a7+DTJAgTi" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/U/Y/2MIZ1Dt0jULYuy8elYeE" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/V/R/FkiyOA9zBhvw63pEzMul" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/W/A/x2uzyGqBrXv3s9uN98IA" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/X/6/DSokaawqq3kfFglOIiDC" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/X/9/3LM9kqUW9zOl6M700mU9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/X/F/tZtjdOLDrtIEyKyADkz7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/X/S/nWR+aenYghS+byVMAZ3y" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/Y/Q/2ngIdrnQUVgh8DIr4Z6E" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/Y/Q/wo4E-cv91gMDJ7EdAN+n" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/pools/nI8i8pv4ED/Z/C/hXtFH64TyKQYYXoOUsE0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/01/0e0100" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/78/a97800" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/7a/c97a00" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/bf/aabf00" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/db/7fdb00" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/00/f4/5ff400" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/01/0b/bd0b01" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/01/6c/176c01" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/01/a5/c8a501" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/01/b4/d4b401" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/01/ca/5fca01" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/02/61/066102" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/02/62/126202" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/02/c0/d7c002" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/02/c7/09c702" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/02/f3/c1f302" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/03/0c/710c03" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/03/84/648403" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/03/8e/928e03" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/03/da/8eda03" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/03/e2/0ce203" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/2b/1e2b04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/2e/ad2e04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/4a/f94a04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/6f/176f04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/9f/269f04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/a3/7ba304" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/a9/55a904" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/c9/6fc904" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/cd/e6cd04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/dd/91dd04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/dd/a5dd04" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/04/f8/d4f804" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/05/1b/941b05" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/05/5d/8a5d05" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/05/b3/6cb305" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/05/f0/17f005" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/06/09/b60906" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/06/1c/001c06" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/06/a5/63a506" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/06/c9/84c906" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/07/47/644707" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/08/48/6a4808" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/08/8b/848b08" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/08/b9/64b908" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/08/c7/bfc708" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/09/31/7e3109" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/09/36/1d3609" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/09/6e/db6e09" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/06/d6060a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/40/e0400a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/47/4c470a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/7c/d67c0a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/88/41880a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/9b/ef9b0a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/b9/fdb90a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/d3/08d30a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0a/f7/8ff70a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0b/4a/4a4a0b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0b/74/74740b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0b/ae/4eae0b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0b/e1/dbe10b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0c/a4/e2a40c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0c/ba/63ba0c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0d/63/6f630d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0d/d8/cfd80d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0e/80/70800e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0e/b4/89b40e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0e/d5/13d50e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0e/de/dbde0e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0e/fd/b8fd0e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0f/02/0f020f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0f/06/9a060f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0f/88/25880f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0f/af/05af0f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/0f/b9/7ab90f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/10/18/5b1810" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/10/ba/6bba10" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/10/bb/d2bb10" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/10/e6/c0e610" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/11/03/570311" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/11/51/2f5111" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/11/5d/825d11" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/11/7b/ff7b11" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/11/8e/2f8e11" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/12/1e/281e12" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/12/31/ab3112" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/12/4a/0f4a12" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/12/64/c76412" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/13/2c/172c13" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/13/37/883713" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/13/6e/ea6e13" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/13/cb/68cb13" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/14/5b/375b14" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/14/71/a17114" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/14/94/c99414" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/14/af/efaf14" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/14/ff/e1ff14" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/15/6b/df6b15" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/15/78/8b7815" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/15/7c/717c15" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/15/dc/f8dc15" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/0b/a00b16" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/11/a21116" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/26/882616" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/58/cc5816" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/63/fa6316" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/8b/6b8b16" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/a0/24a016" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/16/ff/90ff16" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/17/28/d32817" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/17/73/167317" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/17/8b/438b17" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/17/ac/08ac17" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/18/71/f27118" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/18/86/8a8618" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/18/a0/61a018" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/18/bd/d0bd18" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/18/fb/06fb18" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/19/11/b31119" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/19/42/344219" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/19/cc/d7cc19" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/19/db/14db19" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1a/26/34261a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1a/36/d2361a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1a/4d/8c4d1a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/04/2c041b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/3a/f03a1b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/b2/aeb21b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/bb/79bb1b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/c3/44c31b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/cb/0acb1b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/d6/7bd61b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1b/e3/85e31b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1c/32/e6321c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1c/47/3a471c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1c/8c/708c1c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1c/98/66981c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1c/99/6b991c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1d/15/61151d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1d/2a/462a1d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1d/36/58361d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1e/28/8a281e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1e/8e/dc8e1e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1e/c8/05c81e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/33/1b331f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/42/12421f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/42/d0421f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/6c/3c6c1f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/71/02711f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/ac/bfac1f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/1f/e4/93e41f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/13/f51320" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/1c/ac1c20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/3f/1a3f20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/5a/755a20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/9c/f19c20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/cc/33cc20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/e0/a6e020" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/20/fa/67fa20" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/21/49/624921" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/21/80/cb8021" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/21/a4/d1a421" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/21/c7/68c721" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/22/33/0d3322" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/22/87/f78722" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/09/690923" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/1a/5a1a23" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/40/864023" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/6d/7d6d23" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/9a/dc9a23" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/23/f7/08f723" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/24/09/350924" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/24/39/d33924" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/24/ed/eced24" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/25/1b/bb1b25" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/25/6b/466b25" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/25/9b/5e9b25" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/25/a9/17a925" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/26/54/685426" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/26/7e/f87e26" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/26/80/b68026" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/26/8c/4f8c26" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/26/d5/b0d526" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/27/08/e20827" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/27/ae/b2ae27" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/27/b6/11b627" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/27/ee/76ee27" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/28/ef/e4ef28" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/36/d13629" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/3c/803c29" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/74/347429" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/b4/62b429" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/d3/52d329" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/d5/a7d529" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/29/e2/ede229" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/11/75112a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/1b/1e1b2a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/3c/c13c2a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/47/ce472a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/60/7a602a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/66/d1662a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/8a/c28a2a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2a/ce/a1ce2a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2b/13/91132b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2b/65/17652b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2b/87/95872b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2b/c0/d0c02b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2b/d1/16d12b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2c/39/97392c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2c/87/4a872c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2c/bd/23bd2c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2c/f9/eff92c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/18/f2182d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/20/69202d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/30/ad302d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/5f/d75f2d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/7d/3f7d2d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/ae/d2ae2d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2d/ee/01ee2d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2e/55/5b552e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2e/66/65662e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2e/68/22682e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2e/74/55742e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2f/39/68392f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/2f/d7/cdd72f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/30/53/015330" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/30/9e/7c9e30" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/30/b5/25b530" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/31/2f/112f31" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/31/72/287231" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/31/a6/62a631" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/31/dc/0fdc31" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/32/1b/811b32" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/32/3a/6a3a32" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/32/44/9c4432" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/32/8c/558c32" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/32/b8/2db832" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/33/3a/2f3a33" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/33/8f/868f33" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/33/97/4c9733" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/33/ff/61ff33" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/25/882534" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/2d/242d34" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/87/868734" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/ca/89ca34" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/d1/b0d134" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/34/fc/d3fc34" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/35/11/231135" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/35/7b/9d7b35" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/35/98/809835" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/35/ce/3dce35" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/35/e1/07e135" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/36/3c/463c36" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/36/93/f29336" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/36/aa/8baa36" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/36/c9/dfc936" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/37/3f/343f37" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/38/26/0a2638" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/39/78/8e7839" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/39/c5/a0c539" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/39/cb/2fcb39" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/39/e5/74e539" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3a/1b/9a1b3a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3a/6c/286c3a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3a/f4/fbf43a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/1d/f31d3b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/30/98303b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/55/b8553b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/5f/975f3b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/61/12613b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/98/50983b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3b/e5/a3e53b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3c/2e/7d2e3c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3c/6e/906e3c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3c/e6/bce63c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3c/fd/b6fd3c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3d/16/a2163d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3d/a5/f0a53d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3d/ab/18ab3d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3d/ba/f6ba3d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3e/7e/a67e3e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3e/8d/428d3e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3e/a7/7ea73e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3e/a7/e3a73e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/06/60063f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/09/20093f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/58/8a583f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/b4/06b43f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/b6/b3b63f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/ba/0dba3f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/ca/69ca3f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/3f/d1/dcd13f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/4b/b04b40" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/78/b67840" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/9d/e29d40" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/ba/15ba40" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/e8/8ee840" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/ed/48ed40" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/f2/49f240" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/40/fb/6cfb40" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/41/03/ae0341" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/41/2b/bf2b41" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/41/4c/f94c41" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/42/12/d71242" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/42/1c/271c42" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/42/7f/3c7f42" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/42/93/ce9342" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/42/9f/799f42" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/43/1e/c51e43" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/43/69/166943" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/43/85/ca8543" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/43/d1/fbd143" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/44/2c/012c44" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/44/b1/feb144" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/44/db/2ddb44" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/44/e6/e1e644" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/45/05/9b0545" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/45/5e/675e45" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/45/66/816645" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/45/6a/926a45" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/45/86/138645" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/00/a10046" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/20/8b2046" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/6a/d16a46" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/a1/cea146" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/ba/f3ba46" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/cb/b3cb46" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/46/ec/48ec46" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/16/0f1647" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/44/c24447" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/50/895047" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/89/498947" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/a9/81a947" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/d1/66d147" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/47/d3/67d347" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/48/88/bc8848" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/48/d6/89d648" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/48/f8/10f848" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/48/f8/56f848" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/49/0d/840d49" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/49/30/153049" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/49/3d/3e3d49" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/49/d7/c7d749" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4a/20/a3204a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4a/84/28844a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4a/ab/2aab4a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/1f/d11f4b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/27/a5274b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/4d/3f4d4b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/81/e4814b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/8c/348c4b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/a3/a2a34b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4b/b8/98b84b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/00/3a004c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/1b/c51b4c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/2d/a52d4c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/77/24774c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/7f/047f4c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/9b/459b4c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4c/ca/74ca4c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4d/1e/071e4d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4d/23/ae234d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4d/5e/885e4d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4d/95/32954d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4d/e6/54e64d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4e/06/4c064e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4e/4d/734d4e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4e/52/d4524e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4e/76/5a764e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4f/1b/1e1b4f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4f/43/18434f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4f/94/90944f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4f/be/debe4f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/4f/e4/80e44f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/50/05/df0550" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/50/99/409950" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/50/b9/b3b950" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/50/ef/80ef50" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/51/3e/973e51" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/51/fd/e6fd51" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/52/14/f01452" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/52/1f/c91f52" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/52/8b/f98b52" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/52/9b/a79b52" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/52/e0/4ee052" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/53/29/c52953" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/53/f3/8ff353" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/54/40/c04054" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/54/c2/72c254" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/54/ec/d4ec54" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/54/f8/6bf854" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/55/00/530055" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/55/66/fe6655" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/55/8c/ad8c55" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/56/a3/fca356" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/57/6c/f96c57" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/57/8f/548f57" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/57/ba/78ba57" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/57/c6/2bc657" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/57/f2/34f257" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/09/8a0958" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/b9/c0b958" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/bd/3fbd58" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/bd/a0bd58" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/d9/9cd958" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/58/ff/44ff58" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/0b/640b59" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/1f/511f59" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/56/5d5659" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/5a/d95a59" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/67/f76759" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/e0/7ce059" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/59/e3/cbe359" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/63/c8635a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/b1/ffb15a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/c0/e5c05a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/c3/74c35a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/cf/bacf5a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5a/d9/9cd95a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5b/21/83215b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5b/5f/165f5b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5b/77/c2775b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5b/92/58925b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5c/80/86805c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5c/cf/b2cf5c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/1b/761b5d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/39/6e395d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/67/81675d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/7e/9f7e5d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/be/c7be5d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5d/ea/12ea5d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/25/ac255e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/27/2d275e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/2d/042d5e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/4b/b84b5e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/ab/13ab5e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/d9/efd95e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5e/f2/c7f25e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5f/0b/520b5f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5f/47/7a475f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5f/91/35915f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/5f/c8/b9c85f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/17/c51760" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/3c/7f3c60" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/61/046160" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/6a/5c6a60" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/a7/eda760" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/b7/b7b760" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/60/c4/19c460" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/61/9d/689d61" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/61/ae/23ae61" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/61/d6/c4d661" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/35/ec3562" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/45/9b4562" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/46/f84662" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/68/1d6862" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/71/8c7162" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/62/7d/127d62" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/63/08/460863" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/63/43/b94363" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/64/1d/0a1d64" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/64/a5/ada564" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/64/cb/cecb64" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/64/e7/82e764" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/64/f8/53f864" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/65/05/2a0565" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/65/2f/3a2f65" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/65/81/aa8165" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/66/8d/fc8d66" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/19/a31967" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/2e/3a2e67" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/42/a74267" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/79/957967" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/9a/109a67" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/da/adda67" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/e6/c0e667" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/67/fc/cefc67" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/2c/972c68" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/3b/c13b68" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/45/1c4568" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/67/086768" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/a1/18a168" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/68/d6/f1d668" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/10/6c1069" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/3b/b63b69" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/42/c94269" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/59/c25969" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/60/a36069" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/de/dede69" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/e8/38e869" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/ea/b8ea69" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/f9/a3f969" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/69/fa/d3fa69" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/16/d1166a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/47/bf476a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/5c/975c6a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/85/cc856a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/c2/57c26a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/c4/12c46a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6a/d7/c0d76a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6b/2a/b82a6b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6b/6f/4f6f6b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6b/7b/d27b6b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6b/ab/77ab6b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6b/bf/2cbf6b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6c/26/fe266c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6c/31/8c316c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6c/8a/e78a6c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6d/76/a8766d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6d/8c/888c6d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6d/90/30906d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6d/df/09df6d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/04/f7046e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/1a/c41a6e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/1a/c81a6e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/4d/d84d6e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/56/3c566e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6e/65/c1656e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/07/24076f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/41/3a416f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/92/96926f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/9f/749f6f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/ec/98ec6f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/6f/f6/38f66f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/3c/623c70" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/45/954570" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/4c/264c70" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/55/705570" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/d3/77d370" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/70/d4/01d470" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/38/2a3871" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/61/1f6171" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/ec/94ec71" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/f6/ddf671" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/fa/88fa71" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/71/fa/d8fa71" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/72/26/e22672" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/72/4f/694f72" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/72/b2/3bb272" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/72/be/c4be72" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/73/03/750373" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/73/05/cb0573" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/73/e2/9ae273" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/73/fa/2efa73" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/74/1f/451f74" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/74/aa/bbaa74" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/75/41/d94175" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/75/72/7d7275" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/75/b9/48b975" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/75/d7/37d775" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/76/17/ab1776" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/76/43/444376" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/77/4f/5a4f77" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/77/69/f76977" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/78/0b/980b78" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/78/6f/a56f78" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/78/c7/35c778" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/79/06/f00679" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/79/46/f74679" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/79/d4/39d479" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/79/df/a3df79" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/79/ee/cfee79" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/1b/b01b7a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/4e/614e7a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/51/47517a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/70/fe707a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/9f/a29f7a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/b7/9ab77a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7a/c7/bdc77a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7b/32/df327b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7b/47/8d477b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7b/4e/4a4e7b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7b/80/09807b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7b/e7/ade77b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7c/21/ad217c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7c/94/c3947c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7d/27/94277d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7d/5f/4c5f7d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7d/62/4e627d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7d/bf/65bf7d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7d/e2/c4e27d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7e/2f/bf2f7e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7e/c9/55c97e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7e/da/c7da7e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7f/0d/e50d7f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7f/10/40107f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7f/41/b1417f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7f/89/ad897f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/7f/be/cdbe7f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/80/2a/a52a80" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/80/34/583480" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/80/42/bc4280" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/80/77/d97780" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/81/42/0c4281" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/81/ce/4fce81" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/81/d4/cdd481" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/83/16/1c1683" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/83/24/c62483" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/83/7d/ad7d83" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/83/a5/9ba583" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/83/dd/dbdd83" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/84/03/ee0384" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/84/2e/b12e84" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/84/62/ab6284" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/84/dd/84dd84" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/85/10/801085" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/85/46/114685" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/85/c4/26c485" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/85/dd/fedd85" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/86/02/8e0286" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/86/3d/c43d86" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/86/89/e68986" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/86/b3/06b386" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/86/f1/a6f186" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/87/24/422487" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/87/91/f09187" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/87/9e/1e9e87" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/87/bf/23bf87" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/88/21/8f2188" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/88/50/535088" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/88/dd/82dd88" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/88/fb/36fb88" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/0d/3d0d89" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/22/0d2289" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/74/a57489" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/ae/ffae89" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/e5/2fe589" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/89/f5/eff589" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/01/bf018a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/19/10198a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/3b/213b8a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/62/84628a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/7e/987e8a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8a/a6/e2a68a" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8b/4b/924b8b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8b/6b/496b8b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8b/7f/f27f8b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8b/a0/fba08b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/24/2f248c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/2d/152d8c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/4b/f04b8c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/84/a9848c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/ba/3bba8c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/f5/a2f58c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8c/fe/85fe8c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8d/75/e9758d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8d/a8/76a88d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8d/cb/8ecb8d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8d/db/aedb8d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8d/dd/58dd8d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/58/c3588e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/62/55628e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/65/74658e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/a1/eba18e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/b1/0bb18e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/b8/c7b88e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8e/fc/4cfc8e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8f/01/7c018f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8f/91/b9918f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8f/9f/369f8f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/8f/b2/8cb28f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/08/be0890" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/0c/dc0c90" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/19/901990" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/8d/f18d90" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/c8/efc890" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/90/ef/97ef90" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/91/5e/a45e91" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/91/71/9e7191" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/13/391392" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/2f/b32f92" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/ad/dbad92" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/b3/63b392" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/c1/42c192" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/92/d4/a7d492" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/6a/086a93" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/85/a38593" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/a0/4ea093" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/b2/b9b293" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/b3/6cb393" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/b6/a3b693" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/93/eb/41eb93" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/13/d21394" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/28/4f2894" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/2f/082f94" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/61/926194" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/99/cd9994" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/b4/5db494" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/94/ef/64ef94" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/95/db/6bdb95" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/05/560596" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/19/921996" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/1a/621a96" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/27/c42796" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/54/2b5496" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/79/197996" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/96/f5/22f596" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/01/d20197" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/61/ac6197" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/70/627097" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/8e/668e97" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/9f/139f97" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/b1/98b197" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/97/b2/bbb297" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/98/69/0b6998" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/98/7d/e77d98" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/98/f7/aaf798" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/40/3d4099" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/52/e25299" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/58/ec5899" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/77/f27799" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/bf/cfbf99" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/c6/fdc699" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/99/e3/cbe399" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9b/c3/c1c39b" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9c/7e/897e9c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9c/90/99909c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9c/b1/19b19c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9d/36/44369d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9d/49/aa499d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9d/82/3e829d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9d/eb/f9eb9d" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/41/b8419e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/49/10499e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/7e/5e7e9e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/89/38899e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/c1/6dc19e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/c1/b2c19e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9e/c7/43c79e" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9f/1f/ff1f9f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9f/3f/ed3f9f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9f/57/9c579f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/9f/77/c1779f" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a0/0a/c40aa0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a0/0d/3b0da0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a0/36/b136a0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a0/97/9d97a0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a1/04/b204a1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a1/57/9e57a1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a1/7d/377da1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a1/a3/8aa3a1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a1/ce/56cea1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a2/1b/0b1ba2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a2/98/4498a2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a2/e4/18e4a2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a2/ee/b2eea2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a3/0f/200fa3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a3/73/be73a3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a3/f0/67f0a3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/4e/164ea4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/5a/795aa4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/6e/376ea4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/91/2191a4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/ca/62caa4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/cd/a3cda4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a4/d4/b5d4a4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a5/1e/ab1ea5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a5/5f/af5fa5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a5/9c/7f9ca5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a5/c3/5ec3a5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a5/d7/3ad7a5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a6/13/e113a6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a6/54/3354a6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a6/8d/d88da6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/24/9924a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/61/b061a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/79/0779a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/83/6f83a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/af/1eafa7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/e1/a6e1a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/e6/fee6a7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a7/fd/39fda7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a8/9e/8a9ea8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a8/f9/18f9a8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a9/9d/e99da9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/a9/e3/47e3a9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/aa/39/8f39aa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/aa/96/8c96aa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/aa/9b/eb9baa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/1d/3b1dab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/2a/b82aab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/74/0674ab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/81/4a81ab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/cb/c3cbab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/d1/71d1ab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ab/e0/81e0ab" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ac/4d/ca4dac" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ac/aa/56aaac" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ad/21/dc21ad" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ad/7f/407fad" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ae/74/f074ae" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ae/7b/8d7bae" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ae/be/6dbeae" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ae/f8/97f8ae" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/af/30/0730af" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/af/58/e958af" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/af/b4/19b4af" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/4d/6d4db0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/57/5557b0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/5d/945db0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/75/f175b0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/77/0677b0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b0/e2/d5e2b0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b1/03/4303b1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b1/41/eb41b1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b1/66/e266b1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b1/da/5fdab1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b2/60/0060b2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b2/83/d283b2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b2/ce/c2ceb2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b2/fe/cdfeb2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b2/ff/48ffb2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/0e/420eb3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/67/f667b3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/9f/d69fb3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/a1/79a1b3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/cc/cfccb3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/f2/16f2b3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b3/fe/e5feb3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b4/30/0330b4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b4/66/d766b4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b4/93/a393b4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b4/a0/b0a0b4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b5/90/0d90b5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b5/c3/43c3b5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b5/ef/22efb5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b6/a9/a0a9b6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b6/bf/f1bfb6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/07/9b07b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/19/e119b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/22/5922b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/71/1471b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/a8/a1a8b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/b4/96b4b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/e9/bee9b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b7/f2/70f2b7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/05/f805b8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/2a/452ab8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/3d/843db8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/40/8440b8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/67/1b67b8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/a7/b2a7b8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b8/a8/01a8b8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b9/0e/c40eb9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b9/a4/5aa4b9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/b9/b8/80b8b9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ba/08/2408ba" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ba/46/0046ba" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ba/c6/79c6ba" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ba/cc/24ccba" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bb/0c/860cbb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bb/2c/492cbb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bb/34/1f34bb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bb/8a/678abb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bc/26/2f26bc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bc/9e/c69ebc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bc/aa/a8aabc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bd/6d/756dbd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bd/71/9b71bd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bd/7c/2b7cbd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bd/c9/ecc9bd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bd/f6/f2f6bd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/be/1d/241dbe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/be/6e/a66ebe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/be/7f/e47fbe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/be/af/31afbe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/12/7912bf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/32/ec32bf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/4e/0e4ebf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/77/dd77bf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/80/2180bf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/bf/c1/f5c1bf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c0/27/7927c0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c0/30/8130c0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c0/55/7755c0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c0/88/ba88c0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c0/bc/c3bcc0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/29/4d29c1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/60/0f60c1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/b6/3cb6c1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/c8/edc8c1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/cd/b6cdc1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/ec/85ecc1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c1/f3/54f3c1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/58/7558c2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/58/db58c2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/63/ac63c2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/b3/f2b3c2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/ef/faefc2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c2/f2/b6f2c2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c3/0e/260ec3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c3/34/e734c3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c3/80/1f80c3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c4/3e/1f3ec4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c4/6e/ac6ec4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c4/9c/009cc4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c4/b8/72b8c4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c5/89/2189c5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c5/b5/0bb5c5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c5/d3/36d3c5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/1f/761fc6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/24/ae24c6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/64/df64c6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/7f/537fc6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/9c/509cc6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/c1/bdc1c6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c6/c7/d2c7c6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/04/5f04c7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/09/5809c7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/1d/bf1dc7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/44/7744c7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/68/2868c7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/aa/adaac7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c7/d1/b1d1c7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/00/5500c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/1f/121fc8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/40/ec40c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/45/f445c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/82/ff82c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/8c/068cc8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/b2/adb2c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c8/b3/08b3c8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c9/04/5a04c9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c9/44/ca44c9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c9/91/5e91c9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/c9/d6/edd6c9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ca/23/3123ca" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ca/4e/3d4eca" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ca/db/79dbca" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ca/e2/65e2ca" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cb/57/de57cb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cb/62/db62cb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cb/b4/29b4cb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cb/de/37decb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/15/bd15cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/28/2928cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/36/cd36cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/52/c152cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/57/e757cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/66/3366cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/a1/40a1cc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/ea/5ceacc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cc/ea/80eacc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/28/fc28cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/51/e951cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/93/4c93cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/9e/439ecd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/c6/0bc6cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/c8/c8c8cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/cc/2dcccd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/d4/8ed4cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cd/f2/47f2cd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ce/97/2b97ce" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ce/be/53bece" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ce/c1/0dc1ce" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ce/c6/70c6ce" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ce/f2/10f2ce" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cf/5d/195dcf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cf/63/4963cf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cf/7a/c07acf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/cf/ed/29edcf" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/0b/4e0bd0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/2a/162ad0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/48/8748d0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/6c/b36cd0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/b5/9fb5d0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d0/ea/92ead0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d1/25/2c25d1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d1/2f/442fd1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d1/f0/9df0d1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/31/8531d2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/3b/733bd2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/7c/af7cd2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/7e/fe7ed2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/c9/a4c9d2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d2/d9/bad9d2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/2a/462ad3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/84/5684d3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/97/e697d3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/a4/bea4d3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/d4/dfd4d3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d3/f3/ebf3d3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d4/7c/8f7cd4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d4/90/6d90d4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d4/c3/0bc3d4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d5/2b/b32bd5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d5/73/5b73d5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d5/b3/a7b3d5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d5/da/a5dad5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/06/0c06d6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/0e/b80ed6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/11/2a11d6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/56/e956d6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/63/ff63d6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d6/b6/34b6d6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/56/7e56d7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/64/7f64d7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/88/af88d7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/9a/d89ad7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/9d/079dd7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/b7/2cb7d7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d7/f0/60f0d7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d8/1e/e51ed8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d8/2b/292bd8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d8/8e/258ed8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d8/a5/70a5d8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/12/8a12d9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/22/c122d9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/3f/843fd9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/8a/1a8ad9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/8d/3b8dd9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/b5/0bb5d9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/d9/d6/12d6d9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/da/02/6b02da" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/da/54/f054da" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/da/9e/3f9eda" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/da/e5/02e5da" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/da/ec/1cecda" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/01/0001db" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/07/c707db" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/1d/1f1ddb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/34/f734db" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/3b/3b3bdb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/db/7b/317bdb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/2d/da2ddc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/55/0e55dc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/57/0157dc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/8c/388cdc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/97/2597dc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/e6/76e6dc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dc/ef/cdefdc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/0f/460fdd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/1e/5b1edd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/44/7144dd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/44/8c44dd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/4c/5f4cdd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/97/5c97dd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/dd/d1/8fd1dd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/de/0d/ba0dde" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/de/d7/7ad7de" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e0/50/0e50e0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e1/01/8401e1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e1/0f/9e0fe1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e1/46/2946e1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e1/b3/a3b3e1" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e2/1a/a61ae2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e2/25/4a25e2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e2/e8/84e8e2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/02/4402e3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/4b/ed4be3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/6b/6a6be3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/9d/c29de3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/db/9ddbe3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e3/e6/59e6e3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/0b/100be4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/35/6935e4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/55/9355e4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/81/7c81e4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/ad/cfade4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e4/ee/c5eee4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e5/23/d923e5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e5/30/1d30e5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e5/9f/849fe5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e5/a0/afa0e5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e5/c2/37c2e5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e6/09/ea09e6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e6/14/1714e6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e6/67/9a67e6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e6/79/de79e6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e6/9d/759de6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e7/48/3648e7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e7/ae/08aee7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e7/c1/a7c1e7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e7/d2/5ed2e7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/39/6139e8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/75/c075e8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/a2/f5a2e8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/e8/28e8e8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/ea/32eae8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e8/fd/c5fde8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/07/9707e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/0e/5c0ee9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/18/d518e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/22/f922e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/26/4726e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/31/aa31e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/8c/fb8ce9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/de/13dee9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/eb/49ebe9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/e9/f3/a7f3e9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/26/e626ea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/2a/4c2aea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/3b/f23bea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/7c/6c7cea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/a8/d9a8ea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/c5/98c5ea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/c8/90c8ea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ea/ce/b4ceea" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/1a/c31aeb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/49/b149eb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/4a/374aeb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/cb/75cbeb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/ed/b5edeb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/eb/ef/4eefeb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ec/f9/b0f9ec" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ed/a5/3da5ed" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ee/84/8e84ee" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ee/8a/2a8aee" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ee/f4/11f4ee" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ef/22/0b22ef" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ef/ab/29abef" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ef/cb/67cbef" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f0/4d/464df0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f0/55/4e55f0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f0/7b/667bf0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f0/f1/b6f1f0" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/10/cc10f2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/2e/882ef2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/6c/b56cf2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/70/9370f2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/ac/ecacf2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/b8/90b8f2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f2/d5/80d5f2" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f3/27/5427f3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f3/53/a753f3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f3/86/f986f3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f3/a7/66a7f3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f3/e9/0de9f3" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f4/04/6a04f4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f4/0b/2f0bf4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f4/35/6835f4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f4/86/0786f4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f5/0c/9d0cf5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f5/0c/fc0cf5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f5/8d/2d8df5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f5/af/d3aff5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f5/f7/eff7f5" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f6/4b/6c4bf6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f6/cd/53cdf6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f6/e1/30e1f6" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f7/0f/180ff7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f7/44/f144f7" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f8/22/4922f8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f8/5e/1a5ef8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f8/68/8168f8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f8/93/6a93f8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f8/e4/50e4f8" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/f9/87/8287f9" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fa/75/2175fa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fa/88/6f88fa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fa/b7/3eb7fa" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fb/29/3129fb" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/1a/3b1afc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/24/3d24fc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/35/b735fc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/4f/4f4ffc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/c0/75c0fc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fc/fb/48fbfc" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/18/7018fd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/39/8f39fd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/5b/1e5bfd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/69/0c69fd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/c9/9fc9fd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fd/ed/a1edfd" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/7c/807cfe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/90/d090fe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/a7/c2a7fe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/da/39dafe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/dd/6dddfe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/fe/ef/32effe" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ff/a7/7ea7ff" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ff/b3/a1b3ff" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ff/ba/35baff" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ff/ba/8dbaff" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/ff/d1/f6d1ff" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/07/0700dd40932fcd166b9637a6e71f7304c176c635885e5b334b9db959b1e1d070.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/07/079b4aca30e7d3b897823077cbe611c56539a5f02d83cb1f8d56a5f98881261b.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/0a/0a2be853fe57efc7324f4b3d6d8ecc9bfc96047770d6b8d1e006f54921425911.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/0b/0b7caa3d90b192c87e1620f595acac624a44d27939e130faafe1c8ad0cb8058c.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/0e/0ee51bbf96ec2bed2e553a162611aad68612234159f8f274704bf21f1babe53e.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/11/1119e77d310fbaa4f24636a532345e6110a461dc3fbef4af79599100954c09d3.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/19/190cef0efb2c32f5c19544476d3c6f481db5fdca90bdf3f735238bc491e77c6b.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/1d/1d4e6316b5462645771479ce10ebadf03ad0e3ad3d3101effb5d6be1d698554d.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/1d/1dcc55f66fbca96b8980d49c91b5902ec123caec745a35ce5b8adfcd129a3402.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/22/22510b2ba5c382ea98716771b80d3747edfac33e32a529a33cfc9c229f3fe468.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/24/2406d16603480a748a5cbacc9a46b7a8341b4db91db7c86cf5d9ae3a01b5e4b0.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/2c/2cdc2ef4ab256f922686277dec1b0c3749069dd2ff39c13594d83d173aa941e7.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/2f/2fa44b42db5e36c5ea2b41cc880f43290b5cd85a4658c543f97b8bd0041cdef8.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/37/37f84665fda8d5fd865c9dbba28f5601c8b49ad884ae1e2d1cd43d15d000dfdd.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/3f/3f6057c0db51d4b3ad56f36ae82053cacc59de8d822614b8e11f7a6ed86c7c03.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/44/4496360f7f687a1f474e255a2b89293444c35c256d14273fdde294c018dfbf41.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/44/44d6dbb95514d8fa560948df1e94e0dab0402b0a7fd114dad48ec8c9dee3f863.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/4c/4cd2e017458e6e66425dfe7634121b58f9c66adb64eefb82439079fa66c2a781.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/4e/4e1441fa2c678f94e1d0619a64281f410eb8bd23c47167d4d638b5b1a773056d.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/61/6198d18ef99fa4cda5dbe6100adb55cd4462b6bd9a52dfdd79a7d8cf0554ea81.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/6c/6c87bd8403e2b1957787825d1140da5710e1a3afac48595998eaaf45c2d3a525.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/6c/6c882a3b3665857b5b6e149ade09cefd971b3c1e0c2c190622c2c32e3314b9ac.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/6d/6dc46b93f5027812d1317a8bcdd5229e1c10a9ed8d30273940e97d5ab8371cd2.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/6f/6f9c60f8e4b1428438f63d0ea97072373a17b7fc43c67bdb4073e955c6bdc7a1.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/77/77f7b35341e5000b22c84ee71bf74d7b336c1530432e76b729592bab92dfc818.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/7d/7d730ead24db5aa8d2897392ad7d9559cd630d93194f7d5aadda6859c1de458f.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/80/8013ecb34f4417c966fff6f5105de45b69d8f9013aedf7a414fc5654762b5baa.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/90/90cd75741852afb973f0a26f2116850953033e07692876b16a0dad08f0a38726.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/95/9565481ea7dd56a82cadc0fae58284b93b0b430ebeee1d8bfc9495d61d8c2266.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/97/97db7e1fffd96b427c18620c58d535406527f6c46b2c7895565458a02dab07cf.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/9b/9b58c49c9e0023c2ecfb74723b3021efb9a37b1a42a81b538a08f7972dfe9791.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/9f/9f8b0f124ff43c4f4dc524642a99c555c84a9e561ba83a5bbdf5aa28be184cb4.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/ac/ac3af8b29aa63554697a31731e692121140a889e2bd5395f86900cf7010b1574.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/b4/b4ac910bad07b79deb5c1e6b0ced1dc161aea553d1b78bc1f3a48788f9722eb1.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/b6/b6bfefe8ee394d0d039f743670f8122ba21ea413f835592d9389bbb86817db07.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/ba/ba3631de900aad6b6dd2b14431349140abb0eb41e8ed158f2343a23c45f0c2fd.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/bc/bcc05c17cf72d0dade165dadbf2b91836ae194fcf912271d0d186627298dbf85.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/c2/c23f4f959f9f3944f4188bf07a1dbf9c505938a476e5df92435fb1b3ead0e428.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/c5/c5283b842184d9f4263585749ce95a08bfd474b9894809079431d01403dc730d.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/d1/d158fdeaa5afc24497f7713470e3ebdbcf9a1d8cf50e2e913fc8d1e93beb865a.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/e8/e8efddcf3490976859dd0ed3711bab9ff37d410d2f33e884a4d20a3de272a87d.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/ee/ee587433bd9477c5bac681d167320d3e15a065e3bfc18f72358547d26848e884.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/f3/f3798c41fb5211bddcfb45984f9decf1c4607010753e8dbfa2890d22d87cab79.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/f4/f4fb7de5b9d4a6fb7bf6c3f5220029397f54e95030d36980c90ef52c19b8222d.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/var/cache/dev/twig/fe/feb4ca202e48d70a1a259bffe9c4c7f8399a1780170baa8b1882c754386c13bc.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/.travis.yml" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/phpunit.xml.dist" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/AbstractLazyCollectionTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CollectionTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CriteriaTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/LazyArrayCollection.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/tests/Doctrine/Tests/TestInit.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/.php_cs" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/ext/twig/config.m4" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/ext/twig/config.w32" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/ext/twig/php_twig.h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/ext/twig/twig.c" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Autoloader.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/CompilerInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Filter/Function.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Filter/Method.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Filter/Node.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FilterCallableInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FilterInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Function/Function.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Function/Method.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Function/Node.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FunctionInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/LexerInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/String.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/SetTemp.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ParserInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SimpleFilter.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TemplateInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/Function.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/Method.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/Node.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TestCallableInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TestInterface.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParserBroker.php" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config/config.yml" afterPath="$PROJECT_DIR$/app/config/config.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config/parameters.yml" afterPath="$PROJECT_DIR$/app/config/parameters.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.lock" afterPath="$PROJECT_DIR$/composer.lock" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/SymfonyRequirements.php" afterPath="$PROJECT_DIR$/var/SymfonyRequirements.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/bootstrap.php.cache" afterPath="$PROJECT_DIR$/var/bootstrap.php.cache" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.php" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.php.meta" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.php.meta" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.xml" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainer.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerCompiler.log" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerCompiler.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerUrlGenerator.php.meta" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerUrlGenerator.php.meta" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerUrlMatcher.php.meta" afterPath="$PROJECT_DIR$/var/cache/dev/appDevDebugProjectContainerUrlMatcher.php.meta" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/classes.map" afterPath="$PROJECT_DIR$/var/cache/dev/classes.map" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/classes.php" afterPath="$PROJECT_DIR$/var/cache/dev/classes.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/classes.php.meta" afterPath="$PROJECT_DIR$/var/cache/dev/classes.php.meta" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/cache/dev/profiler/index.csv" afterPath="$PROJECT_DIR$/var/cache/dev/profiler/index.csv" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/var/logs/dev.log" afterPath="$PROJECT_DIR$/var/logs/dev.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" afterPath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_files.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_files.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_namespaces.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_real.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_real.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/composer/installed.json" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/README.md" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/README.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php" afterPath="$PROJECT_DIR$/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/README.md" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/README.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php" afterPath="$PROJECT_DIR$/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/common/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Version.php" afterPath="$PROJECT_DIR$/vendor/doctrine/common/lib/Doctrine/Common/Version.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php" afterPath="$PROJECT_DIR$/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/.travis.yml" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/.travis.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Registry.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Registry.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/doctrine-bundle/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/composer.json" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php" afterPath="$PROJECT_DIR$/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php" afterPath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php" afterPath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php" afterPath="$PROJECT_DIR$/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/.travis.yml" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/.travis.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/composer.json" afterPath="$PROJECT_DIR$/vendor/sensio/framework-extra-bundle/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/VERSION" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/VERSION" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/composer.json" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/doc/overview.rst" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/doc/overview.rst" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/doc/sending.rst" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/doc/sending.rst" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/preferences.php" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/lib/preferences.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/phpunit.xml.dist" afterPath="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer/phpunit.xml.dist" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/CHANGELOG.md" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/CHANGELOG.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/MonologBundle.php" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/MonologBundle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/monolog-bundle/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/bin/simple-phpunit" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/bin/simple-phpunit" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/phpunit-bridge/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/CHANGELOG" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/CHANGELOG" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig" afterPath="$PROJECT_DIR$/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/.github/build-packages.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/.github/build-packages.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/.travis.yml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/.travis.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/CHANGELOG-3.1.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/CHANGELOG-3.1.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/CHANGELOG-3.2.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/CHANGELOG-3.2.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/CONTRIBUTING.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/CONTRIBUTING.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/CONTRIBUTORS.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/CONTRIBUTORS.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-3.0.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-3.0.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-3.2.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-3.2.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-4.0.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/UPGRADE-4.0.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/appveyor.yml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/appveyor.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/phpunit" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/phpunit" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php" afterPath="$PROJECT_DIR$/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/.travis.yml" afterPath="$PROJECT_DIR$/vendor/twig/twig/.travis.yml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/LICENSE" afterPath="$PROJECT_DIR$/vendor/twig/twig/LICENSE" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/composer.json" afterPath="$PROJECT_DIR$/vendor/twig/twig/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Cache/Filesystem.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Cache/Filesystem.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Cache/Null.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Cache/Null.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/CacheInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/CacheInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Compiler.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Compiler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Environment.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Environment.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Loader.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Loader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Runtime.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Runtime.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Syntax.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Error/Syntax.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExpressionParser.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExpressionParser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Core.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Core.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Debug.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Debug.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Escaper.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Escaper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Optimizer.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Optimizer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Profiler.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Profiler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Sandbox.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Sandbox.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Staging.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/Staging.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/StringLoader.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Extension/StringLoader.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExtensionInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/ExtensionInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Filter.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Filter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Function.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Function.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Lexer.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Lexer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Array.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Array.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Chain.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Chain.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Filesystem.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Loader/Filesystem.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/LoaderInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/LoaderInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Markup.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Markup.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/AutoEscape.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/AutoEscape.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Block.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Block.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/BlockReference.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/BlockReference.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Body.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Body.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Do.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Do.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Embed.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Embed.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Array.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Array.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Call.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Call.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Function.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Function.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Name.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Name.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Flush.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Flush.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/For.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/For.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/ForLoop.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/ForLoop.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/If.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/If.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Import.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Import.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Include.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Include.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Macro.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Macro.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Module.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Module.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Print.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Print.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Sandbox.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Sandbox.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Set.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Set.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Spaceless.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Spaceless.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Text.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/Text.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/With.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Node/With.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeOutputInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeOutputInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeTraverser.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeTraverser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Parser.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Parser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Profile.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Profiler/Profile.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SimpleFunction.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SimpleFunction.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SimpleTest.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/SimpleTest.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Source.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Source.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Template.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Template.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TemplateWrapper.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TemplateWrapper.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Token.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Token.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Block.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Block.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Do.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Do.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Embed.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Embed.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Extends.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Extends.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Filter.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Filter.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Flush.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Flush.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/For.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/For.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/From.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/From.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/If.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/If.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Import.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Import.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Include.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Include.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Macro.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Macro.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Set.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Set.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Use.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/Use.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/With.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParser/With.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParserInterface.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenParserInterface.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenStream.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/TokenStream.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php" afterPath="$PROJECT_DIR$/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/config.php" afterPath="$PROJECT_DIR$/web/config.php" />
+ </list>
+ <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="CreatePatchCommitExecutor">
+ <option name="PATCH_PATH" value="" />
+ </component>
+ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+ <component name="FavoritesManager">
+ <favorites_list name="CNinno2k16" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="Album.php" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Album.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="288">
+ <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FindInProjectRecents">
+ <findStrings>
+ <find>default</find>
+ </findStrings>
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/composer.json" />
+ <option value="$PROJECT_DIR$/app/config/parameters.yml" />
+ <option value="$PROJECT_DIR$/app/config/config.yml" />
+ </list>
+ </option>
+ </component>
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsGulpfileManager">
+ <detection-done>true</detection-done>
+ <sorting>DEFINITION_ORDER</sorting>
+ </component>
+ <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
+ <component name="ProjectFrameBounds">
+ <option name="width" value="1920" />
+ <option name="height" value="1035" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="" version="1">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ <manualOrder />
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="AppBundle" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="AppBundle" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Entity" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="CNinno2k16" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="config" />
+ <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="Scope" />
+ <pane id="Scratches" />
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ </component>
+ <component name="ShelveChangesManager" show_recycled="false">
+ <option name="remove_strategy" value="false" />
+ </component>
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="d4ead572-e826-420a-9106-f3624033ce76" name="Default" comment="" />
+ <created>1487070217275</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1487070217275</updated>
+ <workItem from="1487070219405" duration="1906000" />
+ <workItem from="1487081247468" duration="1302000" />
+ </task>
+ <servers />
+ </component>
+ <component name="TimeTrackingManager">
+ <option name="totallyTimeSpent" value="3208000" />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="0" width="1920" height="1035" extended-state="6" />
+ <editor active="false" />
+ <layout>
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ </layout>
+ </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="processedProjectFiles" value="true" />
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager />
+ <watches-manager />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Album.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/composer.lock">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/composer.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="378">
+ <caret line="21" column="31" lean-forward="false" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/config/config_dev.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="486">
+ <caret line="27" column="19" lean-forward="true" selection-start-line="27" selection-start-column="19" selection-end-line="27" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="25" lean-forward="false" selection-start-line="0" selection-start-column="25" selection-end-line="0" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/config/config.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="573">
+ <caret line="73" column="47" lean-forward="false" selection-start-line="64" selection-start-column="8" selection-end-line="73" selection-end-column="47" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Album.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="288">
+ <caret line="25" column="7" lean-forward="true" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/config/config.yml b/app/config/config.yml
index f6e00c3d..79b3096f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -55,11 +55,23 @@ doctrine:
# 2. Uncomment database_path in parameters.yml.dist
# 3. Uncomment next line:
# path: "%database_path%"
+ types:
+ point: Wantlet\ORM\PointType
+ mapping_types:
+ point : point
orm:
auto_generate_proxy_classes: "%kernel.debug%"
- naming_strategy: doctrine.orm.naming_strategy.underscore
- auto_mapping: true
+ # naming_strategy: doctrine.orm.naming_strategy.underscore
+ # auto_mapping: true
+ default_entity_manager: default
+ entity_managers:
+ default:
+ auto_mapping: true
+ dql:
+ numeric_functions:
+ DISTANCE: Wantlet\ORM\Distance
+ POINT_STR: Wantlet\ORM\PointStr
# Swiftmailer Configuration
swiftmailer:
diff --git a/app/config/parameters.yml b/app/config/parameters.yml
index 186575ed..080ac240 100644
--- a/app/config/parameters.yml
+++ b/app/config/parameters.yml
@@ -2,7 +2,7 @@
parameters:
database_host: 127.0.0.1
database_port: null
- database_name: symfony
+ database_name: cninno
database_user: root
database_password: null
mailer_transport: smtp
diff --git a/composer.json b/composer.json
index 0c01a24a..11dbcdaa 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
"symfony/polyfill-apcu": "^1.0",
"sensio/distribution-bundle": "^5.0",
"sensio/framework-extra-bundle": "^3.0.2",
- "incenteev/composer-parameter-handler": "^2.0"
+ "incenteev/composer-parameter-handler": "^2.0",
+ "Wantlet": "dev-master"
},
"require-dev": {
"sensio/generator-bundle": "^3.0",
@@ -60,5 +61,12 @@
"file": "app/config/parameters.yml"
},
"branch-alias": null
- }
+ },
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/jhartikainen/doctrine2-spatial",
+ "comment": "Doctrine Spatial Data Types"
+ }
+ ]
}
diff --git a/composer.lock b/composer.lock
index a2f1cac4..f75c8695 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,39 +4,78 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "1a83f2cac0013b584ed3f969396566bf",
+ "content-hash": "804d35e672d24dd8937d093e53ca79c9",
"packages": [
+ {
+ "name": "Wantlet",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jhartikainen/doctrine2-spatial.git",
+ "reference": "1c1d55dee7939729620f061c7f8aca3747a0c6c7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jhartikainen/doctrine2-spatial/zipball/1c1d55dee7939729620f061c7f8aca3747a0c6c7",
+ "reference": "1c1d55dee7939729620f061c7f8aca3747a0c6c7",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/orm": "~2.2,>=2.2.3",
+ "php": ">=5.3.3"
+ },
+ "type": "doctrine-orm",
+ "autoload": {
+ "psr-0": {
+ "Wantlet\\ORM": ""
+ }
+ },
+ "license": [
+ "MIT"
+ ],
+ "description": "Some spatial data related classes developed for Doctrine 2",
+ "keywords": [
+ "doctrine",
+ "mysql",
+ "spatial"
+ ],
+ "support": {
+ "source": "https://github.com/jhartikainen/doctrine2-spatial/tree/master",
+ "issues": "https://github.com/jhartikainen/doctrine2-spatial/issues"
+ },
+ "time": "2014-08-17 09:01:34"
+ },
{
"name": "doctrine/annotations",
- "version": "v1.2.7",
+ "version": "v1.3.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
+ "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
+ "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
- "php": ">=5.3.2"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
"doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^5.6.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.4.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -72,7 +111,7 @@
"docblock",
"parser"
],
- "time": "2015-08-31T12:32:49+00:00"
+ "time": "2016-12-30T15:59:45+00:00"
},
{
"name": "doctrine/cache",
@@ -146,28 +185,29 @@
},
{
"name": "doctrine/collections",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "doctrine/coding-standard": "~0.1@dev",
+ "phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -208,20 +248,20 @@
"collections",
"iterator"
],
- "time": "2015-04-14T22:21:58+00:00"
+ "time": "2017-01-03T10:49:41+00:00"
},
{
"name": "doctrine/common",
- "version": "v2.6.2",
+ "version": "v2.7.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
+ "reference": "930297026c8009a567ac051fd545bf6124150347"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
+ "reference": "930297026c8009a567ac051fd545bf6124150347",
"shasum": ""
},
"require": {
@@ -230,10 +270,10 @@
"doctrine/collections": "1.*",
"doctrine/inflector": "1.*",
"doctrine/lexer": "1.*",
- "php": "~5.5|~7.0"
+ "php": "~5.6|~7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0"
+ "phpunit/phpunit": "^5.4.6"
},
"type": "library",
"extra": {
@@ -281,24 +321,24 @@
"persistence",
"spl"
],
- "time": "2016-11-30T16:50:46+00:00"
+ "time": "2017-01-13T14:02:13+00:00"
},
{
"name": "doctrine/dbal",
- "version": "v2.5.5",
+ "version": "v2.5.12",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
"shasum": ""
},
"require": {
- "doctrine/common": ">=2.4,<2.7-dev",
+ "doctrine/common": ">=2.4,<2.8-dev",
"php": ">=5.3.2"
},
"require-dev": {
@@ -352,41 +392,41 @@
"persistence",
"queryobject"
],
- "time": "2016-09-09T19:13:33+00:00"
+ "time": "2017-02-08T12:53:47+00:00"
},
{
"name": "doctrine/doctrine-bundle",
- "version": "1.6.4",
+ "version": "1.6.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7"
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7",
- "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
"shasum": ""
},
"require": {
"doctrine/dbal": "~2.3",
"doctrine/doctrine-cache-bundle": "~1.0",
"jdorn/sql-formatter": "~1.1",
- "php": ">=5.3.2",
- "symfony/console": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/doctrine-bridge": "~2.2|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
+ "php": ">=5.5.9",
+ "symfony/console": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
+ "symfony/doctrine-bridge": "~2.7|~3.0",
+ "symfony/framework-bundle": "~2.7|~3.0"
},
"require-dev": {
"doctrine/orm": "~2.3",
"phpunit/phpunit": "~4",
- "satooshi/php-coveralls": "~0.6.1",
+ "satooshi/php-coveralls": "^1.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/property-info": "~2.8|~3.0",
- "symfony/validator": "~2.2|~3.0",
- "symfony/yaml": "~2.2|~3.0",
- "twig/twig": "~1.10"
+ "symfony/validator": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "twig/twig": "~1.10|~2.0"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -433,7 +473,7 @@
"orm",
"persistence"
],
- "time": "2016-08-10T15:35:22+00:00"
+ "time": "2017-01-16T12:01:26+00:00"
},
{
"name": "doctrine/doctrine-cache-bundle",
@@ -700,22 +740,22 @@
},
{
"name": "doctrine/orm",
- "version": "v2.5.5",
+ "version": "v2.5.6",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
- "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45"
+ "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
- "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b",
+ "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
- "doctrine/common": ">=2.5-dev,<2.7-dev",
+ "doctrine/common": ">=2.5-dev,<2.8-dev",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/instantiator": "~1.0.1",
"ext-pdo": "*",
@@ -772,7 +812,7 @@
"database",
"orm"
],
- "time": "2016-09-10T18:51:13+00:00"
+ "time": "2016-12-18T15:42:34+00:00"
},
{
"name": "incenteev/composer-parameter-handler",
@@ -1096,16 +1136,16 @@
},
{
"name": "sensio/distribution-bundle",
- "version": "v5.0.15",
+ "version": "v5.0.18",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85"
+ "reference": "17846680901003d26d823c2e3ac9228702837916"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/d294b0665cf09c799e9c1993d5c776a5bf55cb85",
- "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916",
+ "reference": "17846680901003d26d823c2e3ac9228702837916",
"shasum": ""
},
"require": {
@@ -1144,20 +1184,20 @@
"configuration",
"distribution"
],
- "time": "2016-12-06T07:29:27+00:00"
+ "time": "2017-01-10T14:58:45+00:00"
},
{
"name": "sensio/framework-extra-bundle",
- "version": "v3.0.16",
+ "version": "v3.0.21",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546"
+ "reference": "ed86f6fb1753e76b39ff8b87f527045ca6b97169"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546",
- "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/ed86f6fb1753e76b39ff8b87f527045ca6b97169",
+ "reference": "ed86f6fb1753e76b39ff8b87f527045ca6b97169",
"shasum": ""
},
"require": {
@@ -1166,14 +1206,20 @@
"symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
+ "symfony/asset": "~2.7|~3.0",
"symfony/browser-kit": "~2.3|~3.0",
"symfony/dom-crawler": "~2.3|~3.0",
"symfony/expression-language": "~2.4|~3.0",
"symfony/finder": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
+ "symfony/phpunit-bridge": "~3.2",
+ "symfony/psr-http-message-bridge": "^0.3",
"symfony/security-bundle": "~2.4|~3.0",
+ "symfony/templating": "~2.3|~3.0",
+ "symfony/translation": "~2.3|~3.0",
"symfony/twig-bundle": "~2.3|~3.0",
- "twig/twig": "~1.11|~2.0"
+ "symfony/yaml": "~2.3|~3.0",
+ "twig/twig": "~1.11|~2.0",
+ "zendframework/zend-diactoros": "^1.3"
},
"suggest": {
"symfony/expression-language": "",
@@ -1206,7 +1252,7 @@
"annotations",
"controllers"
],
- "time": "2016-03-25T17:08:27+00:00"
+ "time": "2017-02-02T15:31:23+00:00"
},
{
"name": "sensiolabs/security-checker",
@@ -1254,23 +1300,24 @@
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.4",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756"
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756",
- "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
"type": "library",
"extra": {
@@ -1303,24 +1350,24 @@
"mail",
"mailer"
],
- "time": "2016-11-24T01:01:23+00:00"
+ "time": "2017-02-13T07:52:53+00:00"
},
{
"name": "symfony/monolog-bundle",
- "version": "3.0.1",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/monolog-bundle.git",
- "reference": "5f2d2d62530cd66be361216107869a3b061045db"
+ "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/5f2d2d62530cd66be361216107869a3b061045db",
- "reference": "5f2d2d62530cd66be361216107869a3b061045db",
+ "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/ebce76a39a65495a66c34eb1574cc4b9e35a4e64",
+ "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64",
"shasum": ""
},
"require": {
- "monolog/monolog": "~1.18",
+ "monolog/monolog": "~1.22",
"php": ">=5.3.2",
"symfony/config": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
@@ -1363,7 +1410,7 @@
"log",
"logging"
],
- "time": "2016-11-15T15:54:07+00:00"
+ "time": "2017-01-10T20:01:51+00:00"
},
{
"name": "symfony/polyfill-apcu",
@@ -1704,16 +1751,16 @@
},
{
"name": "symfony/swiftmailer-bundle",
- "version": "v2.4.0",
+ "version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
- "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069"
+ "reference": "ad751095576ce0c12a284e30e3fff80c91f27225"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069",
- "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069",
+ "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225",
+ "reference": "ad751095576ce0c12a284e30e3fff80c91f27225",
"shasum": ""
},
"require": {
@@ -1759,20 +1806,20 @@
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
- "time": "2016-10-27T17:59:30+00:00"
+ "time": "2016-12-20T04:44:33+00:00"
},
{
"name": "symfony/symfony",
- "version": "v3.2.1",
+ "version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7"
+ "reference": "6306409b3836ed2936c7b0454f00711d0128748c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/5824d423678a0cc44f3eb46efc246aecd1836dd7",
- "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/6306409b3836ed2936c7b0454f00711d0128748c",
+ "reference": "6306409b3836ed2936c7b0454f00711d0128748c",
"shasum": ""
},
"require": {
@@ -1855,6 +1902,7 @@
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
"phpdocumentor/reflection-docblock": "^3.0",
"predis/predis": "~1.0",
+ "sensio/framework-extra-bundle": "^3.0.2",
"symfony/phpunit-bridge": "~3.2",
"symfony/polyfill-apcu": "~1.1",
"symfony/security-acl": "~2.8|~3.0"
@@ -1901,33 +1949,34 @@
"keywords": [
"framework"
],
- "time": "2016-12-13T13:20:15+00:00"
+ "time": "2017-02-06T13:15:43+00:00"
},
{
"name": "twig/twig",
- "version": "v1.28.2",
+ "version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c"
+ "reference": "9062992538bc5855a683c6737257bfa18d25a4b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c",
- "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/9062992538bc5855a683c6737257bfa18d25a4b8",
+ "reference": "9062992538bc5855a683c6737257bfa18d25a4b8",
"shasum": ""
},
"require": {
- "php": ">=5.2.7"
+ "php": "^7.0",
+ "symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.2@dev"
+ "symfony/phpunit-bridge": "~3.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.28-dev"
+ "dev-master": "2.1-dev"
}
},
"autoload": {
@@ -1962,7 +2011,7 @@
"keywords": [
"templating"
],
- "time": "2016-11-23T18:41:40+00:00"
+ "time": "2017-01-11T19:39:01+00:00"
}
],
"packages-dev": [
@@ -2020,22 +2069,23 @@
},
{
"name": "symfony/phpunit-bridge",
- "version": "v3.2.1",
+ "version": "v3.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "65e64a4f99cbaeae718573c3347fbe800f3f6661"
+ "reference": "996374975357b569ea319ec1c98c5ca0f7dda610"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/65e64a4f99cbaeae718573c3347fbe800f3f6661",
- "reference": "65e64a4f99cbaeae718573c3347fbe800f3f6661",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/996374975357b569ea319ec1c98c5ca0f7dda610",
+ "reference": "996374975357b569ea319ec1c98c5ca0f7dda610",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
+ "ext-zip": "Zip support is required when using bin/simple-phpunit",
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
},
"bin": [
@@ -2074,19 +2124,18 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
- "time": "2016-12-12T13:31:08+00:00"
+ "time": "2017-01-21T17:06:35+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {
+ "wantlet": 20
+ },
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=5.5.9"
},
- "platform-dev": [],
- "platform-overrides": {
- "php": "5.5.9"
- }
+ "platform-dev": []
}
diff --git a/src/AppBundle/Entity/Album.php b/src/AppBundle/Entity/Album.php
new file mode 100644
index 00000000..23618e47
--- /dev/null
+++ b/src/AppBundle/Entity/Album.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Album
+ *
+ * @ORM\Table(name="album", indexes={@ORM\Index(name="ID_Dossier", columns={"ID_Dossier"})})
+ * @ORM\Entity
+ */
+class Album
+{
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+ */
+ private $nom;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Description", type="string", length=255, nullable=true)
+ */
+ private $description;
+
+ /**
+ * @var boolean
+ *
+ * @ORM\Column(name="Prive", type="boolean", nullable=false)
+ */
+ private $prive;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="ID_album", type="integer")
+ * @ORM\Id
+ * @ORM\GeneratedValue(strategy="IDENTITY")
+ */
+ private $idAlbum;
+
+ /**
+ * @var \AppBundle\Entity\Dossier
+ *
+ * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Dossier")
+ * @ORM\JoinColumns({
+ * @ORM\JoinColumn(name="ID_Dossier", referencedColumnName="ID_Dossier")
+ * })
+ */
+ private $idDossier;
+
+
+
+ /**
+ * Set nom
+ *
+ * @param string $nom
+ *
+ * @return Album
+ */
+ public function setNom($nom)
+ {
+ $this->nom = $nom;
+
+ return $this;
+ }
+
+ /**
+ * Get nom
+ *
+ * @return string
+ */
+ public function getNom()
+ {
+ return $this->nom;
+ }
+
+ /**
+ * Set description
+ *
+ * @param string $description
+ *
+ * @return Album
+ */
+ public function setDescription($description)
+ {
+ $this->description = $description;
+
+ return $this;
+ }
+
+ /**
+ * Get description
+ *
+ * @return string
+ */
+ public function getDescription()
+ {
+ return $this->description;
+ }
+
+ /**
+ * Set prive
+ *
+ * @param boolean $prive
+ *
+ * @return Album
+ */
+ public function setPrive($prive)
+ {
+ $this->prive = $prive;
+
+ return $this;
+ }
+
+ /**
+ * Get prive
+ *
+ * @return boolean
+ */
+ public function getPrive()
+ {
+ return $this->prive;
+ }
+
+ /**
+ * Get idAlbum
+ *
+ * @return integer
+ */
+ public function getIdAlbum()
+ {
+ return $this->idAlbum;
+ }
+
+ /**
+ * Set idDossier
+ *
+ * @param \AppBundle\Entity\Dossier $idDossier
+ *
+ * @return Album
+ */
+ public function setIdDossier(\AppBundle\Entity\Dossier $idDossier = null)
+ {
+ $this->idDossier = $idDossier;
+
+ return $this;
+ }
+
+ /**
+ * Get idDossier
+ *
+ * @return \AppBundle\Entity\Dossier
+ */
+ public function getIdDossier()
+ {
+ return $this->idDossier;
+ }
+}
diff --git a/src/AppBundle/Entity/Dossier.php b/src/AppBundle/Entity/Dossier.php
new file mode 100644
index 00000000..157a3c68
--- /dev/null
+++ b/src/AppBundle/Entity/Dossier.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Dossier
+ *
+ * @ORM\Table(name="dossier")
+ * @ORM\Entity
+ */
+class Dossier
+{
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+ */
+ private $nom;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Chemin", type="string", length=255, nullable=false)
+ */
+ private $chemin;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Description", type="string", length=255, nullable=true)
+ */
+ private $description;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="ID_Dossier", type="integer")
+ * @ORM\Id
+ * @ORM\GeneratedValue(strategy="IDENTITY")
+ */
+ private $idDossier;
+
+
+
+ /**
+ * Set nom
+ *
+ * @param string $nom
+ *
+ * @return Dossier
+ */
+ public function setNom($nom)
+ {
+ $this->nom = $nom;
+
+ return $this;
+ }
+
+ /**
+ * Get nom
+ *
+ * @return string
+ */
+ public function getNom()
+ {
+ return $this->nom;
+ }
+
+ /**
+ * Set chemin
+ *
+ * @param string $chemin
+ *
+ * @return Dossier
+ */
+ public function setChemin($chemin)
+ {
+ $this->chemin = $chemin;
+
+ return $this;
+ }
+
+ /**
+ * Get chemin
+ *
+ * @return string
+ */
+ public function getChemin()
+ {
+ return $this->chemin;
+ }
+
+ /**
+ * Set description
+ *
+ * @param string $description
+ *
+ * @return Dossier
+ */
+ public function setDescription($description)
+ {
+ $this->description = $description;
+
+ return $this;
+ }
+
+ /**
+ * Get description
+ *
+ * @return string
+ */
+ public function getDescription()
+ {
+ return $this->description;
+ }
+
+ /**
+ * Get idDossier
+ *
+ * @return integer
+ */
+ public function getIdDossier()
+ {
+ return $this->idDossier;
+ }
+}
diff --git a/src/AppBundle/Entity/Personnes.php b/src/AppBundle/Entity/Personnes.php
new file mode 100644
index 00000000..8514753b
--- /dev/null
+++ b/src/AppBundle/Entity/Personnes.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Personnes
+ *
+ * @ORM\Table(name="personnes")
+ * @ORM\Entity
+ */
+class Personnes
+{
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+ */
+ private $nom;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="Infos_reconnaissance", type="integer", nullable=true)
+ */
+ private $infosReconnaissance;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="ID_Personne", type="integer")
+ * @ORM\Id
+ * @ORM\GeneratedValue(strategy="IDENTITY")
+ */
+ private $idPersonne;
+
+ /**
+ * @var \Doctrine\Common\Collections\Collection
+ *
+ * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Photos", mappedBy="idPersonne")
+ */
+ private $idPhotographie;
+
+ /**
+ * @var \Doctrine\Common\Collections\Collection
+ *
+ * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Photos", mappedBy="idPerso")
+ */
+ private $idPhoto;
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ $this->idPhotographie = new \Doctrine\Common\Collections\ArrayCollection();
+ $this->idPhoto = new \Doctrine\Common\Collections\ArrayCollection();
+ }
+
+
+ /**
+ * Set nom
+ *
+ * @param string $nom
+ *
+ * @return Personnes
+ */
+ public function setNom($nom)
+ {
+ $this->nom = $nom;
+
+ return $this;
+ }
+
+ /**
+ * Get nom
+ *
+ * @return string
+ */
+ public function getNom()
+ {
+ return $this->nom;
+ }
+
+ /**
+ * Set infosReconnaissance
+ *
+ * @param integer $infosReconnaissance
+ *
+ * @return Personnes
+ */
+ public function setInfosReconnaissance($infosReconnaissance)
+ {
+ $this->infosReconnaissance = $infosReconnaissance;
+
+ return $this;
+ }
+
+ /**
+ * Get infosReconnaissance
+ *
+ * @return integer
+ */
+ public function getInfosReconnaissance()
+ {
+ return $this->infosReconnaissance;
+ }
+
+ /**
+ * Get idPersonne
+ *
+ * @return integer
+ */
+ public function getIdPersonne()
+ {
+ return $this->idPersonne;
+ }
+
+ /**
+ * Add idPhotographie
+ *
+ * @param \AppBundle\Entity\Photos $idPhotographie
+ *
+ * @return Personnes
+ */
+ public function addIdPhotographie(\AppBundle\Entity\Photos $idPhotographie)
+ {
+ $this->idPhotographie[] = $idPhotographie;
+
+ return $this;
+ }
+
+ /**
+ * Remove idPhotographie
+ *
+ * @param \AppBundle\Entity\Photos $idPhotographie
+ */
+ public function removeIdPhotographie(\AppBundle\Entity\Photos $idPhotographie)
+ {
+ $this->idPhotographie->removeElement($idPhotographie);
+ }
+
+ /**
+ * Get idPhotographie
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getIdPhotographie()
+ {
+ return $this->idPhotographie;
+ }
+
+ /**
+ * Add idPhoto
+ *
+ * @param \AppBundle\Entity\Photos $idPhoto
+ *
+ * @return Personnes
+ */
+ public function addIdPhoto(\AppBundle\Entity\Photos $idPhoto)
+ {
+ $this->idPhoto[] = $idPhoto;
+
+ return $this;
+ }
+
+ /**
+ * Remove idPhoto
+ *
+ * @param \AppBundle\Entity\Photos $idPhoto
+ */
+ public function removeIdPhoto(\AppBundle\Entity\Photos $idPhoto)
+ {
+ $this->idPhoto->removeElement($idPhoto);
+ }
+
+ /**
+ * Get idPhoto
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getIdPhoto()
+ {
+ return $this->idPhoto;
+ }
+}
diff --git a/src/AppBundle/Entity/Photographe.php b/src/AppBundle/Entity/Photographe.php
new file mode 100644
index 00000000..d038c28f
--- /dev/null
+++ b/src/AppBundle/Entity/Photographe.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Photographe
+ *
+ * @ORM\Table(name="photographe")
+ * @ORM\Entity
+ */
+class Photographe
+{
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+ */
+ private $nom;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Informations", type="string", length=255, nullable=true)
+ */
+ private $informations;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="Promotion", type="integer", nullable=true)
+ */
+ private $promotion;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="ID_photographe", type="integer")
+ * @ORM\Id
+ * @ORM\GeneratedValue(strategy="IDENTITY")
+ */
+ private $idPhotographe;
+
+
+
+ /**
+ * Set nom
+ *
+ * @param string $nom
+ *
+ * @return Photographe
+ */
+ public function setNom($nom)
+ {
+ $this->nom = $nom;
+
+ return $this;
+ }
+
+ /**
+ * Get nom
+ *
+ * @return string
+ */
+ public function getNom()
+ {
+ return $this->nom;
+ }
+
+ /**
+ * Set informations
+ *
+ * @param string $informations
+ *
+ * @return Photographe
+ */
+ public function setInformations($informations)
+ {
+ $this->informations = $informations;
+
+ return $this;
+ }
+
+ /**
+ * Get informations
+ *
+ * @return string
+ */
+ public function getInformations()
+ {
+ return $this->informations;
+ }
+
+ /**
+ * Set promotion
+ *
+ * @param integer $promotion
+ *
+ * @return Photographe
+ */
+ public function setPromotion($promotion)
+ {
+ $this->promotion = $promotion;
+
+ return $this;
+ }
+
+ /**
+ * Get promotion
+ *
+ * @return integer
+ */
+ public function getPromotion()
+ {
+ return $this->promotion;
+ }
+
+ /**
+ * Get idPhotographe
+ *
+ * @return integer
+ */
+ public function getIdPhotographe()
+ {
+ return $this->idPhotographe;
+ }
+}
diff --git a/src/AppBundle/Entity/Photos.php b/src/AppBundle/Entity/Photos.php
new file mode 100644
index 00000000..7fe9187d
--- /dev/null
+++ b/src/AppBundle/Entity/Photos.php
@@ -0,0 +1,302 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Photos
+ *
+ * @ORM\Table(name="photos", indexes={@ORM\Index(name="ID_photographe", columns={"ID_photographe"}), @ORM\Index(name="ID_album", columns={"ID_album"})})
+ * @ORM\Entity
+ */
+class Photos
+{
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Nom", type="string", length=255, nullable=false)
+ */
+ private $nom;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Chemin", type="string", length=255, nullable=false)
+ */
+ private $chemin;
+
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="Description", type="string", length=255, nullable=true)
+ */
+ private $description;
+
+ /**
+ * @var integer
+ *
+ * @ORM\Column(name="ID_Photo", type="integer")
+ * @ORM\Id
+ * @ORM\GeneratedValue(strategy="IDENTITY")
+ */
+ private $idPhoto;
+
+ /**
+ * @var \AppBundle\Entity\Photographe
+ *
+ * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Photographe")
+ * @ORM\JoinColumns({
+ * @ORM\JoinColumn(name="ID_photographe", referencedColumnName="ID_photographe")
+ * })
+ */
+ private $idPhotographe;
+
+ /**
+ * @var \AppBundle\Entity\Album
+ *
+ * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Album")
+ * @ORM\JoinColumns({
+ * @ORM\JoinColumn(name="ID_album", referencedColumnName="ID_album")
+ * })
+ */
+ private $idAlbum;
+
+ /**
+ * @var \Doctrine\Common\Collections\Collection
+ *
+ * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Personnes", inversedBy="idPhotographie")
+ * @ORM\JoinTable(name="favoris",
+ * joinColumns={
+ * @ORM\JoinColumn(name="ID_Photographie", referencedColumnName="ID_Photo")
+ * },
+ * inverseJoinColumns={
+ * @ORM\JoinColumn(name="ID_Personne", referencedColumnName="ID_Personne")
+ * }
+ * )
+ */
+ private $idPersonne;
+
+ /**
+ * @var \Doctrine\Common\Collections\Collection
+ *
+ * @ORM\ManyToMany(targetEntity="AppBundle\Entity\Personnes", inversedBy="idPhoto")
+ * @ORM\JoinTable(name="identification",
+ * joinColumns={
+ * @ORM\JoinColumn(name="ID_Photo", referencedColumnName="ID_Photo")
+ * },
+ * inverseJoinColumns={
+ * @ORM\JoinColumn(name="ID_Perso", referencedColumnName="ID_Personne")
+ * }
+ * )
+ */
+ private $idPerso;
+
+ /**
+ * Constructor
+ */
+ public function __construct()
+ {
+ $this->idPersonne = new \Doctrine\Common\Collections\ArrayCollection();
+ $this->idPerso = new \Doctrine\Common\Collections\ArrayCollection();
+ }
+
+
+ /**
+ * Set nom
+ *
+ * @param string $nom
+ *
+ * @return Photos
+ */
+ public function setNom($nom)
+ {
+ $this->nom = $nom;
+
+ return $this;
+ }
+
+ /**
+ * Get nom
+ *
+ * @return string
+ */
+ public function getNom()
+ {
+ return $this->nom;
+ }
+
+ /**
+ * Set chemin
+ *
+ * @param string $chemin
+ *
+ * @return Photos
+ */
+ public function setChemin($chemin)
+ {
+ $this->chemin = $chemin;
+
+ return $this;
+ }
+
+ /**
+ * Get chemin
+ *
+ * @return string
+ */
+ public function getChemin()
+ {
+ return $this->chemin;
+ }
+
+ /**
+ * Set description
+ *
+ * @param string $description
+ *
+ * @return Photos
+ */
+ public function setDescription($description)
+ {
+ $this->description = $description;
+
+ return $this;
+ }
+
+ /**
+ * Get description
+ *
+ * @return string
+ */
+ public function getDescription()
+ {
+ return $this->description;
+ }
+
+ /**
+ * Get idPhoto
+ *
+ * @return integer
+ */
+ public function getIdPhoto()
+ {
+ return $this->idPhoto;
+ }
+
+ /**
+ * Set idPhotographe
+ *
+ * @param \AppBundle\Entity\Photographe $idPhotographe
+ *
+ * @return Photos
+ */
+ public function setIdPhotographe(\AppBundle\Entity\Photographe $idPhotographe = null)
+ {
+ $this->idPhotographe = $idPhotographe;
+
+ return $this;
+ }
+
+ /**
+ * Get idPhotographe
+ *
+ * @return \AppBundle\Entity\Photographe
+ */
+ public function getIdPhotographe()
+ {
+ return $this->idPhotographe;
+ }
+
+ /**
+ * Set idAlbum
+ *
+ * @param \AppBundle\Entity\Album $idAlbum
+ *
+ * @return Photos
+ */
+ public function setIdAlbum(\AppBundle\Entity\Album $idAlbum = null)
+ {
+ $this->idAlbum = $idAlbum;
+
+ return $this;
+ }
+
+ /**
+ * Get idAlbum
+ *
+ * @return \AppBundle\Entity\Album
+ */
+ public function getIdAlbum()
+ {
+ return $this->idAlbum;
+ }
+
+ /**
+ * Add idPersonne
+ *
+ * @param \AppBundle\Entity\Personnes $idPersonne
+ *
+ * @return Photos
+ */
+ public function addIdPersonne(\AppBundle\Entity\Personnes $idPersonne)
+ {
+ $this->idPersonne[] = $idPersonne;
+
+ return $this;
+ }
+
+ /**
+ * Remove idPersonne
+ *
+ * @param \AppBundle\Entity\Personnes $idPersonne
+ */
+ public function removeIdPersonne(\AppBundle\Entity\Personnes $idPersonne)
+ {
+ $this->idPersonne->removeElement($idPersonne);
+ }
+
+ /**
+ * Get idPersonne
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getIdPersonne()
+ {
+ return $this->idPersonne;
+ }
+
+ /**
+ * Add idPerso
+ *
+ * @param \AppBundle\Entity\Personnes $idPerso
+ *
+ * @return Photos
+ */
+ public function addIdPerso(\AppBundle\Entity\Personnes $idPerso)
+ {
+ $this->idPerso[] = $idPerso;
+
+ return $this;
+ }
+
+ /**
+ * Remove idPerso
+ *
+ * @param \AppBundle\Entity\Personnes $idPerso
+ */
+ public function removeIdPerso(\AppBundle\Entity\Personnes $idPerso)
+ {
+ $this->idPerso->removeElement($idPerso);
+ }
+
+ /**
+ * Get idPerso
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getIdPerso()
+ {
+ return $this->idPerso;
+ }
+}
diff --git a/src/AppBundle/Resources/config/doctrine/Album.orm.xml b/src/AppBundle/Resources/config/doctrine/Album.orm.xml
new file mode 100644
index 00000000..800d38a0
--- /dev/null
+++ b/src/AppBundle/Resources/config/doctrine/Album.orm.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="AppBundle\Entity\Album" table="album">
+ <indexes>
+ <index name="ID_Dossier" columns="ID_Dossier"/>
+ </indexes>
+ <id name="idAlbum" type="integer" column="ID_album">
+ <generator strategy="IDENTITY"/>
+ </id>
+ <field name="nom" type="string" column="Nom" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="description" type="string" column="Description" length="255" nullable="true">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="prive" type="boolean" column="Prive" nullable="false"/>
+ <many-to-one field="idDossier" target-entity="Dossier" fetch="LAZY">
+ <join-columns>
+ <join-column name="ID_Dossier" referenced-column-name="ID_Dossier"/>
+ </join-columns>
+ </many-to-one>
+ </entity>
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Dossier.orm.xml b/src/AppBundle/Resources/config/doctrine/Dossier.orm.xml
new file mode 100644
index 00000000..0be90b17
--- /dev/null
+++ b/src/AppBundle/Resources/config/doctrine/Dossier.orm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="AppBundle\Entity\Dossier" table="dossier">
+ <id name="idDossier" type="integer" column="ID_Dossier">
+ <generator strategy="IDENTITY"/>
+ </id>
+ <field name="nom" type="string" column="Nom" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="chemin" type="string" column="Chemin" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="description" type="string" column="Description" length="255" nullable="true">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ </entity>
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Personnes.orm.xml b/src/AppBundle/Resources/config/doctrine/Personnes.orm.xml
new file mode 100644
index 00000000..ecdae423
--- /dev/null
+++ b/src/AppBundle/Resources/config/doctrine/Personnes.orm.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="AppBundle\Entity\Personnes" table="personnes">
+ <id name="idPersonne" type="integer" column="ID_Personne">
+ <generator strategy="IDENTITY"/>
+ </id>
+ <field name="nom" type="string" column="Nom" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="infosReconnaissance" type="integer" column="Infos_reconnaissance" nullable="true">
+ <options>
+ <option name="unsigned"/>
+ </options>
+ </field>
+ <many-to-many field="idPhotographie" target-entity="Photos" mapped-by="idPersonne" fetch="LAZY"/>
+ <many-to-many field="idPhoto" target-entity="Photos" mapped-by="idPerso" fetch="LAZY"/>
+ </entity>
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Photographe.orm.xml b/src/AppBundle/Resources/config/doctrine/Photographe.orm.xml
new file mode 100644
index 00000000..2af1c2f6
--- /dev/null
+++ b/src/AppBundle/Resources/config/doctrine/Photographe.orm.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="AppBundle\Entity\Photographe" table="photographe">
+ <id name="idPhotographe" type="integer" column="ID_photographe">
+ <generator strategy="IDENTITY"/>
+ </id>
+ <field name="nom" type="string" column="Nom" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="informations" type="string" column="Informations" length="255" nullable="true">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="promotion" type="integer" column="Promotion" nullable="true">
+ <options>
+ <option name="unsigned"/>
+ </options>
+ </field>
+ </entity>
+</doctrine-mapping>
diff --git a/src/AppBundle/Resources/config/doctrine/Photos.orm.xml b/src/AppBundle/Resources/config/doctrine/Photos.orm.xml
new file mode 100644
index 00000000..43622bea
--- /dev/null
+++ b/src/AppBundle/Resources/config/doctrine/Photos.orm.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+ <entity name="AppBundle\Entity\Photos" table="photos">
+ <indexes>
+ <index name="ID_photographe" columns="ID_photographe"/>
+ <index name="ID_album" columns="ID_album"/>
+ </indexes>
+ <id name="idPhoto" type="integer" column="ID_Photo">
+ <generator strategy="IDENTITY"/>
+ </id>
+ <field name="nom" type="string" column="Nom" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="chemin" type="string" column="Chemin" length="255" nullable="false">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <field name="description" type="string" column="Description" length="255" nullable="true">
+ <options>
+ <option name="fixed"/>
+ </options>
+ </field>
+ <many-to-one field="idPhotographe" target-entity="Photographe" fetch="LAZY">
+ <join-columns>
+ <join-column name="ID_photographe" referenced-column-name="ID_photographe"/>
+ </join-columns>
+ </many-to-one>
+ <many-to-one field="idAlbum" target-entity="Album" fetch="LAZY">
+ <join-columns>
+ <join-column name="ID_album" referenced-column-name="ID_album"/>
+ </join-columns>
+ </many-to-one>
+ <many-to-many field="idPersonne" target-entity="Personnes" inversed-by="idPhotographie" fetch="LAZY">
+ <join-table name="favoris">
+ <join-columns>
+ <join-column name="ID_Photographie" referenced-column-name="ID_Photo"/>
+ </join-columns>
+ <inverse-join-columns>
+ <join-column name="ID_Personne" referenced-column-name="ID_Personne"/>
+ </inverse-join-columns>
+ </join-table>
+ </many-to-many>
+ <many-to-many field="idPerso" target-entity="Personnes" inversed-by="idPhoto" fetch="LAZY">
+ <join-table name="identification">
+ <join-columns>
+ <join-column name="ID_Photo" referenced-column-name="ID_Photo"/>
+ </join-columns>
+ <inverse-join-columns>
+ <join-column name="ID_Perso" referenced-column-name="ID_Personne"/>
+ </inverse-join-columns>
+ </join-table>
+ </many-to-many>
+ </entity>
+</doctrine-mapping>
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
index 7e7723af..7e7a99de 100644
--- a/var/SymfonyRequirements.php
+++ b/var/SymfonyRequirements.php
@@ -780,7 +780,11 @@ class SymfonyRequirements extends RequirementCollection
{
$size = ini_get('realpath_cache_size');
$size = trim($size);
- $unit = strtolower(substr($size, -1, 1));
+ $unit = '';
+ if (!ctype_digit($size)) {
+ $unit = strtolower(substr($size, -1, 1));
+ $size = (int) substr($size, 0, -1);
+ }
switch ($unit) {
case 'g':
return $size * 1024 * 1024 * 1024;
diff --git a/var/bootstrap.php.cache b/var/bootstrap.php.cache
index ef52ef16..751c9dc8 100644
--- a/var/bootstrap.php.cache
+++ b/var/bootstrap.php.cache
@@ -1303,4 +1303,3 @@ return $clientIps ? array_reverse($clientIps) : array($firstTrustedIp);
}
}
namespace {require __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php';}
-namespace {require __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ApcClassLoader.php';}
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 126b5388..4626994f 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -55,6 +55,7 @@ class ClassLoader
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
+ private $apcuPrefix;
public function getPrefixes()
{
@@ -271,6 +272,26 @@ class ClassLoader
return $this->classMapAuthoritative;
}
+ /**
+ * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+ *
+ * @param string|null $apcuPrefix
+ */
+ public function setApcuPrefix($apcuPrefix)
+ {
+ $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+ }
+
+ /**
+ * The APCu prefix in use, or null if APCu caching is not enabled.
+ *
+ * @return string|null
+ */
+ public function getApcuPrefix()
+ {
+ return $this->apcuPrefix;
+ }
+
/**
* Registers this instance as an autoloader.
*
@@ -320,6 +341,12 @@ class ClassLoader
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
+ if (null !== $this->apcuPrefix) {
+ $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+ if ($hit) {
+ return $file;
+ }
+ }
$file = $this->findFileWithExtension($class, '.php');
@@ -328,6 +355,10 @@ class ClassLoader
$file = $this->findFileWithExtension($class, '.hh');
}
+ if (null !== $this->apcuPrefix) {
+ apcu_add($this->apcuPrefix.$class, $file);
+ }
+
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 85b3ff3f..d6b741a2 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -7,11 +7,11 @@ $baseDir = dirname($vendorDir);
return array(
'92c8763cd6170fce6fcfe7e26b4e8c10' => $vendorDir . '/symfony/phpunit-bridge/bootstrap.php',
+ '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
'5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
'023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
- '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'6a47392539ca2329373e0d33e1dba053' => $vendorDir . '/symfony/polyfill-intl-icu/bootstrap.php',
'32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
);
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 1107e0d6..f28bb3f0 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
+ 'Wantlet\\ORM' => array($vendorDir . '/Wantlet'),
'Twig_' => array($vendorDir . '/twig/twig/lib'),
'SensioLabs\\Security' => array($vendorDir . '/sensiolabs/security-checker'),
'Doctrine\\ORM\\' => array($vendorDir . '/doctrine/orm/lib'),
@@ -13,5 +14,4 @@ return array(
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
- 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index cc661977..7dd3cf88 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -30,6 +30,7 @@ return array(
'Incenteev\\ParameterHandler\\' => array($vendorDir . '/incenteev/composer-parameter-handler'),
'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
+ 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'),
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib/Doctrine/Common'),
'Doctrine\\Bundle\\DoctrineCacheBundle\\' => array($vendorDir . '/doctrine/doctrine-cache-bundle'),
'Doctrine\\Bundle\\DoctrineBundle\\' => array($vendorDir . '/doctrine/doctrine-bundle'),
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index fee91dc0..55435e12 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -23,7 +23,7 @@ class ComposerAutoloaderInit8f16e9ff200ebb897755e6cf2d2fc1ac
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit8f16e9ff200ebb897755e6cf2d2fc1ac', 'loadClassLoader'));
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+ $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 4a60bceb..fae9a899 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -8,11 +8,11 @@ class ComposerStaticInit8f16e9ff200ebb897755e6cf2d2fc1ac
{
public static $files = array (
'92c8763cd6170fce6fcfe7e26b4e8c10' => __DIR__ . '/..' . '/symfony/phpunit-bridge/bootstrap.php',
+ '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
'5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
'023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
- '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'6a47392539ca2329373e0d33e1dba053' => __DIR__ . '/..' . '/symfony/polyfill-intl-icu/bootstrap.php',
'32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
);
@@ -59,6 +59,7 @@ class ComposerStaticInit8f16e9ff200ebb897755e6cf2d2fc1ac
array (
'Doctrine\\Instantiator\\' => 22,
'Doctrine\\Common\\Cache\\' => 22,
+ 'Doctrine\\Common\\Annotations\\' => 28,
'Doctrine\\Common\\' => 16,
'Doctrine\\Bundle\\DoctrineCacheBundle\\' => 36,
'Doctrine\\Bundle\\DoctrineBundle\\' => 31,
@@ -162,6 +163,10 @@ class ComposerStaticInit8f16e9ff200ebb897755e6cf2d2fc1ac
array (
0 => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache',
),
+ 'Doctrine\\Common\\Annotations\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations',
+ ),
'Doctrine\\Common\\' =>
array (
0 => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common',
@@ -181,6 +186,13 @@ class ComposerStaticInit8f16e9ff200ebb897755e6cf2d2fc1ac
);
public static $prefixesPsr0 = array (
+ 'W' =>
+ array (
+ 'Wantlet\\ORM' =>
+ array (
+ 0 => __DIR__ . '/..' . '/Wantlet',
+ ),
+ ),
'T' =>
array (
'Twig_' =>
@@ -217,10 +229,6 @@ class ComposerStaticInit8f16e9ff200ebb897755e6cf2d2fc1ac
array (
0 => __DIR__ . '/..' . '/doctrine/collections/lib',
),
- 'Doctrine\\Common\\Annotations\\' =>
- array (
- 0 => __DIR__ . '/..' . '/doctrine/annotations/lib',
- ),
),
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index bf95b8f8..d3150faa 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -55,139 +55,6 @@
"parser"
]
},
- {
- "name": "doctrine/annotations",
- "version": "v1.2.7",
- "version_normalized": "1.2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/annotations.git",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "shasum": ""
- },
- "require": {
- "doctrine/lexer": "1.*",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
- },
- "time": "2015-08-31T12:32:49+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "docblock",
- "parser"
- ]
- },
- {
- "name": "twig/twig",
- "version": "v1.28.2",
- "version_normalized": "1.28.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/twigphp/Twig.git",
- "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c",
- "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.7"
- },
- "require-dev": {
- "symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.2@dev"
- },
- "time": "2016-11-23T18:41:40+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.28-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Twig_": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
- {
- "name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com",
- "role": "Project Founder"
- },
- {
- "name": "Twig Team",
- "homepage": "http://twig.sensiolabs.org/contributors",
- "role": "Contributors"
- }
- ],
- "description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
- "keywords": [
- "templating"
- ]
- },
{
"name": "symfony/polyfill-util",
"version": "v1.3.0",
@@ -472,150 +339,6 @@
"shim"
]
},
- {
- "name": "symfony/symfony",
- "version": "v3.2.1",
- "version_normalized": "3.2.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/symfony.git",
- "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/5824d423678a0cc44f3eb46efc246aecd1836dd7",
- "reference": "5824d423678a0cc44f3eb46efc246aecd1836dd7",
- "shasum": ""
- },
- "require": {
- "doctrine/common": "~2.4",
- "php": ">=5.5.9",
- "psr/cache": "~1.0",
- "psr/log": "~1.0",
- "symfony/polyfill-intl-icu": "~1.0",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php56": "~1.0",
- "symfony/polyfill-php70": "~1.0",
- "symfony/polyfill-util": "~1.0",
- "twig/twig": "~1.28|~2.0"
- },
- "conflict": {
- "phpdocumentor/reflection-docblock": "<3.0",
- "phpdocumentor/type-resolver": "<0.2.0"
- },
- "provide": {
- "psr/cache-implementation": "1.0"
- },
- "replace": {
- "symfony/asset": "self.version",
- "symfony/browser-kit": "self.version",
- "symfony/cache": "self.version",
- "symfony/class-loader": "self.version",
- "symfony/config": "self.version",
- "symfony/console": "self.version",
- "symfony/css-selector": "self.version",
- "symfony/debug": "self.version",
- "symfony/debug-bundle": "self.version",
- "symfony/dependency-injection": "self.version",
- "symfony/doctrine-bridge": "self.version",
- "symfony/dom-crawler": "self.version",
- "symfony/event-dispatcher": "self.version",
- "symfony/expression-language": "self.version",
- "symfony/filesystem": "self.version",
- "symfony/finder": "self.version",
- "symfony/form": "self.version",
- "symfony/framework-bundle": "self.version",
- "symfony/http-foundation": "self.version",
- "symfony/http-kernel": "self.version",
- "symfony/inflector": "self.version",
- "symfony/intl": "self.version",
- "symfony/ldap": "self.version",
- "symfony/monolog-bridge": "self.version",
- "symfony/options-resolver": "self.version",
- "symfony/process": "self.version",
- "symfony/property-access": "self.version",
- "symfony/property-info": "self.version",
- "symfony/proxy-manager-bridge": "self.version",
- "symfony/routing": "self.version",
- "symfony/security": "self.version",
- "symfony/security-bundle": "self.version",
- "symfony/security-core": "self.version",
- "symfony/security-csrf": "self.version",
- "symfony/security-guard": "self.version",
- "symfony/security-http": "self.version",
- "symfony/serializer": "self.version",
- "symfony/stopwatch": "self.version",
- "symfony/templating": "self.version",
- "symfony/translation": "self.version",
- "symfony/twig-bridge": "self.version",
- "symfony/twig-bundle": "self.version",
- "symfony/validator": "self.version",
- "symfony/var-dumper": "self.version",
- "symfony/web-profiler-bundle": "self.version",
- "symfony/workflow": "self.version",
- "symfony/yaml": "self.version"
- },
- "require-dev": {
- "cache/integration-tests": "dev-master",
- "doctrine/cache": "~1.6",
- "doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": "~2.4",
- "doctrine/doctrine-bundle": "~1.4",
- "doctrine/orm": "~2.4,>=2.4.5",
- "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
- "monolog/monolog": "~1.11",
- "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
- "phpdocumentor/reflection-docblock": "^3.0",
- "predis/predis": "~1.0",
- "symfony/phpunit-bridge": "~3.2",
- "symfony/polyfill-apcu": "~1.1",
- "symfony/security-acl": "~2.8|~3.0"
- },
- "time": "2016-12-13T13:20:15+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
- "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
- "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
- "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
- "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
- "Symfony\\Bundle\\": "src/Symfony/Bundle/",
- "Symfony\\Component\\": "src/Symfony/Component/"
- },
- "classmap": [
- "src/Symfony/Component/Intl/Resources/stubs"
- ],
- "exclude-from-classmap": [
- "**/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "The Symfony PHP framework",
- "homepage": "https://symfony.com",
- "keywords": [
- "framework"
- ]
- },
{
"name": "symfony/polyfill-intl-icu",
"version": "v1.3.0",
@@ -842,74 +565,6 @@
"string"
]
},
- {
- "name": "doctrine/collections",
- "version": "v1.3.0",
- "version_normalized": "1.3.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/collections.git",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "time": "2015-04-14T22:21:58+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "array",
- "collections",
- "iterator"
- ]
- },
{
"name": "doctrine/cache",
"version": "v1.6.1",
@@ -982,81 +637,6 @@
"caching"
]
},
- {
- "name": "doctrine/common",
- "version": "v2.6.2",
- "version_normalized": "2.6.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/common.git",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
- "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
- "shasum": ""
- },
- "require": {
- "doctrine/annotations": "1.*",
- "doctrine/cache": "1.*",
- "doctrine/collections": "1.*",
- "doctrine/inflector": "1.*",
- "doctrine/lexer": "1.*",
- "php": "~5.5|~7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.8|~5.0"
- },
- "time": "2016-11-30T16:50:46+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Doctrine\\Common\\": "lib/Doctrine/Common"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Common Library for Doctrine projects",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "collections",
- "eventmanager",
- "persistence",
- "spl"
- ]
- },
{
"name": "jdorn/sql-formatter",
"version": "v1.2.17",
@@ -1200,45 +780,41 @@
]
},
{
- "name": "doctrine/dbal",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
+ "name": "doctrine/instantiator",
+ "version": "1.0.5",
+ "version_normalized": "1.0.5.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/dbal.git",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9"
+ "url": "https://github.com/doctrine/instantiator.git",
+ "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
- "reference": "9f8c05cd5225a320d56d4bfdb4772f10d045a0c9",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
"shasum": ""
},
"require": {
- "doctrine/common": ">=2.4,<2.7-dev",
- "php": ">=5.3.2"
+ "php": ">=5.3,<8.0-DEV"
},
"require-dev": {
- "phpunit/phpunit": "4.*",
- "symfony/console": "2.*||^3.0"
- },
- "suggest": {
- "symfony/console": "For helpful console commands such as SQL execution and import of files."
+ "athletic/athletic": "~0.1.8",
+ "ext-pdo": "*",
+ "ext-phar": "*",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~2.0"
},
- "time": "2016-09-09T19:13:33+00:00",
- "bin": [
- "bin/doctrine-dbal"
- ],
+ "time": "2015-06-14T21:17:01+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Doctrine\\DBAL\\": "lib/"
+ "psr-4": {
+ "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1247,81 +823,53 @@
],
"authors": [
{
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com",
+ "homepage": "http://ocramius.github.com/"
}
],
- "description": "Database Abstraction Layer",
- "homepage": "http://www.doctrine-project.org",
+ "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+ "homepage": "https://github.com/doctrine/instantiator",
"keywords": [
- "database",
- "dbal",
- "persistence",
- "queryobject"
+ "constructor",
+ "instantiate"
]
},
{
- "name": "doctrine/doctrine-bundle",
- "version": "1.6.4",
- "version_normalized": "1.6.4.0",
+ "name": "incenteev/composer-parameter-handler",
+ "version": "v2.1.2",
+ "version_normalized": "2.1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7"
+ "url": "https://github.com/Incenteev/ParameterHandler.git",
+ "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/dd40b0a7fb16658cda9def9786992b8df8a49be7",
- "reference": "dd40b0a7fb16658cda9def9786992b8df8a49be7",
+ "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
+ "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
"shasum": ""
},
"require": {
- "doctrine/dbal": "~2.3",
- "doctrine/doctrine-cache-bundle": "~1.0",
- "jdorn/sql-formatter": "~1.1",
- "php": ">=5.3.2",
- "symfony/console": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/doctrine-bridge": "~2.2|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
+ "php": ">=5.3.3",
+ "symfony/yaml": "~2.3|~3.0"
},
"require-dev": {
- "doctrine/orm": "~2.3",
- "phpunit/phpunit": "~4",
- "satooshi/php-coveralls": "~0.6.1",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/property-info": "~2.8|~3.0",
- "symfony/validator": "~2.2|~3.0",
- "symfony/yaml": "~2.2|~3.0",
- "twig/twig": "~1.10"
- },
- "suggest": {
- "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
- "symfony/web-profiler-bundle": "To use the data collector."
+ "composer/composer": "1.0.*@dev",
+ "phpspec/prophecy-phpunit": "~1.0",
+ "symfony/filesystem": "~2.2"
},
- "time": "2016-08-10T15:35:22+00:00",
- "type": "symfony-bundle",
+ "time": "2015-11-10T17:04:01+00:00",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "2.1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Doctrine\\Bundle\\DoctrineBundle\\": ""
+ "Incenteev\\ParameterHandler\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1330,67 +878,48 @@
],
"authors": [
{
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Doctrine Project",
- "homepage": "http://www.doctrine-project.org/"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Christophe Coevoet",
+ "email": "stof@notk.org"
}
],
- "description": "Symfony DoctrineBundle",
- "homepage": "http://www.doctrine-project.org",
+ "description": "Composer script handling your ignored parameter file",
+ "homepage": "https://github.com/Incenteev/ParameterHandler",
"keywords": [
- "database",
- "dbal",
- "orm",
- "persistence"
+ "parameters management"
]
},
{
- "name": "doctrine/instantiator",
- "version": "1.0.5",
- "version_normalized": "1.0.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+ "name": "sensiolabs/security-checker",
+ "version": "v4.0.0",
+ "version_normalized": "4.0.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sensiolabs/security-checker.git",
+ "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
+ "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
"shasum": ""
},
"require": {
- "php": ">=5.3,<8.0-DEV"
- },
- "require-dev": {
- "athletic/athletic": "~0.1.8",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
+ "symfony/console": "~2.7|~3.0"
},
- "time": "2015-06-14T21:17:01+00:00",
+ "time": "2016-09-23T18:09:57+00:00",
+ "bin": [
+ "security-checker"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "4.0-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+ "psr-0": {
+ "SensioLabs\\Security": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1399,65 +928,71 @@
],
"authors": [
{
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
+ "name": "Fabien Potencier",
+ "email": "fabien.potencier@gmail.com"
}
],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://github.com/doctrine/instantiator",
- "keywords": [
- "constructor",
- "instantiate"
- ]
+ "description": "A security checker for your composer.lock"
},
{
- "name": "doctrine/orm",
- "version": "v2.5.5",
- "version_normalized": "2.5.5.0",
+ "name": "monolog/monolog",
+ "version": "1.22.0",
+ "version_normalized": "1.22.0.0",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/doctrine2.git",
- "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45"
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
- "reference": "73e4be7c7b3ba26f96b781a40b33feba4dfa6d45",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
+ "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
"shasum": ""
},
"require": {
- "doctrine/cache": "~1.4",
- "doctrine/collections": "~1.2",
- "doctrine/common": ">=2.5-dev,<2.7-dev",
- "doctrine/dbal": ">=2.5-dev,<2.6-dev",
- "doctrine/instantiator": "~1.0.1",
- "ext-pdo": "*",
- "php": ">=5.4",
- "symfony/console": "~2.5|~3.0"
+ "php": ">=5.3.0",
+ "psr/log": "~1.0"
+ },
+ "provide": {
+ "psr/log-implementation": "1.0.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0",
- "symfony/yaml": "~2.3|~3.0"
+ "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "php-amqplib/php-amqplib": "~2.4",
+ "php-console/php-console": "^3.1.3",
+ "phpunit/phpunit": "~4.5",
+ "phpunit/phpunit-mock-objects": "2.3.0",
+ "ruflin/elastica": ">=0.90 <3.0",
+ "sentry/sentry": "^0.13",
+ "swiftmailer/swiftmailer": "~5.3"
},
"suggest": {
- "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
+ "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+ "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+ "ext-mongo": "Allow sending log messages to a MongoDB server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+ "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+ "php-console/php-console": "Allow sending log messages to Google Chrome",
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
},
- "time": "2016-09-10T18:51:13+00:00",
- "bin": [
- "bin/doctrine",
- "bin/doctrine.php"
- ],
+ "time": "2016-11-26T00:15:39+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Doctrine\\ORM\\": "lib/"
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1466,65 +1001,49 @@
],
"authors": [
{
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
}
],
- "description": "Object-Relational-Mapper for PHP",
- "homepage": "http://www.doctrine-project.org",
+ "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+ "homepage": "http://github.com/Seldaek/monolog",
"keywords": [
- "database",
- "orm"
+ "log",
+ "logging",
+ "psr-3"
]
},
{
- "name": "incenteev/composer-parameter-handler",
- "version": "v2.1.2",
- "version_normalized": "2.1.2.0",
+ "name": "symfony/polyfill-apcu",
+ "version": "v1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
- "url": "https://github.com/Incenteev/ParameterHandler.git",
- "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc"
+ "url": "https://github.com/symfony/polyfill-apcu.git",
+ "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
- "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
+ "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
+ "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "symfony/yaml": "~2.3|~3.0"
- },
- "require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpspec/prophecy-phpunit": "~1.0",
- "symfony/filesystem": "~2.2"
+ "php": ">=5.3.3"
},
- "time": "2015-11-10T17:04:01+00:00",
+ "time": "2016-11-14T01:06:16+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "1.3-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Incenteev\\ParameterHandler\\": ""
- }
+ "files": [
+ "bootstrap.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1532,49 +1051,65 @@
],
"authors": [
{
- "name": "Christophe Coevoet",
- "email": "stof@notk.org"
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "Composer script handling your ignored parameter file",
- "homepage": "https://github.com/Incenteev/ParameterHandler",
+ "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
+ "homepage": "https://symfony.com",
"keywords": [
- "parameters management"
+ "apcu",
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
]
},
{
- "name": "sensiolabs/security-checker",
- "version": "v4.0.0",
- "version_normalized": "4.0.0.0",
+ "name": "sensio/generator-bundle",
+ "version": "v3.1.2",
+ "version_normalized": "3.1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/sensiolabs/security-checker.git",
- "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c"
+ "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
+ "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
- "reference": "116027b57b568ed61b7b1c80eeb4f6ee9e8c599c",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e",
+ "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e",
"shasum": ""
},
"require": {
- "symfony/console": "~2.7|~3.0"
+ "symfony/console": "~2.7|~3.0",
+ "symfony/framework-bundle": "~2.7|~3.0",
+ "symfony/process": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "twig/twig": "^1.28.2|^2.0"
},
- "time": "2016-09-23T18:09:57+00:00",
- "bin": [
- "security-checker"
- ],
- "type": "library",
+ "require-dev": {
+ "doctrine/orm": "~2.4",
+ "symfony/doctrine-bridge": "~2.7|~3.0"
+ },
+ "time": "2016-12-05T16:01:19+00:00",
+ "type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "3.1.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "SensioLabs\\Security": ""
- }
+ "psr-4": {
+ "Sensio\\Bundle\\GeneratorBundle\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1583,112 +1118,199 @@
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien.potencier@gmail.com"
+ "email": "fabien@symfony.com"
}
],
- "description": "A security checker for your composer.lock"
+ "description": "This bundle generates code for you"
},
{
- "name": "sensio/distribution-bundle",
- "version": "v5.0.15",
- "version_normalized": "5.0.15.0",
+ "name": "twig/twig",
+ "version": "v2.1.0",
+ "version_normalized": "2.1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85"
+ "url": "https://github.com/twigphp/Twig.git",
+ "reference": "9062992538bc5855a683c6737257bfa18d25a4b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/d294b0665cf09c799e9c1993d5c776a5bf55cb85",
- "reference": "d294b0665cf09c799e9c1993d5c776a5bf55cb85",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/9062992538bc5855a683c6737257bfa18d25a4b8",
+ "reference": "9062992538bc5855a683c6737257bfa18d25a4b8",
"shasum": ""
},
"require": {
- "php": ">=5.3.9",
- "sensiolabs/security-checker": "~3.0|~4.0",
- "symfony/class-loader": "~2.3|~3.0",
- "symfony/config": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/filesystem": "~2.3|~3.0",
- "symfony/http-kernel": "~2.3|~3.0",
- "symfony/process": "~2.3|~3.0"
+ "php": "^7.0",
+ "symfony/polyfill-mbstring": "~1.0"
},
- "time": "2016-12-06T07:29:27+00:00",
- "type": "symfony-bundle",
+ "require-dev": {
+ "symfony/debug": "~2.7",
+ "symfony/phpunit-bridge": "~3.2"
+ },
+ "time": "2017-01-11T19:39:01+00:00",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0.x-dev"
+ "dev-master": "2.1-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-4": {
- "Sensio\\Bundle\\DistributionBundle\\": ""
+ "psr-0": {
+ "Twig_": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
"name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Base bundle for Symfony Distributions",
- "keywords": [
- "configuration",
- "distribution"
- ]
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Armin Ronacher",
+ "email": "armin.ronacher@active-4.com",
+ "role": "Project Founder"
+ },
+ {
+ "name": "Twig Team",
+ "homepage": "http://twig.sensiolabs.org/contributors",
+ "role": "Contributors"
+ }
+ ],
+ "description": "Twig, the flexible, fast, and secure template language for PHP",
+ "homepage": "http://twig.sensiolabs.org",
+ "keywords": [
+ "templating"
+ ]
},
{
- "name": "sensio/framework-extra-bundle",
- "version": "v3.0.16",
- "version_normalized": "3.0.16.0",
+ "name": "symfony/symfony",
+ "version": "v3.2.3",
+ "version_normalized": "3.2.3.0",
"source": {
"type": "git",
- "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546"
+ "url": "https://github.com/symfony/symfony.git",
+ "reference": "6306409b3836ed2936c7b0454f00711d0128748c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/507a15f56fa7699f6cc8c2c7de4080b19ce22546",
- "reference": "507a15f56fa7699f6cc8c2c7de4080b19ce22546",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/6306409b3836ed2936c7b0454f00711d0128748c",
+ "reference": "6306409b3836ed2936c7b0454f00711d0128748c",
"shasum": ""
},
"require": {
- "doctrine/common": "~2.2",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
+ "doctrine/common": "~2.4",
+ "php": ">=5.5.9",
+ "psr/cache": "~1.0",
+ "psr/log": "~1.0",
+ "symfony/polyfill-intl-icu": "~1.0",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php56": "~1.0",
+ "symfony/polyfill-php70": "~1.0",
+ "symfony/polyfill-util": "~1.0",
+ "twig/twig": "~1.28|~2.0"
},
- "require-dev": {
- "symfony/browser-kit": "~2.3|~3.0",
- "symfony/dom-crawler": "~2.3|~3.0",
- "symfony/expression-language": "~2.4|~3.0",
- "symfony/finder": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/security-bundle": "~2.4|~3.0",
- "symfony/twig-bundle": "~2.3|~3.0",
- "twig/twig": "~1.11|~2.0"
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "<3.0",
+ "phpdocumentor/type-resolver": "<0.2.0"
},
- "suggest": {
- "symfony/expression-language": "",
- "symfony/psr-http-message-bridge": "To use the PSR-7 converters",
- "symfony/security-bundle": ""
+ "provide": {
+ "psr/cache-implementation": "1.0"
},
- "time": "2016-03-25T17:08:27+00:00",
- "type": "symfony-bundle",
+ "replace": {
+ "symfony/asset": "self.version",
+ "symfony/browser-kit": "self.version",
+ "symfony/cache": "self.version",
+ "symfony/class-loader": "self.version",
+ "symfony/config": "self.version",
+ "symfony/console": "self.version",
+ "symfony/css-selector": "self.version",
+ "symfony/debug": "self.version",
+ "symfony/debug-bundle": "self.version",
+ "symfony/dependency-injection": "self.version",
+ "symfony/doctrine-bridge": "self.version",
+ "symfony/dom-crawler": "self.version",
+ "symfony/event-dispatcher": "self.version",
+ "symfony/expression-language": "self.version",
+ "symfony/filesystem": "self.version",
+ "symfony/finder": "self.version",
+ "symfony/form": "self.version",
+ "symfony/framework-bundle": "self.version",
+ "symfony/http-foundation": "self.version",
+ "symfony/http-kernel": "self.version",
+ "symfony/inflector": "self.version",
+ "symfony/intl": "self.version",
+ "symfony/ldap": "self.version",
+ "symfony/monolog-bridge": "self.version",
+ "symfony/options-resolver": "self.version",
+ "symfony/process": "self.version",
+ "symfony/property-access": "self.version",
+ "symfony/property-info": "self.version",
+ "symfony/proxy-manager-bridge": "self.version",
+ "symfony/routing": "self.version",
+ "symfony/security": "self.version",
+ "symfony/security-bundle": "self.version",
+ "symfony/security-core": "self.version",
+ "symfony/security-csrf": "self.version",
+ "symfony/security-guard": "self.version",
+ "symfony/security-http": "self.version",
+ "symfony/serializer": "self.version",
+ "symfony/stopwatch": "self.version",
+ "symfony/templating": "self.version",
+ "symfony/translation": "self.version",
+ "symfony/twig-bridge": "self.version",
+ "symfony/twig-bundle": "self.version",
+ "symfony/validator": "self.version",
+ "symfony/var-dumper": "self.version",
+ "symfony/web-profiler-bundle": "self.version",
+ "symfony/workflow": "self.version",
+ "symfony/yaml": "self.version"
+ },
+ "require-dev": {
+ "cache/integration-tests": "dev-master",
+ "doctrine/cache": "~1.6",
+ "doctrine/data-fixtures": "1.0.*",
+ "doctrine/dbal": "~2.4",
+ "doctrine/doctrine-bundle": "~1.4",
+ "doctrine/orm": "~2.4,>=2.4.5",
+ "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
+ "monolog/monolog": "~1.11",
+ "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
+ "phpdocumentor/reflection-docblock": "^3.0",
+ "predis/predis": "~1.0",
+ "sensio/framework-extra-bundle": "^3.0.2",
+ "symfony/phpunit-bridge": "~3.2",
+ "symfony/polyfill-apcu": "~1.1",
+ "symfony/security-acl": "~2.8|~3.0"
+ },
+ "time": "2017-02-06T13:15:43+00:00",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "3.2-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Sensio\\Bundle\\FrameworkExtraBundle\\": ""
- }
+ "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
+ "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
+ "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
+ "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
+ "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
+ "Symfony\\Bundle\\": "src/Symfony/Bundle/",
+ "Symfony\\Component\\": "src/Symfony/Component/"
+ },
+ "classmap": [
+ "src/Symfony/Component/Intl/Resources/stubs"
+ ],
+ "exclude-from-classmap": [
+ "**/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1698,73 +1320,121 @@
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
- "description": "This bundle provides a way to configure your controllers with annotations",
+ "description": "The Symfony PHP framework",
+ "homepage": "https://symfony.com",
"keywords": [
- "annotations",
- "controllers"
+ "framework"
]
},
{
- "name": "monolog/monolog",
- "version": "1.22.0",
- "version_normalized": "1.22.0.0",
+ "name": "doctrine/collections",
+ "version": "v1.4.0",
+ "version_normalized": "1.4.0.0",
"source": {
"type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+ "url": "https://github.com/doctrine/collections.git",
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+ "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+ "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
"shasum": ""
},
"require": {
- "php": ">=5.3.0",
- "psr/log": "~1.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "aws/aws-sdk-php": "^2.4.9 || ^3.0",
- "doctrine/couchdb": "~1.0@dev",
- "graylog2/gelf-php": "~1.0",
- "jakub-onderka/php-parallel-lint": "0.9",
- "php-amqplib/php-amqplib": "~2.4",
- "php-console/php-console": "^3.1.3",
- "phpunit/phpunit": "~4.5",
- "phpunit/phpunit-mock-objects": "2.3.0",
- "ruflin/elastica": ">=0.90 <3.0",
- "sentry/sentry": "^0.13",
- "swiftmailer/swiftmailer": "~5.3"
+ "doctrine/coding-standard": "~0.1@dev",
+ "phpunit/phpunit": "^5.7"
},
- "suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-mongo": "Allow sending log messages to a MongoDB server",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
- "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
- "php-console/php-console": "Allow sending log messages to Google Chrome",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "sentry/sentry": "Allow sending log messages to a Sentry server"
+ "time": "2017-01-03T10:49:41+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ }
},
- "time": "2016-11-26T00:15:39+00:00",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Doctrine\\Common\\Collections\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
+ }
+ ],
+ "description": "Collections Abstraction library",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "array",
+ "collections",
+ "iterator"
+ ]
+ },
+ {
+ "name": "doctrine/annotations",
+ "version": "v1.3.1",
+ "version_normalized": "1.3.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/annotations.git",
+ "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
+ "reference": "bd4461328621bde0ae6b1b2675fbc6aca4ceb558",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/lexer": "1.*",
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "doctrine/cache": "1.*",
+ "phpunit/phpunit": "^5.6.1"
+ },
+ "time": "2016-12-30T15:59:45+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "1.4.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Monolog\\": "src/Monolog"
+ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1773,58 +1443,71 @@
],
"authors": [
{
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "http://github.com/Seldaek/monolog",
+ "description": "Docblock Annotations Parser",
+ "homepage": "http://www.doctrine-project.org",
"keywords": [
- "log",
- "logging",
- "psr-3"
+ "annotations",
+ "docblock",
+ "parser"
]
},
{
- "name": "symfony/monolog-bundle",
- "version": "3.0.1",
- "version_normalized": "3.0.1.0",
+ "name": "doctrine/common",
+ "version": "v2.7.2",
+ "version_normalized": "2.7.2.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/monolog-bundle.git",
- "reference": "5f2d2d62530cd66be361216107869a3b061045db"
+ "url": "https://github.com/doctrine/common.git",
+ "reference": "930297026c8009a567ac051fd545bf6124150347"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/5f2d2d62530cd66be361216107869a3b061045db",
- "reference": "5f2d2d62530cd66be361216107869a3b061045db",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
+ "reference": "930297026c8009a567ac051fd545bf6124150347",
"shasum": ""
},
"require": {
- "monolog/monolog": "~1.18",
- "php": ">=5.3.2",
- "symfony/config": "~2.7|~3.0",
- "symfony/dependency-injection": "~2.7|~3.0",
- "symfony/http-kernel": "~2.7|~3.0",
- "symfony/monolog-bridge": "~2.7|~3.0"
+ "doctrine/annotations": "1.*",
+ "doctrine/cache": "1.*",
+ "doctrine/collections": "1.*",
+ "doctrine/inflector": "1.*",
+ "doctrine/lexer": "1.*",
+ "php": "~5.6|~7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8",
- "symfony/console": "~2.3|~3.0",
- "symfony/yaml": "~2.3|~3.0"
+ "phpunit/phpunit": "^5.4.6"
},
- "time": "2016-11-15T15:54:07+00:00",
- "type": "symfony-bundle",
+ "time": "2017-01-13T14:02:13+00:00",
+ "type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "2.7.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Symfony\\Bundle\\MonologBundle\\": ""
+ "Doctrine\\Common\\": "lib/Doctrine/Common"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1833,51 +1516,77 @@
],
"authors": [
{
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
},
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
- "description": "Symfony MonologBundle",
- "homepage": "http://symfony.com",
+ "description": "Common Library for Doctrine projects",
+ "homepage": "http://www.doctrine-project.org",
"keywords": [
- "log",
- "logging"
+ "annotations",
+ "collections",
+ "eventmanager",
+ "persistence",
+ "spl"
]
},
{
- "name": "symfony/polyfill-apcu",
- "version": "v1.3.0",
- "version_normalized": "1.3.0.0",
+ "name": "doctrine/dbal",
+ "version": "v2.5.12",
+ "version_normalized": "2.5.12.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-apcu.git",
- "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
+ "url": "https://github.com/doctrine/dbal.git",
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
- "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/7b9e911f9d8b30d43b96853dab26898c710d8f44",
+ "reference": "7b9e911f9d8b30d43b96853dab26898c710d8f44",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "doctrine/common": ">=2.4,<2.8-dev",
+ "php": ">=5.3.2"
},
- "time": "2016-11-14T01:06:16+00:00",
+ "require-dev": {
+ "phpunit/phpunit": "4.*",
+ "symfony/console": "2.*||^3.0"
+ },
+ "suggest": {
+ "symfony/console": "For helpful console commands such as SQL execution and import of files."
+ },
+ "time": "2017-02-08T12:53:47+00:00",
+ "bin": [
+ "bin/doctrine-dbal"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "2.5.x-dev"
}
},
"installation-source": "dist",
"autoload": {
- "files": [
- "bootstrap.php"
- ]
+ "psr-0": {
+ "Doctrine\\DBAL\\": "lib/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1885,46 +1594,137 @@
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ }
+ ],
+ "description": "Database Abstraction Layer",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "database",
+ "dbal",
+ "persistence",
+ "queryobject"
+ ]
+ },
+ {
+ "name": "doctrine/doctrine-bundle",
+ "version": "1.6.7",
+ "version_normalized": "1.6.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/DoctrineBundle.git",
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
+ "reference": "a01d99bc6c9a6c8a8ace0012690099dd957ce9b9",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/dbal": "~2.3",
+ "doctrine/doctrine-cache-bundle": "~1.0",
+ "jdorn/sql-formatter": "~1.1",
+ "php": ">=5.5.9",
+ "symfony/console": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
+ "symfony/doctrine-bridge": "~2.7|~3.0",
+ "symfony/framework-bundle": "~2.7|~3.0"
+ },
+ "require-dev": {
+ "doctrine/orm": "~2.3",
+ "phpunit/phpunit": "~4",
+ "satooshi/php-coveralls": "^1.0",
+ "symfony/phpunit-bridge": "~2.7|~3.0",
+ "symfony/property-info": "~2.8|~3.0",
+ "symfony/validator": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "twig/twig": "~1.10|~2.0"
+ },
+ "suggest": {
+ "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
+ "symfony/web-profiler-bundle": "To use the data collector."
+ },
+ "time": "2017-01-16T12:01:26+00:00",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.6.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Bundle\\DoctrineBundle\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Doctrine Project",
+ "homepage": "http://www.doctrine-project.org/"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
- "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
- "homepage": "https://symfony.com",
+ "description": "Symfony DoctrineBundle",
+ "homepage": "http://www.doctrine-project.org",
"keywords": [
- "apcu",
- "compatibility",
- "polyfill",
- "portable",
- "shim"
+ "database",
+ "dbal",
+ "orm",
+ "persistence"
]
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.4.4",
- "version_normalized": "5.4.4.0",
+ "version": "v5.4.6",
+ "version_normalized": "5.4.6.0",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756"
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756",
- "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
+ "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
- "time": "2016-11-24T01:01:23+00:00",
+ "time": "2017-02-13T07:52:53+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1960,17 +1760,17 @@
},
{
"name": "symfony/swiftmailer-bundle",
- "version": "v2.4.0",
- "version_normalized": "2.4.0.0",
+ "version": "v2.4.2",
+ "version_normalized": "2.4.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
- "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069"
+ "reference": "ad751095576ce0c12a284e30e3fff80c91f27225"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069",
- "reference": "d7b7bd6bb6e9b32ebc5f9778f94d4b4e4af5d069",
+ "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/ad751095576ce0c12a284e30e3fff80c91f27225",
+ "reference": "ad751095576ce0c12a284e30e3fff80c91f27225",
"shasum": ""
},
"require": {
@@ -1989,7 +1789,7 @@
"suggest": {
"psr/log": "Allows logging"
},
- "time": "2016-10-27T17:59:30+00:00",
+ "time": "2016-12-20T04:44:33+00:00",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@@ -2020,46 +1820,104 @@
"homepage": "http://symfony.com"
},
{
- "name": "sensio/generator-bundle",
- "version": "v3.1.2",
- "version_normalized": "3.1.2.0",
+ "name": "symfony/monolog-bundle",
+ "version": "v3.0.3",
+ "version_normalized": "3.0.3.0",
"source": {
"type": "git",
- "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e"
+ "url": "https://github.com/symfony/monolog-bundle.git",
+ "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/ec278c0bd530edf155c4a00900577b5cb80f559e",
- "reference": "ec278c0bd530edf155c4a00900577b5cb80f559e",
+ "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/ebce76a39a65495a66c34eb1574cc4b9e35a4e64",
+ "reference": "ebce76a39a65495a66c34eb1574cc4b9e35a4e64",
"shasum": ""
},
"require": {
- "symfony/console": "~2.7|~3.0",
- "symfony/framework-bundle": "~2.7|~3.0",
- "symfony/process": "~2.7|~3.0",
- "symfony/yaml": "~2.7|~3.0",
- "twig/twig": "^1.28.2|^2.0"
+ "monolog/monolog": "~1.22",
+ "php": ">=5.3.2",
+ "symfony/config": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
+ "symfony/http-kernel": "~2.7|~3.0",
+ "symfony/monolog-bridge": "~2.7|~3.0"
},
"require-dev": {
- "doctrine/orm": "~2.4",
- "symfony/doctrine-bridge": "~2.7|~3.0"
+ "phpunit/phpunit": "^4.8",
+ "symfony/console": "~2.3|~3.0",
+ "symfony/yaml": "~2.3|~3.0"
},
- "time": "2016-12-05T16:01:19+00:00",
+ "time": "2017-01-10T20:01:51+00:00",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "3.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Sensio\\Bundle\\GeneratorBundle\\": ""
+ "Symfony\\Bundle\\MonologBundle\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
},
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "Symfony MonologBundle",
+ "homepage": "http://symfony.com",
+ "keywords": [
+ "log",
+ "logging"
+ ]
+ },
+ {
+ "name": "sensio/distribution-bundle",
+ "version": "v5.0.18",
+ "version_normalized": "5.0.18.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
+ "reference": "17846680901003d26d823c2e3ac9228702837916"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/17846680901003d26d823c2e3ac9228702837916",
+ "reference": "17846680901003d26d823c2e3ac9228702837916",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.9",
+ "sensiolabs/security-checker": "~3.0|~4.0",
+ "symfony/class-loader": "~2.3|~3.0",
+ "symfony/config": "~2.3|~3.0",
+ "symfony/dependency-injection": "~2.3|~3.0",
+ "symfony/filesystem": "~2.3|~3.0",
+ "symfony/http-kernel": "~2.3|~3.0",
+ "symfony/process": "~2.3|~3.0"
+ },
+ "time": "2017-01-10T14:58:45+00:00",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Sensio\\Bundle\\DistributionBundle\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2071,30 +1929,105 @@
"email": "fabien@symfony.com"
}
],
- "description": "This bundle generates code for you"
+ "description": "Base bundle for Symfony Distributions",
+ "keywords": [
+ "configuration",
+ "distribution"
+ ]
+ },
+ {
+ "name": "sensio/framework-extra-bundle",
+ "version": "v3.0.21",
+ "version_normalized": "3.0.21.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
+ "reference": "ed86f6fb1753e76b39ff8b87f527045ca6b97169"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/ed86f6fb1753e76b39ff8b87f527045ca6b97169",
+ "reference": "ed86f6fb1753e76b39ff8b87f527045ca6b97169",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/common": "~2.2",
+ "symfony/dependency-injection": "~2.3|~3.0",
+ "symfony/framework-bundle": "~2.3|~3.0"
+ },
+ "require-dev": {
+ "symfony/asset": "~2.7|~3.0",
+ "symfony/browser-kit": "~2.3|~3.0",
+ "symfony/dom-crawler": "~2.3|~3.0",
+ "symfony/expression-language": "~2.4|~3.0",
+ "symfony/finder": "~2.3|~3.0",
+ "symfony/phpunit-bridge": "~3.2",
+ "symfony/psr-http-message-bridge": "^0.3",
+ "symfony/security-bundle": "~2.4|~3.0",
+ "symfony/templating": "~2.3|~3.0",
+ "symfony/translation": "~2.3|~3.0",
+ "symfony/twig-bundle": "~2.3|~3.0",
+ "symfony/yaml": "~2.3|~3.0",
+ "twig/twig": "~1.11|~2.0",
+ "zendframework/zend-diactoros": "^1.3"
+ },
+ "suggest": {
+ "symfony/expression-language": "",
+ "symfony/psr-http-message-bridge": "To use the PSR-7 converters",
+ "symfony/security-bundle": ""
+ },
+ "time": "2017-02-02T15:31:23+00:00",
+ "type": "symfony-bundle",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Sensio\\Bundle\\FrameworkExtraBundle\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ }
+ ],
+ "description": "This bundle provides a way to configure your controllers with annotations",
+ "keywords": [
+ "annotations",
+ "controllers"
+ ]
},
{
"name": "symfony/phpunit-bridge",
- "version": "v3.2.1",
- "version_normalized": "3.2.1.0",
+ "version": "v3.2.3",
+ "version_normalized": "3.2.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "65e64a4f99cbaeae718573c3347fbe800f3f6661"
+ "reference": "996374975357b569ea319ec1c98c5ca0f7dda610"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/65e64a4f99cbaeae718573c3347fbe800f3f6661",
- "reference": "65e64a4f99cbaeae718573c3347fbe800f3f6661",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/996374975357b569ea319ec1c98c5ca0f7dda610",
+ "reference": "996374975357b569ea319ec1c98c5ca0f7dda610",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"suggest": {
+ "ext-zip": "Zip support is required when using bin/simple-phpunit",
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
},
- "time": "2016-12-12T13:31:08+00:00",
+ "time": "2017-01-21T17:06:35+00:00",
"bin": [
"bin/simple-phpunit"
],
@@ -2132,5 +2065,124 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com"
+ },
+ {
+ "name": "doctrine/orm",
+ "version": "v2.5.6",
+ "version_normalized": "2.5.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/doctrine2.git",
+ "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b",
+ "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/cache": "~1.4",
+ "doctrine/collections": "~1.2",
+ "doctrine/common": ">=2.5-dev,<2.8-dev",
+ "doctrine/dbal": ">=2.5-dev,<2.6-dev",
+ "doctrine/instantiator": "~1.0.1",
+ "ext-pdo": "*",
+ "php": ">=5.4",
+ "symfony/console": "~2.5|~3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0",
+ "symfony/yaml": "~2.3|~3.0"
+ },
+ "suggest": {
+ "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
+ },
+ "time": "2016-12-18T15:42:34+00:00",
+ "bin": [
+ "bin/doctrine",
+ "bin/doctrine.php"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Doctrine\\ORM\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ }
+ ],
+ "description": "Object-Relational-Mapper for PHP",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "database",
+ "orm"
+ ]
+ },
+ {
+ "name": "Wantlet",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/jhartikainen/doctrine2-spatial.git",
+ "reference": "1c1d55dee7939729620f061c7f8aca3747a0c6c7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/jhartikainen/doctrine2-spatial/zipball/1c1d55dee7939729620f061c7f8aca3747a0c6c7",
+ "reference": "1c1d55dee7939729620f061c7f8aca3747a0c6c7",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/orm": "~2.2,>=2.2.3",
+ "php": ">=5.3.3"
+ },
+ "time": "2014-08-17T09:01:34+00:00",
+ "type": "doctrine-orm",
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "Wantlet\\ORM": ""
+ }
+ },
+ "license": [
+ "MIT"
+ ],
+ "description": "Some spatial data related classes developed for Doctrine 2",
+ "keywords": [
+ "doctrine",
+ "mysql",
+ "spatial"
+ ],
+ "support": {
+ "source": "https://github.com/jhartikainen/doctrine2-spatial/tree/master",
+ "issues": "https://github.com/jhartikainen/doctrine2-spatial/issues"
+ }
}
]
diff --git a/vendor/doctrine/annotations/README.md b/vendor/doctrine/annotations/README.md
index ebb30e0b..e9571deb 100644
--- a/vendor/doctrine/annotations/README.md
+++ b/vendor/doctrine/annotations/README.md
@@ -1,19 +1,9 @@
# Doctrine Annotations
-[](https://travis-ci.org/doctrine/annotations)
+[](https://travis-ci.org/doctrine/annotations)
Docblock Annotations Parser library (extracted from [Doctrine Common](https://github.com/doctrine/common)).
## Changelog
-### v1.2.0
-
- * HHVM support
- * Allowing dangling comma in annotations
- * Excluded annotations are no longer autoloaded
- * Importing namespaces also in traits
- * Added support for `::class` 5.5-style constant, works also in 5.3 and 5.4
-
-### v1.1
-
- * Add Exception when ZendOptimizer+ or Opcache is configured to drop comments
+See [CHANGELOG.md](CHANGELOG.md)
diff --git a/vendor/doctrine/annotations/composer.json b/vendor/doctrine/annotations/composer.json
index 1c65f6cd..6ef048dd 100644
--- a/vendor/doctrine/annotations/composer.json
+++ b/vendor/doctrine/annotations/composer.json
@@ -13,19 +13,19 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
- "php": ">=5.3.2",
+ "php": "^5.6 || ^7.0",
"doctrine/lexer": "1.*"
},
"require-dev": {
"doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^5.6.1"
},
"autoload": {
- "psr-0": { "Doctrine\\Common\\Annotations\\": "lib/" }
+ "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" }
},
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.4.x-dev"
}
}
}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
index 4ebd1fb4..658e82f5 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
@@ -102,6 +102,15 @@ class AnnotationReader implements Reader
'startuml' => true, 'enduml' => true,
);
+ /**
+ * A list with annotations that are not causing exceptions when not resolved to an annotation class.
+ *
+ * The names are case sensitive.
+ *
+ * @var array
+ */
+ private static $globalIgnoredNamespaces = array();
+
/**
* Add a new annotation to the globally ignored annotation names with regard to exception handling.
*
@@ -112,6 +121,16 @@ class AnnotationReader implements Reader
self::$globalIgnoredNames[$name] = true;
}
+ /**
+ * Add a new annotation to the globally ignored annotation namespaces with regard to exception handling.
+ *
+ * @param string $namespace
+ */
+ static public function addGlobalIgnoredNamespace($namespace)
+ {
+ self::$globalIgnoredNamespaces[$namespace] = true;
+ }
+
/**
* Annotations parser.
*
@@ -151,8 +170,10 @@ class AnnotationReader implements Reader
* Constructor.
*
* Initializes a new AnnotationReader.
+ *
+ * @param DocParser $parser
*/
- public function __construct()
+ public function __construct(DocParser $parser = null)
{
if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.save_comments') === "0" || ini_get('opcache.save_comments') === "0")) {
throw AnnotationException::optimizerPlusSaveComments();
@@ -174,7 +195,8 @@ class AnnotationReader implements Reader
AnnotationRegistry::registerFile(__DIR__ . '/Annotation/IgnoreAnnotation.php');
- $this->parser = new DocParser;
+ $this->parser = $parser ?: new DocParser();
+
$this->preParser = new DocParser;
$this->preParser->setImports(self::$globalImports);
@@ -191,6 +213,7 @@ class AnnotationReader implements Reader
$this->parser->setTarget(Target::TARGET_CLASS);
$this->parser->setImports($this->getClassImports($class));
$this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
+ $this->parser->setIgnoredAnnotationNamespaces(self::$globalIgnoredNamespaces);
return $this->parser->parse($class->getDocComment(), 'class ' . $class->getName());
}
@@ -222,6 +245,7 @@ class AnnotationReader implements Reader
$this->parser->setTarget(Target::TARGET_PROPERTY);
$this->parser->setImports($this->getPropertyImports($property));
$this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
+ $this->parser->setIgnoredAnnotationNamespaces(self::$globalIgnoredNamespaces);
return $this->parser->parse($property->getDocComment(), $context);
}
@@ -253,6 +277,7 @@ class AnnotationReader implements Reader
$this->parser->setTarget(Target::TARGET_METHOD);
$this->parser->setImports($this->getMethodImports($method));
$this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
+ $this->parser->setIgnoredAnnotationNamespaces(self::$globalIgnoredNamespaces);
return $this->parser->parse($method->getDocComment(), $context);
}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
index e6dc5932..751c1b1b 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
@@ -20,6 +20,7 @@
namespace Doctrine\Common\Annotations;
use Doctrine\Common\Cache\Cache;
+use ReflectionClass;
/**
* A cache aware annotation reader.
@@ -29,11 +30,6 @@ use Doctrine\Common\Cache\Cache;
*/
final class CachedReader implements Reader
{
- /**
- * @var string
- */
- private static $CACHE_SALT = '@[Annot]';
-
/**
* @var Reader
*/
@@ -71,7 +67,7 @@ final class CachedReader implements Reader
/**
* {@inheritDoc}
*/
- public function getClassAnnotations(\ReflectionClass $class)
+ public function getClassAnnotations(ReflectionClass $class)
{
$cacheKey = $class->getName();
@@ -90,7 +86,7 @@ final class CachedReader implements Reader
/**
* {@inheritDoc}
*/
- public function getClassAnnotation(\ReflectionClass $class, $annotationName)
+ public function getClassAnnotation(ReflectionClass $class, $annotationName)
{
foreach ($this->getClassAnnotations($class) as $annot) {
if ($annot instanceof $annotationName) {
@@ -182,14 +178,13 @@ final class CachedReader implements Reader
/**
* Fetches a value from the cache.
*
- * @param string $rawCacheKey The cache key.
- * @param \ReflectionClass $class The related class.
+ * @param string $cacheKey The cache key.
+ * @param ReflectionClass $class The related class.
*
* @return mixed The cached value or false when the value is not in cache.
*/
- private function fetchFromCache($rawCacheKey, \ReflectionClass $class)
+ private function fetchFromCache($cacheKey, ReflectionClass $class)
{
- $cacheKey = $rawCacheKey . self::$CACHE_SALT;
if (($data = $this->cache->fetch($cacheKey)) !== false) {
if (!$this->debug || $this->isCacheFresh($cacheKey, $class)) {
return $data;
@@ -202,14 +197,13 @@ final class CachedReader implements Reader
/**
* Saves a value to the cache.
*
- * @param string $rawCacheKey The cache key.
- * @param mixed $value The value.
+ * @param string $cacheKey The cache key.
+ * @param mixed $value The value.
*
* @return void
*/
- private function saveToCache($rawCacheKey, $value)
+ private function saveToCache($cacheKey, $value)
{
- $cacheKey = $rawCacheKey . self::$CACHE_SALT;
$this->cache->save($cacheKey, $value);
if ($this->debug) {
$this->cache->save('[C]'.$cacheKey, time());
@@ -220,16 +214,49 @@ final class CachedReader implements Reader
* Checks if the cache is fresh.
*
* @param string $cacheKey
- * @param \ReflectionClass $class
+ * @param ReflectionClass $class
*
* @return boolean
*/
- private function isCacheFresh($cacheKey, \ReflectionClass $class)
+ private function isCacheFresh($cacheKey, ReflectionClass $class)
{
- if (false === $filename = $class->getFilename()) {
+ if (null === $lastModification = $this->getLastModification($class)) {
return true;
}
- return $this->cache->fetch('[C]'.$cacheKey) >= filemtime($filename);
+ return $this->cache->fetch('[C]'.$cacheKey) >= $lastModification;
+ }
+
+ /**
+ * Returns the time the class was last modified, testing traits and parents
+ *
+ * @param ReflectionClass $class
+ * @return int
+ */
+ private function getLastModification(ReflectionClass $class)
+ {
+ $filename = $class->getFileName();
+ $parent = $class->getParentClass();
+
+ return max(array_merge(
+ [$filename ? filemtime($filename) : 0],
+ array_map([$this, 'getTraitLastModificationTime'], $class->getTraits()),
+ array_map([$this, 'getLastModification'], $class->getInterfaces()),
+ $parent ? [$this->getLastModification($parent)] : []
+ ));
+ }
+
+ /**
+ * @param ReflectionClass $reflectionTrait
+ * @return int
+ */
+ private function getTraitLastModificationTime(ReflectionClass $reflectionTrait)
+ {
+ $fileName = $reflectionTrait->getFileName();
+
+ return max(array_merge(
+ [$fileName ? filemtime($fileName) : 0],
+ array_map([$this, 'getTraitLastModificationTime'], $reflectionTrait->getTraits())
+ ));
}
}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
index db668460..f8329ca1 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
@@ -115,10 +115,18 @@ final class DocParser
* The names must be the raw names as used in the class, not the fully qualified
* class names.
*
- * @var array
+ * @var bool[] indexed by annotation name
*/
private $ignoredAnnotationNames = array();
+ /**
+ * A list with annotations in namespaced format
+ * that are not causing exceptions when not resolved to an annotation class.
+ *
+ * @var bool[] indexed by namespace name
+ */
+ private $ignoredAnnotationNamespaces = array();
+
/**
* @var string
*/
@@ -242,7 +250,7 @@ final class DocParser
* The names are supposed to be the raw names as used in the class, not the
* fully qualified class names.
*
- * @param array $names
+ * @param bool[] $names indexed by annotation name
*
* @return void
*/
@@ -251,6 +259,18 @@ final class DocParser
$this->ignoredAnnotationNames = $names;
}
+ /**
+ * Sets the annotation namespaces that are ignored during the parsing process.
+ *
+ * @param bool[] $ignoredAnnotationNamespaces indexed by annotation namespace name
+ *
+ * @return void
+ */
+ public function setIgnoredAnnotationNamespaces($ignoredAnnotationNamespaces)
+ {
+ $this->ignoredAnnotationNamespaces = $ignoredAnnotationNamespaces;
+ }
+
/**
* Sets ignore on not-imported annotations.
*
@@ -347,8 +367,10 @@ final class DocParser
// search for first valid annotation
while (($pos = strpos($input, '@', $pos)) !== false) {
- // if the @ is preceded by a space or * it is valid
- if ($pos === 0 || $input[$pos - 1] === ' ' || $input[$pos - 1] === '*') {
+ $preceding = substr($input, $pos - 1, 1);
+
+ // if the @ is preceded by a space, a tab or * it is valid
+ if ($pos === 0 || $preceding === ' ' || $preceding === '*' || $preceding === "\t") {
return $pos;
}
@@ -696,7 +718,7 @@ final class DocParser
}
if ( ! $found) {
- if ($this->ignoreNotImportedAnnotations || isset($this->ignoredAnnotationNames[$name])) {
+ if ($this->isIgnoredAnnotation($name)) {
return false;
}
@@ -720,7 +742,7 @@ final class DocParser
// verify that the class is really meant to be an annotation and not just any ordinary class
if (self::$annotationMetadata[$name]['is_annotation'] === false) {
- if (isset($this->ignoredAnnotationNames[$originalName])) {
+ if ($this->ignoreNotImportedAnnotations || isset($this->ignoredAnnotationNames[$originalName])) {
return false;
}
@@ -1135,4 +1157,28 @@ final class DocParser
return array(null, $this->Value());
}
+
+ /**
+ * Checks whether the given $name matches any ignored annotation name or namespace
+ *
+ * @param string $name
+ *
+ * @return bool
+ */
+ private function isIgnoredAnnotation($name)
+ {
+ if ($this->ignoreNotImportedAnnotations || isset($this->ignoredAnnotationNames[$name])) {
+ return true;
+ }
+
+ foreach (array_keys($this->ignoredAnnotationNamespaces) as $ignoredAnnotationNamespace) {
+ $ignoredAnnotationNamespace = rtrim($ignoredAnnotationNamespace, '\\') . '\\';
+
+ if (0 === stripos(rtrim($name, '\\') . '\\', $ignoredAnnotationNamespace)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
index 9bdcccec..bf1b7133 100644
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
+++ b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
@@ -99,6 +99,8 @@ class TokenParser
*/
public function parseUseStatement()
{
+
+ $groupRoot = '';
$class = '';
$alias = '';
$statements = array();
@@ -114,13 +116,18 @@ class TokenParser
$explicitAlias = true;
$alias = '';
} else if ($token === ',') {
- $statements[strtolower($alias)] = $class;
+ $statements[strtolower($alias)] = $groupRoot . $class;
$class = '';
$alias = '';
$explicitAlias = false;
} else if ($token === ';') {
- $statements[strtolower($alias)] = $class;
+ $statements[strtolower($alias)] = $groupRoot . $class;
break;
+ } else if ($token === '{' ) {
+ $groupRoot = $class;
+ $class = '';
+ } else if ($token === '}' ) {
+ continue;
} else {
break;
}
diff --git a/vendor/doctrine/collections/.travis.yml b/vendor/doctrine/collections/.travis.yml
deleted file mode 100644
index 60f47927..00000000
--- a/vendor/doctrine/collections/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-php:
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - 7.0
- - hhvm
- - hhvm-nightly
-
-matrix:
- fast_finish: true
- allow_failures:
- - php: 7.0
-
-before_script:
- - composer --prefer-source install
-
-script:
- - phpunit
diff --git a/vendor/doctrine/collections/README.md b/vendor/doctrine/collections/README.md
index 161cab63..81e06d0c 100644
--- a/vendor/doctrine/collections/README.md
+++ b/vendor/doctrine/collections/README.md
@@ -1,6 +1,8 @@
# Doctrine Collections
[](https://travis-ci.org/doctrine/collections)
+[](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
+[](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
Collections Abstraction library
diff --git a/vendor/doctrine/collections/composer.json b/vendor/doctrine/collections/composer.json
index 155cac48..385fa93d 100644
--- a/vendor/doctrine/collections/composer.json
+++ b/vendor/doctrine/collections/composer.json
@@ -13,17 +13,23 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
- "php": ">=5.3.2"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "^5.7",
+ "doctrine/coding-standard": "~0.1@dev"
},
"autoload": {
"psr-0": { "Doctrine\\Common\\Collections\\": "lib/" }
},
+ "autoload-dev": {
+ "psr-4": {
+ "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+ }
+ },
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
}
}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
index bce57512..7ddd068e 100644
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
+++ b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
@@ -26,6 +26,11 @@ use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
/**
* An ArrayCollection is a Collection implementation that wraps a regular PHP array.
*
+ * Warning: Using (un-)serialize() on a collection is not a supported use-case
+ * and may break when we change the internals in the future. If you need to
+ * serialize a collection use {@link toArray()} and reconstruct the collection
+ * manually.
+ *
* @since 2.0
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Jonathan Wage <jonwage@gmail.com>
@@ -50,6 +55,21 @@ class ArrayCollection implements Collection, Selectable
$this->elements = $elements;
}
+ /**
+ * Creates a new instance from the specified elements.
+ *
+ * This method is provided for derived classes to specify how a new
+ * instance should be created when constructor semantics have changed.
+ *
+ * @param array $elements Elements.
+ *
+ * @return static
+ */
+ protected function createFrom(array $elements)
+ {
+ return new static($elements);
+ }
+
/**
* {@inheritDoc}
*/
@@ -254,9 +274,9 @@ class ArrayCollection implements Collection, Selectable
/**
* {@inheritDoc}
*/
- public function add($value)
+ public function add($element)
{
- $this->elements[] = $value;
+ $this->elements[] = $element;
return true;
}
@@ -284,7 +304,7 @@ class ArrayCollection implements Collection, Selectable
*/
public function map(Closure $func)
{
- return new static(array_map($func, $this->elements));
+ return $this->createFrom(array_map($func, $this->elements));
}
/**
@@ -292,7 +312,7 @@ class ArrayCollection implements Collection, Selectable
*/
public function filter(Closure $p)
{
- return new static(array_filter($this->elements, $p));
+ return $this->createFrom(array_filter($this->elements, $p));
}
/**
@@ -324,7 +344,7 @@ class ArrayCollection implements Collection, Selectable
}
}
- return array(new static($matches), new static($noMatches));
+ return array($this->createFrom($matches), $this->createFrom($noMatches));
}
/**
@@ -368,8 +388,9 @@ class ArrayCollection implements Collection, Selectable
}
if ($orderings = $criteria->getOrderings()) {
+ $next = null;
foreach (array_reverse($orderings) as $field => $ordering) {
- $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1);
+ $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1, $next);
}
uasort($filtered, $next);
@@ -382,6 +403,6 @@ class ArrayCollection implements Collection, Selectable
$filtered = array_slice($filtered, (int)$offset, $length);
}
- return new static($filtered);
+ return $this->createFrom($filtered);
}
}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
index 994085f9..1239aa39 100644
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
+++ b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
@@ -69,6 +69,24 @@ class ClosureExpressionVisitor extends ExpressionVisitor
return $object[$field];
}
+ if (isset($object->$field)) {
+ return $object->$field;
+ }
+
+ // camelcase field name to support different variable naming conventions
+ $ccField = preg_replace_callback('/_(.?)/', function($matches) { return strtoupper($matches[1]); }, $field);
+
+ foreach ($accessors as $accessor) {
+ $accessor .= $ccField;
+
+
+ if ( ! method_exists($object, $accessor)) {
+ continue;
+ }
+
+ return $object->$accessor();
+ }
+
return $object->$field;
}
@@ -155,6 +173,26 @@ class ClosureExpressionVisitor extends ExpressionVisitor
return false !== strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
};
+ case Comparison::MEMBER_OF:
+ return function ($object) use ($field, $value) {
+ $fieldValues = ClosureExpressionVisitor::getObjectFieldValue($object, $field);
+ if (!is_array($fieldValues)) {
+ $fieldValues = iterator_to_array($fieldValues);
+ }
+ return in_array($value, $fieldValues);
+ };
+
+ case Comparison::STARTS_WITH:
+ return function ($object) use ($field, $value) {
+ return 0 === strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
+ };
+
+ case Comparison::ENDS_WITH:
+ return function ($object) use ($field, $value) {
+ return $value === substr(ClosureExpressionVisitor::getObjectFieldValue($object, $field), -strlen($value));
+ };
+
+
default:
throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
index d54ecf25..ec9a9f48 100644
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
+++ b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
@@ -27,17 +27,19 @@ namespace Doctrine\Common\Collections\Expr;
*/
class Comparison implements Expression
{
- const EQ = '=';
- const NEQ = '<>';
- const LT = '<';
- const LTE = '<=';
- const GT = '>';
- const GTE = '>=';
- const IS = '='; // no difference with EQ
- const IN = 'IN';
- const NIN = 'NIN';
- const CONTAINS = 'CONTAINS';
-
+ const EQ = '=';
+ const NEQ = '<>';
+ const LT = '<';
+ const LTE = '<=';
+ const GT = '>';
+ const GTE = '>=';
+ const IS = '='; // no difference with EQ
+ const IN = 'IN';
+ const NIN = 'NIN';
+ const CONTAINS = 'CONTAINS';
+ const MEMBER_OF = 'MEMBER_OF';
+ const STARTS_WITH = 'STARTS_WITH';
+ const ENDS_WITH = 'ENDS_WITH';
/**
* @var string
*/
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
index 6539e3c7..1a44a7ba 100644
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
+++ b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
@@ -27,7 +27,7 @@ use Doctrine\Common\Collections\Expr\Value;
* Builder for Expressions in the {@link Selectable} interface.
*
* Important Notice for interoperable code: You have to use scalar
- * values only for comparisons, otherwise the behavior of the comparision
+ * values only for comparisons, otherwise the behavior of the comparison
* may be different between implementations (Array vs ORM vs ODM).
*
* @author Benjamin Eberlei <kontakt@beberlei.de>
@@ -163,4 +163,38 @@ class ExpressionBuilder
{
return new Comparison($field, Comparison::CONTAINS, new Value($value));
}
+
+ /**
+ * @param string $field
+ * @param mixed $value
+ *
+ * @return Comparison
+ */
+ public function memberOf ($field, $value)
+ {
+ return new Comparison($field, Comparison::MEMBER_OF, new Value($value));
+ }
+
+ /**
+ * @param string $field
+ * @param mixed $value
+ *
+ * @return Comparison
+ */
+ public function startsWith($field, $value)
+ {
+ return new Comparison($field, Comparison::STARTS_WITH, new Value($value));
+ }
+
+ /**
+ * @param string $field
+ * @param mixed $value
+ *
+ * @return Comparison
+ */
+ public function endsWith($field, $value)
+ {
+ return new Comparison($field, Comparison::ENDS_WITH, new Value($value));
+ }
+
}
diff --git a/vendor/doctrine/collections/phpunit.xml.dist b/vendor/doctrine/collections/phpunit.xml.dist
deleted file mode 100644
index 36968e99..00000000
--- a/vendor/doctrine/collections/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
- backupStaticAttributes="false"
- colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false"
- syntaxCheck="false"
- bootstrap="./tests/Doctrine/Tests/TestInit.php"
->
- <testsuites>
- <testsuite name="Doctrine Collections Test Suite">
- <directory>./tests/Doctrine/</directory>
- </testsuite>
- </testsuites>
-
- <filter>
- <whitelist>
- <directory>./lib/Doctrine/</directory>
- </whitelist>
- </filter>
-
- <groups>
- <exclude>
- <group>performance</group>
- </exclude>
- </groups>
-</phpunit>
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/AbstractLazyCollectionTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/AbstractLazyCollectionTest.php
deleted file mode 100644
index 4de82cc2..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/AbstractLazyCollectionTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Tests\LazyArrayCollection;
-
-class AbstractLazyCollectionTest extends \PHPUnit_Framework_TestCase
-{
- public function testLazyCollection()
- {
- $collection = new LazyArrayCollection();
-
- $this->assertFalse($collection->isInitialized());
- $this->assertCount(3, $collection);
-
- $collection->add('bar');
- $this->assertTrue($collection->isInitialized());
- $this->assertCount(4, $collection);
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php
deleted file mode 100644
index 1b8a906f..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ArrayCollectionTest.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Criteria;
-
-/**
- * Tests for {@see \Doctrine\Common\Collections\ArrayCollection}
- *
- * @covers \Doctrine\Common\Collections\ArrayCollection
- */
-class ArrayCollectionTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @dataProvider provideDifferentElements
- */
- public function testToArray($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame($elements, $collection->toArray());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testFirst($elements)
- {
- $collection = new ArrayCollection($elements);
- $this->assertSame(reset($elements), $collection->first());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testLast($elements)
- {
- $collection = new ArrayCollection($elements);
- $this->assertSame(end($elements), $collection->last());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testKey($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(key($elements), $collection->key());
-
- next($elements);
- $collection->next();
-
- $this->assertSame(key($elements), $collection->key());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testNext($elements)
- {
- $collection = new ArrayCollection($elements);
-
- while (true) {
- $collectionNext = $collection->next();
- $arrayNext = next($elements);
-
- if(!$collectionNext || !$arrayNext) {
- break;
- }
-
- $this->assertSame($arrayNext, $collectionNext, "Returned value of ArrayCollection::next() and next() not match");
- $this->assertSame(key($elements), $collection->key(), "Keys not match");
- $this->assertSame(current($elements), $collection->current(), "Current values not match");
- }
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testCurrent($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(current($elements), $collection->current());
-
- next($elements);
- $collection->next();
-
- $this->assertSame(current($elements), $collection->current());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testGetKeys($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(array_keys($elements), $collection->getKeys());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testGetValues($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(array_values($elements), $collection->getValues());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testCount($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(count($elements), $collection->count());
- }
-
- /**
- * @dataProvider provideDifferentElements
- */
- public function testIterator($elements)
- {
- $collection = new ArrayCollection($elements);
-
- $iterations = 0;
- foreach($collection->getIterator() as $key => $item) {
- $this->assertSame($elements[$key], $item, "Item {$key} not match");
- $iterations++;
- }
-
- $this->assertEquals(count($elements), $iterations, "Number of iterations not match");
- }
-
- /**
- * @return array
- */
- public function provideDifferentElements()
- {
- return array(
- 'indexed' => array(array(1, 2, 3, 4, 5)),
- 'associative' => array(array('A' => 'a', 'B' => 'b', 'C' => 'c')),
- 'mixed' => array(array('A' => 'a', 1, 'B' => 'b', 2, 3)),
- );
- }
-
- public function testRemove()
- {
- $elements = array(1, 'A' => 'a', 2, 'B' => 'b', 3);
- $collection = new ArrayCollection($elements);
-
- $this->assertEquals(1, $collection->remove(0));
- unset($elements[0]);
-
- $this->assertEquals(null, $collection->remove('non-existent'));
- unset($elements['non-existent']);
-
- $this->assertEquals(2, $collection->remove(1));
- unset($elements[1]);
-
- $this->assertEquals('a', $collection->remove('A'));
- unset($elements['A']);
-
- $this->assertEquals($elements, $collection->toArray());
- }
-
- public function testRemoveElement()
- {
- $elements = array(1, 'A' => 'a', 2, 'B' => 'b', 3, 'A2' => 'a', 'B2' => 'b');
- $collection = new ArrayCollection($elements);
-
- $this->assertTrue($collection->removeElement(1));
- unset($elements[0]);
-
- $this->assertFalse($collection->removeElement('non-existent'));
-
- $this->assertTrue($collection->removeElement('a'));
- unset($elements['A']);
-
- $this->assertTrue($collection->removeElement('a'));
- unset($elements['A2']);
-
- $this->assertEquals($elements, $collection->toArray());
- }
-
- public function testContainsKey()
- {
- $elements = array(1, 'A' => 'a', 2, 'null' => null, 3, 'A2' => 'a', 'B2' => 'b');
- $collection = new ArrayCollection($elements);
-
- $this->assertTrue($collection->containsKey(0), "Contains index 0");
- $this->assertTrue($collection->containsKey('A'), "Contains key \"A\"");
- $this->assertTrue($collection->containsKey('null'), "Contains key \"null\", with value null");
- $this->assertFalse($collection->containsKey('non-existent'), "Doesn't contain key");
- }
-
- public function testEmpty()
- {
- $collection = new ArrayCollection();
- $this->assertTrue($collection->isEmpty(), "Empty collection");
-
- $collection->add(1);
- $this->assertFalse($collection->isEmpty(), "Not empty collection");
- }
-
- public function testContains()
- {
- $elements = array(1, 'A' => 'a', 2, 'null' => null, 3, 'A2' => 'a', 'zero' => 0);
- $collection = new ArrayCollection($elements);
-
- $this->assertTrue($collection->contains(0), "Contains Zero");
- $this->assertTrue($collection->contains('a'), "Contains \"a\"");
- $this->assertTrue($collection->contains(null), "Contains Null");
- $this->assertFalse($collection->contains('non-existent'), "Doesn't contain an element");
- }
-
- public function testExists()
- {
- $elements = array(1, 'A' => 'a', 2, 'null' => null, 3, 'A2' => 'a', 'zero' => 0);
- $collection = new ArrayCollection($elements);
-
- $this->assertTrue($collection->exists(function($key, $element) {
- return $key == 'A' && $element == 'a';
- }), "Element exists");
-
- $this->assertFalse($collection->exists(function($key, $element) {
- return $key == 'non-existent' && $element == 'non-existent';
- }), "Element not exists");
- }
-
- public function testIndexOf()
- {
- $elements = array(1, 'A' => 'a', 2, 'null' => null, 3, 'A2' => 'a', 'zero' => 0);
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(array_search(2, $elements, true), $collection->indexOf(2), 'Index of 2');
- $this->assertSame(array_search(null, $elements, true), $collection->indexOf(null), 'Index of null');
- $this->assertSame(array_search('non-existent', $elements, true), $collection->indexOf('non-existent'), 'Index of non existent');
- }
-
- public function testGet()
- {
- $elements = array(1, 'A' => 'a', 2, 'null' => null, 3, 'A2' => 'a', 'zero' => 0);
- $collection = new ArrayCollection($elements);
-
- $this->assertSame(2, $collection->get(1), 'Get element by index');
- $this->assertSame('a', $collection->get('A'), 'Get element by name');
- $this->assertSame(null, $collection->get('non-existent'), 'Get non existent element');
- }
-
- public function testMatchingWithSortingPreservesyKeys()
- {
- $object1 = new \stdClass();
- $object2 = new \stdClass();
-
- $object1->sortField = 2;
- $object2->sortField = 1;
-
- $collection = new ArrayCollection(array(
- 'object1' => $object1,
- 'object2' => $object2,
- ));
-
- $this->assertSame(
- array(
- 'object2' => $object2,
- 'object1' => $object1,
- ),
- $collection
- ->matching(new Criteria(null, array('sortField' => Criteria::ASC)))
- ->toArray()
- );
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php
deleted file mode 100644
index 21c2e3df..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ClosureExpressionVisitorTest.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
-use Doctrine\Common\Collections\ExpressionBuilder;
-
-/**
- * @group DDC-1637
- */
-class ClosureExpressionVisitorTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var ClosureExpressionVisitor
- */
- private $visitor;
-
- /**
- * @var ExpressionBuilder
- */
- private $builder;
-
- protected function setUp()
- {
- $this->visitor = new ClosureExpressionVisitor();
- $this->builder = new ExpressionBuilder();
- }
-
- public function testGetObjectFieldValueIsAccessor()
- {
- $object = new TestObject(1, 2, true);
-
- $this->assertTrue($this->visitor->getObjectFieldValue($object, 'baz'));
- }
-
- public function testGetObjectFieldValueMagicCallMethod()
- {
- $object = new TestObject(1, 2, true, 3);
-
- $this->assertEquals(3, $this->visitor->getObjectFieldValue($object, 'qux'));
- }
-
- public function testWalkEqualsComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->eq("foo", 1));
-
- $this->assertTrue($closure(new TestObject(1)));
- $this->assertFalse($closure(new TestObject(2)));
- }
-
- public function testWalkNotEqualsComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->neq("foo", 1));
-
- $this->assertFalse($closure(new TestObject(1)));
- $this->assertTrue($closure(new TestObject(2)));
- }
-
- public function testWalkLessThanComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->lt("foo", 1));
-
- $this->assertFalse($closure(new TestObject(1)));
- $this->assertTrue($closure(new TestObject(0)));
- }
-
- public function testWalkLessThanEqualsComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->lte("foo", 1));
-
- $this->assertFalse($closure(new TestObject(2)));
- $this->assertTrue($closure(new TestObject(1)));
- $this->assertTrue($closure(new TestObject(0)));
- }
-
- public function testWalkGreaterThanEqualsComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->gte("foo", 1));
-
- $this->assertTrue($closure(new TestObject(2)));
- $this->assertTrue($closure(new TestObject(1)));
- $this->assertFalse($closure(new TestObject(0)));
- }
-
- public function testWalkGreaterThanComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->gt("foo", 1));
-
- $this->assertTrue($closure(new TestObject(2)));
- $this->assertFalse($closure(new TestObject(1)));
- $this->assertFalse($closure(new TestObject(0)));
- }
-
- public function testWalkInComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->in("foo", array(1, 2, 3)));
-
- $this->assertTrue($closure(new TestObject(2)));
- $this->assertTrue($closure(new TestObject(1)));
- $this->assertFalse($closure(new TestObject(0)));
- }
-
- public function testWalkNotInComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->notIn("foo", array(1, 2, 3)));
-
- $this->assertFalse($closure(new TestObject(1)));
- $this->assertFalse($closure(new TestObject(2)));
- $this->assertTrue($closure(new TestObject(0)));
- $this->assertTrue($closure(new TestObject(4)));
- }
-
- public function testWalkContainsComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->contains('foo', 'hello'));
-
- $this->assertTrue($closure(new TestObject('hello world')));
- $this->assertFalse($closure(new TestObject('world')));
- }
-
- public function testWalkAndCompositeExpression()
- {
- $closure = $this->visitor->walkCompositeExpression(
- $this->builder->andX(
- $this->builder->eq("foo", 1),
- $this->builder->eq("bar", 1)
- )
- );
-
- $this->assertTrue($closure(new TestObject(1, 1)));
- $this->assertFalse($closure(new TestObject(1, 0)));
- $this->assertFalse($closure(new TestObject(0, 1)));
- $this->assertFalse($closure(new TestObject(0, 0)));
- }
-
- public function testWalkOrCompositeExpression()
- {
- $closure = $this->visitor->walkCompositeExpression(
- $this->builder->orX(
- $this->builder->eq("foo", 1),
- $this->builder->eq("bar", 1)
- )
- );
-
- $this->assertTrue($closure(new TestObject(1, 1)));
- $this->assertTrue($closure(new TestObject(1, 0)));
- $this->assertTrue($closure(new TestObject(0, 1)));
- $this->assertFalse($closure(new TestObject(0, 0)));
- }
-
- public function testSortByFieldAscending()
- {
- $objects = array(new TestObject("b"), new TestObject("a"), new TestObject("c"));
- $sort = ClosureExpressionVisitor::sortByField("foo");
-
- usort($objects, $sort);
-
- $this->assertEquals("a", $objects[0]->getFoo());
- $this->assertEquals("b", $objects[1]->getFoo());
- $this->assertEquals("c", $objects[2]->getFoo());
- }
-
- public function testSortByFieldDescending()
- {
- $objects = array(new TestObject("b"), new TestObject("a"), new TestObject("c"));
- $sort = ClosureExpressionVisitor::sortByField("foo", -1);
-
- usort($objects, $sort);
-
- $this->assertEquals("c", $objects[0]->getFoo());
- $this->assertEquals("b", $objects[1]->getFoo());
- $this->assertEquals("a", $objects[2]->getFoo());
- }
-
- public function testSortDelegate()
- {
- $objects = array(new TestObject("a", "c"), new TestObject("a", "b"), new TestObject("a", "a"));
- $sort = ClosureExpressionVisitor::sortByField("bar", 1);
- $sort = ClosureExpressionVisitor::sortByField("foo", 1, $sort);
-
- usort($objects, $sort);
-
- $this->assertEquals("a", $objects[0]->getBar());
- $this->assertEquals("b", $objects[1]->getBar());
- $this->assertEquals("c", $objects[2]->getBar());
- }
-
- public function testArrayComparison()
- {
- $closure = $this->visitor->walkComparison($this->builder->eq("foo", 42));
-
- $this->assertTrue($closure(array('foo' => 42)));
- }
-}
-
-class TestObject
-{
- private $foo;
- private $bar;
- private $baz;
- private $qux;
-
- public function __construct($foo = null, $bar = null, $baz = null, $qux = null)
- {
- $this->foo = $foo;
- $this->bar = $bar;
- $this->baz = $baz;
- $this->qux = $qux;
- }
-
- public function __call($name, $arguments)
- {
- if ('getqux' === $name) {
- return $this->qux;
- }
- }
-
- public function getFoo()
- {
- return $this->foo;
- }
-
- public function getBar()
- {
- return $this->bar;
- }
-
- public function isBaz()
- {
- return $this->baz;
- }
-}
-
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CollectionTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CollectionTest.php
deleted file mode 100644
index f3f91ad3..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CollectionTest.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Criteria;
-
-class CollectionTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var Collection
- */
- private $collection;
-
- protected function setUp()
- {
- $this->collection = new ArrayCollection();
- }
-
- public function testIssetAndUnset()
- {
- $this->assertFalse(isset($this->collection[0]));
- $this->collection->add('testing');
- $this->assertTrue(isset($this->collection[0]));
- unset($this->collection[0]);
- $this->assertFalse(isset($this->collection[0]));
- }
-
- public function testToString()
- {
- $this->collection->add('testing');
- $this->assertTrue(is_string((string) $this->collection));
- }
-
- public function testRemovingNonExistentEntryReturnsNull()
- {
- $this->assertEquals(null, $this->collection->remove('testing_does_not_exist'));
- }
-
- public function testExists()
- {
- $this->collection->add("one");
- $this->collection->add("two");
- $exists = $this->collection->exists(function($k, $e) { return $e == "one"; });
- $this->assertTrue($exists);
- $exists = $this->collection->exists(function($k, $e) { return $e == "other"; });
- $this->assertFalse($exists);
- }
-
- public function testMap()
- {
- $this->collection->add(1);
- $this->collection->add(2);
- $res = $this->collection->map(function($e) { return $e * 2; });
- $this->assertEquals(array(2, 4), $res->toArray());
- }
-
- public function testFilter()
- {
- $this->collection->add(1);
- $this->collection->add("foo");
- $this->collection->add(3);
- $res = $this->collection->filter(function($e) { return is_numeric($e); });
- $this->assertEquals(array(0 => 1, 2 => 3), $res->toArray());
- }
-
- public function testFirstAndLast()
- {
- $this->collection->add('one');
- $this->collection->add('two');
-
- $this->assertEquals($this->collection->first(), 'one');
- $this->assertEquals($this->collection->last(), 'two');
- }
-
- public function testArrayAccess()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
-
- $this->assertEquals($this->collection[0], 'one');
- $this->assertEquals($this->collection[1], 'two');
-
- unset($this->collection[0]);
- $this->assertEquals($this->collection->count(), 1);
- }
-
- public function testContainsKey()
- {
- $this->collection[5] = 'five';
- $this->assertTrue($this->collection->containsKey(5));
- }
-
- public function testContains()
- {
- $this->collection[0] = 'test';
- $this->assertTrue($this->collection->contains('test'));
- }
-
- public function testSearch()
- {
- $this->collection[0] = 'test';
- $this->assertEquals(0, $this->collection->indexOf('test'));
- }
-
- public function testGet()
- {
- $this->collection[0] = 'test';
- $this->assertEquals('test', $this->collection->get(0));
- }
-
- public function testGetKeys()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->assertEquals(array(0, 1), $this->collection->getKeys());
- }
-
- public function testGetValues()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->assertEquals(array('one', 'two'), $this->collection->getValues());
- }
-
- public function testCount()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->assertEquals($this->collection->count(), 2);
- $this->assertEquals(count($this->collection), 2);
- }
-
- public function testForAll()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->assertEquals($this->collection->forAll(function($k, $e) { return is_string($e); }), true);
- $this->assertEquals($this->collection->forAll(function($k, $e) { return is_array($e); }), false);
- }
-
- public function testPartition()
- {
- $this->collection[] = true;
- $this->collection[] = false;
- $partition = $this->collection->partition(function($k, $e) { return $e == true; });
- $this->assertEquals($partition[0][0], true);
- $this->assertEquals($partition[1][0], false);
- }
-
- public function testClear()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->collection->clear();
- $this->assertEquals($this->collection->isEmpty(), true);
- }
-
- public function testRemove()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $el = $this->collection->remove(0);
-
- $this->assertEquals('one', $el);
- $this->assertEquals($this->collection->contains('one'), false);
- $this->assertNull($this->collection->remove(0));
- }
-
- public function testRemoveElement()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
-
- $this->assertTrue($this->collection->removeElement('two'));
- $this->assertFalse($this->collection->contains('two'));
- $this->assertFalse($this->collection->removeElement('two'));
- }
-
- public function testSlice()
- {
- $this->collection[] = 'one';
- $this->collection[] = 'two';
- $this->collection[] = 'three';
-
- $slice = $this->collection->slice(0, 1);
- $this->assertInternalType('array', $slice);
- $this->assertEquals(array('one'), $slice);
-
- $slice = $this->collection->slice(1);
- $this->assertEquals(array(1 => 'two', 2 => 'three'), $slice);
-
- $slice = $this->collection->slice(1, 1);
- $this->assertEquals(array(1 => 'two'), $slice);
- }
-
- public function fillMatchingFixture()
- {
- $std1 = new \stdClass();
- $std1->foo = "bar";
- $this->collection[] = $std1;
-
- $std2 = new \stdClass();
- $std2->foo = "baz";
- $this->collection[] = $std2;
- }
-
- /**
- * @group DDC-1637
- */
- public function testMatching()
- {
- $this->fillMatchingFixture();
-
- $col = $this->collection->matching(new Criteria(Criteria::expr()->eq("foo", "bar")));
- $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $col);
- $this->assertNotSame($col, $this->collection);
- $this->assertEquals(1, count($col));
- }
-
- /**
- * @group DDC-1637
- */
- public function testMatchingOrdering()
- {
- $this->fillMatchingFixture();
-
- $col = $this->collection->matching(new Criteria(null, array('foo' => 'DESC')));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $col);
- $this->assertNotSame($col, $this->collection);
- $this->assertEquals(2, count($col));
- $this->assertEquals('baz', $col->first()->foo);
- $this->assertEquals('bar', $col->last()->foo);
- }
-
- /**
- * @group DDC-1637
- */
- public function testMatchingSlice()
- {
- $this->fillMatchingFixture();
-
- $col = $this->collection->matching(new Criteria(null, null, 1, 1));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $col);
- $this->assertNotSame($col, $this->collection);
- $this->assertEquals(1, count($col));
- $this->assertEquals('baz', $col[0]->foo);
- }
-
- public function testCanRemoveNullValuesByKey()
- {
- $this->collection->add(null);
- $this->collection->remove(0);
- $this->assertTrue($this->collection->isEmpty());
- }
-
- public function testCanVerifyExistingKeysWithNullValues()
- {
- $this->collection->set('key', null);
- $this->assertTrue($this->collection->containsKey('key'));
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CriteriaTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CriteriaTest.php
deleted file mode 100644
index 1ab058a9..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/CriteriaTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Collections\Expr\Comparison;
-use Doctrine\Common\Collections\Expr\CompositeExpression;
-
-class CriteriaTest extends \PHPUnit_Framework_TestCase
-{
- public function testCreate()
- {
- $criteria = Criteria::create();
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Criteria', $criteria);
- }
-
- public function testConstructor()
- {
- $expr = new Comparison("field", "=", "value");
- $criteria = new Criteria($expr, array("foo" => "ASC"), 10, 20);
-
- $this->assertSame($expr, $criteria->getWhereExpression());
- $this->assertEquals(array("foo" => "ASC"), $criteria->getOrderings());
- $this->assertEquals(10, $criteria->getFirstResult());
- $this->assertEquals(20, $criteria->getMaxResults());
- }
-
- public function testWhere()
- {
- $expr = new Comparison("field", "=", "value");
- $criteria = new Criteria();
-
- $criteria->where($expr);
-
- $this->assertSame($expr, $criteria->getWhereExpression());
- }
-
- public function testAndWhere()
- {
- $expr = new Comparison("field", "=", "value");
- $criteria = new Criteria();
-
- $criteria->where($expr);
- $expr = $criteria->getWhereExpression();
- $criteria->andWhere($expr);
-
- $where = $criteria->getWhereExpression();
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\CompositeExpression', $where);
-
- $this->assertEquals(CompositeExpression::TYPE_AND, $where->getType());
- $this->assertSame(array($expr, $expr), $where->getExpressionList());
- }
-
- public function testOrWhere()
- {
- $expr = new Comparison("field", "=", "value");
- $criteria = new Criteria();
-
- $criteria->where($expr);
- $expr = $criteria->getWhereExpression();
- $criteria->orWhere($expr);
-
- $where = $criteria->getWhereExpression();
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\CompositeExpression', $where);
-
- $this->assertEquals(CompositeExpression::TYPE_OR, $where->getType());
- $this->assertSame(array($expr, $expr), $where->getExpressionList());
- }
-
- public function testOrderings()
- {
- $criteria = Criteria::create()
- ->orderBy(array("foo" => "ASC"));
-
- $this->assertEquals(array("foo" => "ASC"), $criteria->getOrderings());
- }
-
- public function testExpr()
- {
- $this->assertInstanceOf('Doctrine\Common\Collections\ExpressionBuilder', Criteria::expr());
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php b/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php
deleted file mode 100644
index 5f6b4ce2..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/Common/Collections/ExpressionBuilderTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Collections;
-
-use Doctrine\Common\Collections\ExpressionBuilder;
-use Doctrine\Common\Collections\Expr\Comparison;
-use Doctrine\Common\Collections\Expr\CompositeExpression;
-
-/**
- * @group DDC-1637
- */
-class ExpressionBuilderTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var ExpressionBuilder
- */
- private $builder;
-
- protected function setUp()
- {
- $this->builder = new ExpressionBuilder();
- }
-
- public function testAndX()
- {
- $expr = $this->builder->andX($this->builder->eq("a", "b"));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\CompositeExpression', $expr);
- $this->assertEquals(CompositeExpression::TYPE_AND, $expr->getType());
- }
-
- public function testOrX()
- {
- $expr = $this->builder->orX($this->builder->eq("a", "b"));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\CompositeExpression', $expr);
- $this->assertEquals(CompositeExpression::TYPE_OR, $expr->getType());
- }
-
- public function testInvalidAndXArgument()
- {
- $this->setExpectedException("RuntimeException");
- $this->builder->andX("foo");
- }
-
- public function testEq()
- {
- $expr = $this->builder->eq("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::EQ, $expr->getOperator());
- }
-
- public function testNeq()
- {
- $expr = $this->builder->neq("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::NEQ, $expr->getOperator());
- }
-
- public function testLt()
- {
- $expr = $this->builder->lt("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::LT, $expr->getOperator());
- }
-
- public function testGt()
- {
- $expr = $this->builder->gt("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::GT, $expr->getOperator());
- }
-
- public function testGte()
- {
- $expr = $this->builder->gte("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::GTE, $expr->getOperator());
- }
-
- public function testLte()
- {
- $expr = $this->builder->lte("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::LTE, $expr->getOperator());
- }
-
- public function testIn()
- {
- $expr = $this->builder->in("a", array("b"));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::IN, $expr->getOperator());
- }
-
- public function testNotIn()
- {
- $expr = $this->builder->notIn("a", array("b"));
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::NIN, $expr->getOperator());
- }
-
- public function testIsNull()
- {
- $expr = $this->builder->isNull("a");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::EQ, $expr->getOperator());
- }
-
- public function testContains()
- {
- $expr = $this->builder->contains("a", "b");
-
- $this->assertInstanceOf('Doctrine\Common\Collections\Expr\Comparison', $expr);
- $this->assertEquals(Comparison::CONTAINS, $expr->getOperator());
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/LazyArrayCollection.php b/vendor/doctrine/collections/tests/Doctrine/Tests/LazyArrayCollection.php
deleted file mode 100644
index 56736b83..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/LazyArrayCollection.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-use Doctrine\Common\Collections\AbstractLazyCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-
-/**
- * Simple lazy collection that used an ArrayCollection as backed collection
- */
-class LazyArrayCollection extends AbstractLazyCollection
-{
- /**
- * Do the initialization logic
- *
- * @return void
- */
- protected function doInitialize()
- {
- $this->collection = new ArrayCollection(array('a', 'b', 'c'));
- }
-}
diff --git a/vendor/doctrine/collections/tests/Doctrine/Tests/TestInit.php b/vendor/doctrine/collections/tests/Doctrine/Tests/TestInit.php
deleted file mode 100644
index 973b5fef..00000000
--- a/vendor/doctrine/collections/tests/Doctrine/Tests/TestInit.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- * This file bootstraps the test environment.
- */
-namespace Doctrine\Tests;
-
-error_reporting(E_ALL | E_STRICT);
-
-// register silently failing autoloader
-spl_autoload_register(function($class) {
- if (0 === strpos($class, 'Doctrine\Tests\\')) {
- $path = __DIR__.'/../../'.strtr($class, '\\', '/').'.php';
- if (is_file($path) && is_readable($path)) {
- require_once $path;
-
- return true;
- }
- }
-});
-
-require_once __DIR__ . "/../../../vendor/autoload.php";
diff --git a/vendor/doctrine/common/composer.json b/vendor/doctrine/common/composer.json
index a12495ab..7729b168 100644
--- a/vendor/doctrine/common/composer.json
+++ b/vendor/doctrine/common/composer.json
@@ -13,7 +13,7 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
- "php": "~5.5|~7.0",
+ "php": "~5.6|~7.0",
"doctrine/inflector": "1.*",
"doctrine/cache": "1.*",
"doctrine/collections": "1.*",
@@ -21,7 +21,7 @@
"doctrine/annotations": "1.*"
},
"require-dev": {
- "phpunit/phpunit": "~4.8|~5.0"
+ "phpunit/phpunit": "^5.4.6"
},
"autoload": {
"psr-4": {
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
index dc799d5c..f17b263c 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
@@ -117,6 +117,8 @@ abstract class FileDriver implements MappingDriver
throw MappingException::invalidMappingFile($className, str_replace('\\', '.', $className) . $this->locator->getFileExtension());
}
+ $this->classCache[$className] = $result[$className];
+
return $result[$className];
}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
index f6072191..fd968a3e 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
@@ -34,7 +34,7 @@ interface ObjectRepository
*
* @param mixed $id The identifier.
*
- * @return object The object.
+ * @return object|null The object.
*/
public function find($id);
@@ -68,7 +68,7 @@ interface ObjectRepository
*
* @param array $criteria The criteria.
*
- * @return object The object.
+ * @return object|null The object.
*/
public function findOneBy(array $criteria);
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
index 0aa930b2..fae3348e 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
@@ -49,9 +49,13 @@ class Autoloader
throw InvalidArgumentException::notProxyClass($className, $proxyNamespace);
}
- $className = str_replace('\\', '', substr($className, strlen($proxyNamespace) + 1));
+ // remove proxy namespace from class name
+ $classNameRelativeToProxyNamespace = substr($className, strlen($proxyNamespace));
- return $proxyDir . DIRECTORY_SEPARATOR . $className . '.php';
+ // remove namespace separators from remaining class name
+ $fileName = str_replace('\\', '', $classNameRelativeToProxyNamespace);
+
+ return $proxyDir . DIRECTORY_SEPARATOR . $fileName . '.php';
}
/**
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
index 154b9177..ec980b59 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
@@ -41,15 +41,19 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements P
}
/**
- * @param string $className
- * @param string $methodName
- * @param string $parameterName
- * @param \Exception $previous
+ * @param string $className
+ * @param string $methodName
+ * @param string $parameterName
+ * @param \Exception|null $previous
*
* @return self
*/
- public static function invalidParameterTypeHint($className, $methodName, $parameterName, \Exception $previous)
- {
+ public static function invalidParameterTypeHint(
+ $className,
+ $methodName,
+ $parameterName,
+ \Exception $previous = null
+ ) {
return new self(
sprintf(
'The type hint of parameter "%s" in method "%s" in class "%s" is invalid.',
@@ -61,4 +65,24 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements P
$previous
);
}
+
+ /**
+ * @param $className
+ * @param $methodName
+ * @param \Exception|null $previous
+ *
+ * @return self
+ */
+ public static function invalidReturnTypeHint($className, $methodName, \Exception $previous = null)
+ {
+ return new self(
+ sprintf(
+ 'The return type of method "%s" in class "%s" is invalid.',
+ $methodName,
+ $className
+ ),
+ 0,
+ $previous
+ );
+ }
}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
index 925dcd1b..62f4167f 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
@@ -37,7 +37,7 @@ class ProxyGenerator
* Used to match very simple id methods that don't need
* to be decorated since the identifier is known.
*/
- const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*{\s*return\s*\$this->%s;\s*})i';
+ const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*(?::\s*\??\s*\\\\?[a-z_\x7f-\xff][\w\x7f-\xff]*(?:\\\\[a-z_\x7f-\xff][\w\x7f-\xff]*)*\s*)?{\s*return\s*\$this->%s;\s*})i';
/**
* The namespace that contains all proxy classes.
@@ -787,7 +787,9 @@ EOT;
$cast = in_array($fieldType, ['integer', 'smallint']) ? '(int) ' : '';
$methods .= ' if ($this->__isInitialized__ === false) {' . "\n";
- $methods .= ' return ' . $cast . ' parent::' . $method->getName() . "();\n";
+ $methods .= ' ';
+ $methods .= $this->shouldProxiedMethodReturn($method) ? 'return ' : '';
+ $methods .= $cast . ' parent::' . $method->getName() . "();\n";
$methods .= ' }' . "\n\n";
}
@@ -797,7 +799,9 @@ EOT;
$methods .= "\n \$this->__initializer__ "
. "&& \$this->__initializer__->__invoke(\$this, " . var_export($name, true)
. ", [" . $invokeParamsString . "]);"
- . "\n\n return parent::" . $name . '(' . $callParamsString . ');'
+ . "\n\n "
+ . ($this->shouldProxiedMethodReturn($method) ? 'return ' : '')
+ . "parent::" . $name . '(' . $callParamsString . ');'
. "\n" . ' }' . "\n";
}
@@ -935,8 +939,15 @@ EOT;
*/
private function getParameterType(ClassMetadata $class, \ReflectionMethod $method, \ReflectionParameter $parameter)
{
+ if (method_exists($parameter, 'hasType')) {
+ if ( ! $parameter->hasType()) {
+ return '';
+ }
+
+ return $this->formatType($parameter->getType(), $parameter->getDeclaringFunction(), $parameter);
+ }
- // We need to pick the type hint class too
+ // For PHP 5.x, we need to pick the type hint in the old way (to be removed for PHP 7.0+)
if ($parameter->isArray()) {
return 'array';
}
@@ -945,10 +956,6 @@ EOT;
return 'callable';
}
- if (method_exists($parameter, 'hasType') && $parameter->hasType() && $parameter->getType()->isBuiltin()) {
- return (string) $parameter->getType();
- }
-
try {
$parameterClass = $parameter->getClass();
@@ -1012,26 +1019,75 @@ EOT;
*/
private function getMethodReturnType(\ReflectionMethod $method)
{
- if (! (method_exists($method, 'hasReturnType') && $method->hasReturnType())) {
+ if ( ! method_exists($method, 'hasReturnType') || ! $method->hasReturnType()) {
return '';
}
- $returnType = $method->getReturnType();
+ return ': ' . $this->formatType($method->getReturnType(), $method);
+ }
- if ($returnType->isBuiltin()) {
- return ': ' . $returnType;
+ /**
+ * @param \ReflectionMethod $method
+ *
+ * @return bool
+ */
+ private function shouldProxiedMethodReturn(\ReflectionMethod $method)
+ {
+ if ( ! method_exists($method, 'hasReturnType') || ! $method->hasReturnType()) {
+ return true;
}
- $nameLower = strtolower((string) $returnType);
+ return 'void' !== strtolower($this->formatType($method->getReturnType(), $method));
+ }
+
+ /**
+ * @param \ReflectionType $type
+ * @param \ReflectionMethod $method
+ * @param \ReflectionParameter|null $parameter
+ *
+ * @return string
+ */
+ private function formatType(
+ \ReflectionType $type,
+ \ReflectionMethod $method,
+ \ReflectionParameter $parameter = null
+ ) {
+ $name = method_exists($type, 'getName') ? $type->getName() : (string) $type;
+ $nameLower = strtolower($name);
if ('self' === $nameLower) {
- return ': \\' . $method->getDeclaringClass()->getName();
+ $name = $method->getDeclaringClass()->getName();
}
if ('parent' === $nameLower) {
- return ': \\' . $method->getDeclaringClass()->getParentClass()->getName();
+ $name = $method->getDeclaringClass()->getParentClass()->getName();
+ }
+
+ if ( ! $type->isBuiltin() && ! class_exists($name) && ! interface_exists($name)) {
+ if (null !== $parameter) {
+ throw UnexpectedValueException::invalidParameterTypeHint(
+ $method->getDeclaringClass()->getName(),
+ $method->getName(),
+ $parameter->getName()
+ );
+ }
+
+ throw UnexpectedValueException::invalidReturnTypeHint(
+ $method->getDeclaringClass()->getName(),
+ $method->getName()
+ );
+ }
+
+ if ( ! $type->isBuiltin()) {
+ $name = '\\' . $name;
+ }
+
+ if ($type->allowsNull()
+ && (null === $parameter || ! $parameter->isDefaultValueAvailable() || null !== $parameter->getDefaultValue())
+ ) {
+ $name = '?' . $name;
}
- return ': \\' . (string) $returnType;
+ return $name;
}
}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php b/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
index 7f675328..ae115edd 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
@@ -65,7 +65,7 @@ final class Debug
ini_set('xdebug.var_display_max_depth', $maxDepth);
}
- $var = self::export($var, $maxDepth++);
+ $var = self::export($var, $maxDepth);
ob_start();
var_dump($var);
@@ -77,11 +77,11 @@ final class Debug
$dumpText = ($stripTags ? strip_tags(html_entity_decode($dump)) : $dump);
ini_set('html_errors', $html);
-
+
if ($echo) {
echo $dumpText;
}
-
+
return $dumpText;
}
@@ -100,47 +100,86 @@ final class Debug
$var = $var->toArray();
}
- if ($maxDepth) {
- if (is_array($var)) {
- $return = [];
+ if (! $maxDepth) {
+ return is_object($var) ? get_class($var)
+ : (is_array($var) ? 'Array(' . count($var) . ')' : $var);
+ }
- foreach ($var as $k => $v) {
- $return[$k] = self::export($v, $maxDepth - 1);
- }
- } else if ($isObj) {
- $return = new \stdclass();
- if ($var instanceof \DateTime) {
- $return->__CLASS__ = "DateTime";
- $return->date = $var->format('c');
- $return->timezone = $var->getTimeZone()->getName();
- } else {
- $reflClass = ClassUtils::newReflectionObject($var);
- $return->__CLASS__ = ClassUtils::getClass($var);
-
- if ($var instanceof Proxy) {
- $return->__IS_PROXY__ = true;
- $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
- }
-
- if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
- $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
- }
-
- foreach ($reflClass->getProperties() as $reflProperty) {
- $name = $reflProperty->getName();
-
- $reflProperty->setAccessible(true);
- $return->$name = self::export($reflProperty->getValue($var), $maxDepth - 1);
- }
- }
- } else {
- $return = $var;
+ if (is_array($var)) {
+ $return = [];
+
+ foreach ($var as $k => $v) {
+ $return[$k] = self::export($v, $maxDepth - 1);
}
- } else {
- $return = is_object($var) ? get_class($var)
- : (is_array($var) ? 'Array(' . count($var) . ')' : $var);
+
+ return $return;
}
+ if (! $isObj) {
+ return $var;
+ }
+
+ $return = new \stdclass();
+ if ($var instanceof \DateTimeInterface) {
+ $return->__CLASS__ = get_class($var);
+ $return->date = $var->format('c');
+ $return->timezone = $var->getTimezone()->getName();
+
+ return $return;
+ }
+
+ $return->__CLASS__ = ClassUtils::getClass($var);
+
+ if ($var instanceof Proxy) {
+ $return->__IS_PROXY__ = true;
+ $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
+ }
+
+ if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
+ $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
+ }
+
+ return self::fillReturnWithClassAttributes($var, $return, $maxDepth);
+ }
+
+ /**
+ * Fill the $return variable with class attributes
+ *
+ * @param object $var
+ * @param stdClass $return
+ * @param int $maxDepth
+ *
+ * @return mixed
+ */
+ private static function fillReturnWithClassAttributes($var, \stdClass $return, $maxDepth)
+ {
+ $reflClass = ClassUtils::newReflectionObject($var);
+ $parsedAttributes = array();
+ do {
+ $currentClassName = $reflClass->getName();
+
+ foreach ($reflClass->getProperties() as $reflProperty) {
+ $attributeKey = $reflProperty->isPrivate() ? $currentClassName . '#' : '';
+ $attributeKey .= $reflProperty->getName();
+
+ if (isset($parsedAttributes[$attributeKey])) {
+ continue;
+ }
+
+ $parsedAttributes[$attributeKey] = true;
+
+ $name =
+ $reflProperty->getName()
+ . ($return->__CLASS__ !== $currentClassName || $reflProperty->isPrivate() ? ':' . $currentClassName : '')
+ . ($reflProperty->isPrivate() ? ':private' : '')
+ . ($reflProperty->isProtected() ? ':protected' : '')
+ ;
+
+ $reflProperty->setAccessible(true);
+ $return->$name = self::export($reflProperty->getValue($var), $maxDepth - 1);
+ }
+ } while ($reflClass = $reflClass->getParentClass());
+
return $return;
}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Version.php b/vendor/doctrine/common/lib/Doctrine/Common/Version.php
index 872f169a..eed56555 100644
--- a/vendor/doctrine/common/lib/Doctrine/Common/Version.php
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Version.php
@@ -34,7 +34,7 @@ class Version
/**
* Current Doctrine Version.
*/
- const VERSION = '2.6.2-DEV';
+ const VERSION = '2.7.0-DEV';
/**
* Compares a Doctrine version with the current one.
diff --git a/vendor/doctrine/dbal/composer.json b/vendor/doctrine/dbal/composer.json
index 7b10ef51..acf3405a 100644
--- a/vendor/doctrine/dbal/composer.json
+++ b/vendor/doctrine/dbal/composer.json
@@ -13,7 +13,7 @@
],
"require": {
"php": ">=5.3.2",
- "doctrine/common": ">=2.4,<2.7-dev"
+ "doctrine/common": ">=2.4,<2.8-dev"
},
"require-dev": {
"phpunit/phpunit": "4.*",
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php
index 8612540d..7e33c243 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Connection.php
@@ -580,18 +580,20 @@ class Connection implements DriverConnection
throw InvalidArgumentException::fromEmptyCriteria();
}
- $this->connect();
-
+ $columnList = array();
$criteria = array();
+ $paramValues = array();
- foreach (array_keys($identifier) as $columnName) {
+ foreach ($identifier as $columnName => $value) {
+ $columnList[] = $columnName;
$criteria[] = $columnName . ' = ?';
+ $paramValues[] = $value;
}
return $this->executeUpdate(
'DELETE FROM ' . $tableExpression . ' WHERE ' . implode(' AND ', $criteria),
- array_values($identifier),
- is_string(key($types)) ? $this->extractTypeValues($identifier, $types) : $types
+ $paramValues,
+ is_string(key($types)) ? $this->extractTypeValues($columnList, $types) : $types
);
}
@@ -649,24 +651,31 @@ class Connection implements DriverConnection
*/
public function update($tableExpression, array $data, array $identifier, array $types = array())
{
- $this->connect();
+ $columnList = array();
$set = array();
+ $criteria = array();
+ $paramValues = array();
foreach ($data as $columnName => $value) {
+ $columnList[] = $columnName;
$set[] = $columnName . ' = ?';
+ $paramValues[] = $value;
}
- if (is_string(key($types))) {
- $types = $this->extractTypeValues(array_merge($data, $identifier), $types);
+ foreach ($identifier as $columnName => $value) {
+ $columnList[] = $columnName;
+ $criteria[] = $columnName . ' = ?';
+ $paramValues[] = $value;
}
- $params = array_merge(array_values($data), array_values($identifier));
+ if (is_string(key($types))) {
+ $types = $this->extractTypeValues($columnList, $types);
+ }
$sql = 'UPDATE ' . $tableExpression . ' SET ' . implode(', ', $set)
- . ' WHERE ' . implode(' = ? AND ', array_keys($identifier))
- . ' = ?';
+ . ' WHERE ' . implode(' AND ', $criteria);
- return $this->executeUpdate($sql, $params, $types);
+ return $this->executeUpdate($sql, $paramValues, $types);
}
/**
@@ -688,29 +697,39 @@ class Connection implements DriverConnection
return $this->executeUpdate('INSERT INTO ' . $tableExpression . ' ()' . ' VALUES ()');
}
+ $columnList = array();
+ $paramPlaceholders = array();
+ $paramValues = array();
+
+ foreach ($data as $columnName => $value) {
+ $columnList[] = $columnName;
+ $paramPlaceholders[] = '?';
+ $paramValues[] = $value;
+ }
+
return $this->executeUpdate(
- 'INSERT INTO ' . $tableExpression . ' (' . implode(', ', array_keys($data)) . ')' .
- ' VALUES (' . implode(', ', array_fill(0, count($data), '?')) . ')',
- array_values($data),
- is_string(key($types)) ? $this->extractTypeValues($data, $types) : $types
+ 'INSERT INTO ' . $tableExpression . ' (' . implode(', ', $columnList) . ')' .
+ ' VALUES (' . implode(', ', $paramPlaceholders) . ')',
+ $paramValues,
+ is_string(key($types)) ? $this->extractTypeValues($columnList, $types) : $types
);
}
/**
- * Extract ordered type list from two associate key lists of data and types.
+ * Extract ordered type list from an ordered column list and type map.
*
- * @param array $data
+ * @param array $columnList
* @param array $types
*
* @return array
*/
- private function extractTypeValues(array $data, array $types)
+ private function extractTypeValues(array $columnList, array $types)
{
$typeValues = array();
- foreach ($data as $k => $_) {
- $typeValues[] = isset($types[$k])
- ? $types[$k]
+ foreach ($columnList as $columnIndex => $columnName) {
+ $typeValues[] = isset($types[$columnName])
+ ? $types[$columnName]
: \PDO::PARAM_STR;
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
index b8de9ea9..892db0ae 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php
@@ -48,6 +48,13 @@ class DB2Statement implements \IteratorAggregate, Statement
*/
private $_defaultFetchMode = \PDO::FETCH_BOTH;
+ /**
+ * Indicates whether the statement is in the state when fetching results is possible
+ *
+ * @var bool
+ */
+ private $result = false;
+
/**
* DB2_BINARY, DB2_CHAR, DB2_DOUBLE, or DB2_LONG
*
@@ -104,11 +111,14 @@ class DB2Statement implements \IteratorAggregate, Statement
}
$this->_bindParam = array();
- db2_free_result($this->_stmt);
- $ret = db2_free_stmt($this->_stmt);
- $this->_stmt = false;
- return $ret;
+ if (!db2_free_result($this->_stmt)) {
+ return false;
+ }
+
+ $this->result = false;
+
+ return true;
}
/**
@@ -151,22 +161,24 @@ class DB2Statement implements \IteratorAggregate, Statement
return false;
}
- /*$retval = true;
- if ($params !== null) {
- $retval = @db2_execute($this->_stmt, $params);
- } else {
- $retval = @db2_execute($this->_stmt);
- }*/
if ($params === null) {
ksort($this->_bindParam);
- $params = array_values($this->_bindParam);
+
+ $params = array();
+
+ foreach ($this->_bindParam as $column => $value) {
+ $params[] = $value;
+ }
}
+
$retval = @db2_execute($this->_stmt, $params);
if ($retval === false) {
throw new DB2Exception(db2_stmt_errormsg());
}
+ $this->result = true;
+
return $retval;
}
@@ -197,6 +209,12 @@ class DB2Statement implements \IteratorAggregate, Statement
*/
public function fetch($fetchMode = null)
{
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return false;
+ }
+
$fetchMode = $fetchMode ?: $this->_defaultFetchMode;
switch ($fetchMode) {
case \PDO::FETCH_BOTH:
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
index 7e2bf535..d181949e 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
@@ -80,6 +80,13 @@ class MysqliStatement implements \IteratorAggregate, Statement
*/
protected $_defaultFetchMode = PDO::FETCH_BOTH;
+ /**
+ * Indicates whether the statement is in the state when fetching results is possible
+ *
+ * @var bool
+ */
+ private $result = false;
+
/**
* @param \mysqli $conn
* @param string $prepareString
@@ -168,9 +175,6 @@ class MysqliStatement implements \IteratorAggregate, Statement
if (null === $this->_columnNames) {
$meta = $this->_stmt->result_metadata();
if (false !== $meta) {
- // We have a result.
- $this->_stmt->store_result();
-
$columnNames = array();
foreach ($meta->fetch_fields() as $col) {
$columnNames[] = $col->name;
@@ -178,21 +182,42 @@ class MysqliStatement implements \IteratorAggregate, Statement
$meta->free();
$this->_columnNames = $columnNames;
- $this->_rowBindedValues = array_fill(0, count($columnNames), null);
-
- $refs = array();
- foreach ($this->_rowBindedValues as $key => &$value) {
- $refs[$key] =& $value;
- }
-
- if (!call_user_func_array(array($this->_stmt, 'bind_result'), $refs)) {
- throw new MysqliException($this->_stmt->error, $this->_stmt->sqlstate, $this->_stmt->errno);
- }
} else {
$this->_columnNames = false;
}
}
+ if (false !== $this->_columnNames) {
+ // Store result of every execution which has it. Otherwise it will be impossible
+ // to execute a new statement in case if the previous one has non-fetched rows
+ // @link http://dev.mysql.com/doc/refman/5.7/en/commands-out-of-sync.html
+ $this->_stmt->store_result();
+
+ // Bind row values _after_ storing the result. Otherwise, if mysqli is compiled with libmysql,
+ // it will have to allocate as much memory as it may be needed for the given column type
+ // (e.g. for a LONGBLOB field it's 4 gigabytes)
+ // @link https://bugs.php.net/bug.php?id=51386#1270673122
+ //
+ // Make sure that the values are bound after each execution. Otherwise, if closeCursor() has been
+ // previously called on the statement, the values are unbound making the statement unusable.
+ //
+ // It's also important that row values are bound after _each_ call to store_result(). Otherwise,
+ // if mysqli is compiled with libmysql, subsequently fetched string values will get truncated
+ // to the length of the ones fetched during the previous execution.
+ $this->_rowBindedValues = array_fill(0, count($this->_columnNames), null);
+
+ $refs = array();
+ foreach ($this->_rowBindedValues as $key => &$value) {
+ $refs[$key] =& $value;
+ }
+
+ if (!call_user_func_array(array($this->_stmt, 'bind_result'), $refs)) {
+ throw new MysqliException($this->_stmt->error, $this->_stmt->sqlstate, $this->_stmt->errno);
+ }
+ }
+
+ $this->result = true;
+
return true;
}
@@ -240,6 +265,12 @@ class MysqliStatement implements \IteratorAggregate, Statement
*/
public function fetch($fetchMode = null)
{
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return false;
+ }
+
$values = $this->_fetch();
if (null === $values) {
return false;
@@ -325,6 +356,7 @@ class MysqliStatement implements \IteratorAggregate, Statement
public function closeCursor()
{
$this->_stmt->free_result();
+ $this->result = false;
return true;
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
index 21b06fa1..628b6570 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
@@ -80,6 +80,13 @@ class OCI8Statement implements \IteratorAggregate, Statement
*/
private $boundValues = array();
+ /**
+ * Indicates whether the statement is in the state when fetching results is possible
+ *
+ * @var bool
+ */
+ private $result = false;
+
/**
* Creates a new OCI8Statement that uses the given connection handle and SQL statement.
*
@@ -176,7 +183,16 @@ class OCI8Statement implements \IteratorAggregate, Statement
*/
public function closeCursor()
{
- return oci_free_statement($this->_sth);
+ // not having the result means there's nothing to close
+ if (!$this->result) {
+ return true;
+ }
+
+ oci_cancel($this->_sth);
+
+ $this->result = false;
+
+ return true;
}
/**
@@ -229,6 +245,8 @@ class OCI8Statement implements \IteratorAggregate, Statement
throw OCI8Exception::fromErrorInfo($this->errorInfo());
}
+ $this->result = true;
+
return $ret;
}
@@ -257,6 +275,12 @@ class OCI8Statement implements \IteratorAggregate, Statement
*/
public function fetch($fetchMode = null)
{
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return false;
+ }
+
$fetchMode = $fetchMode ?: $this->_defaultFetchMode;
if ( ! isset(self::$fetchModeMap[$fetchMode])) {
throw new \InvalidArgumentException("Invalid fetch style: " . $fetchMode);
@@ -286,6 +310,12 @@ class OCI8Statement implements \IteratorAggregate, Statement
$fetchStructure = OCI_FETCHSTATEMENT_BY_COLUMN;
}
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return array();
+ }
+
oci_fetch_all($this->_sth, $result, 0, -1,
self::$fetchModeMap[$fetchMode] | OCI_RETURN_NULLS | $fetchStructure | OCI_RETURN_LOBS);
@@ -302,6 +332,12 @@ class OCI8Statement implements \IteratorAggregate, Statement
*/
public function fetchColumn($columnIndex = 0)
{
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return false;
+ }
+
$row = oci_fetch_array($this->_sth, OCI_NUM | OCI_RETURN_NULLS | OCI_RETURN_LOBS);
if (false === $row) {
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
index 4c04bfb3..7b9e9f0a 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
@@ -28,9 +28,33 @@ use Doctrine\DBAL\Driver\PDOConnection;
*/
class Connection extends PDOConnection implements \Doctrine\DBAL\Driver\Connection
{
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct($dsn, $user = null, $password = null, array $options = null)
+ {
+ parent::__construct($dsn, $user, $password, $options);
+ $this->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array(Statement::class, array()));
+ }
+
/**
* @override
*/
+ public function lastInsertId($name = null)
+ {
+ if (null === $name) {
+ return parent::lastInsertId($name);
+ }
+
+ $stmt = $this->prepare('SELECT CONVERT(VARCHAR(MAX), current_value) FROM sys.sequences WHERE name = ?');
+ $stmt->execute(array($name));
+
+ return $stmt->fetchColumn();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public function quote($value, $type=\PDO::PARAM_STR)
{
$val = parent::quote($value, $type);
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
index 7a3b1201..a6d702a2 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php
@@ -131,7 +131,7 @@ class SQLAnywhereStatement implements IteratorAggregate, Statement
*/
public function closeCursor()
{
- if ( ! sasql_stmt_free_result($this->stmt)) {
+ if (!sasql_stmt_reset($this->stmt)) {
throw SQLAnywhereException::fromSQLAnywhereError($this->conn, $this->stmt);
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
index 514ae54f..9a80b68d 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
@@ -130,9 +130,8 @@ class SQLSrvConnection implements Connection, ServerInfoAwareConnection
public function lastInsertId($name = null)
{
if ($name !== null) {
- $sql = "SELECT IDENT_CURRENT(".$this->quote($name).") AS LastInsertId";
- $stmt = $this->prepare($sql);
- $stmt->execute();
+ $stmt = $this->prepare('SELECT CONVERT(VARCHAR(MAX), current_value) FROM sys.sequences WHERE name = ?');
+ $stmt->execute(array($name));
return $stmt->fetchColumn();
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
index 50705ada..b2c46325 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
@@ -19,9 +19,10 @@
namespace Doctrine\DBAL\Driver\SQLSrv;
-use Doctrine\DBAL\DBALException;
-class SQLSrvException extends DBALException
+use Doctrine\DBAL\Driver\AbstractDriverException;
+
+class SQLSrvException extends AbstractDriverException
{
/**
* Helper method to turn sql server errors into exception.
@@ -32,13 +33,24 @@ class SQLSrvException extends DBALException
{
$errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
$message = "";
+ $sqlState = null;
+ $errorCode = null;
+
foreach ($errors as $error) {
$message .= "SQLSTATE [".$error['SQLSTATE'].", ".$error['code']."]: ". $error['message']."\n";
+
+ if (null === $sqlState) {
+ $sqlState = $error['SQLSTATE'];
+ }
+
+ if (null === $errorCode) {
+ $errorCode = $error['code'];
+ }
}
if ( ! $message) {
$message = "SQL Server error occurred but no error message was retrieved from driver.";
}
- return new self(rtrim($message));
+ return new self(rtrim($message), $sqlState, $errorCode);
}
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
index ead250c1..eee34179 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
@@ -53,11 +53,18 @@ class SQLSrvStatement implements IteratorAggregate, Statement
private $stmt;
/**
- * Parameters to bind.
+ * References to the variables bound as statement parameters.
*
* @var array
*/
- private $params = array();
+ private $variables = array();
+
+ /**
+ * Bound parameter types.
+ *
+ * @var array
+ */
+ private $types = array();
/**
* Translations.
@@ -98,6 +105,13 @@ class SQLSrvStatement implements IteratorAggregate, Statement
*/
private $lastInsertId;
+ /**
+ * Indicates whether the statement is in the state when fetching results is possible
+ *
+ * @var bool
+ */
+ private $result = false;
+
/**
* Append to any INSERT query to retrieve the last insert id.
*
@@ -126,7 +140,14 @@ class SQLSrvStatement implements IteratorAggregate, Statement
*/
public function bindValue($param, $value, $type = null)
{
- return $this->bindParam($param, $value, $type, null);
+ if (!is_numeric($param)) {
+ throw new SQLSrvException(
+ 'sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead.'
+ );
+ }
+
+ $this->variables[$param] = $value;
+ $this->types[$param] = $type;
}
/**
@@ -138,11 +159,11 @@ class SQLSrvStatement implements IteratorAggregate, Statement
throw new SQLSrvException("sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead.");
}
- if ($type === \PDO::PARAM_LOB) {
- $this->params[$column-1] = array($variable, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STREAM(SQLSRV_ENC_BINARY), SQLSRV_SQLTYPE_VARBINARY('max'));
- } else {
- $this->params[$column-1] = $variable;
- }
+ $this->variables[$column] =& $variable;
+ $this->types[$column] = $type;
+
+ // unset the statement resource if it exists as the new one will need to be bound to the new variable
+ $this->stmt = null;
}
/**
@@ -150,9 +171,20 @@ class SQLSrvStatement implements IteratorAggregate, Statement
*/
public function closeCursor()
{
- if ($this->stmt) {
- sqlsrv_free_stmt($this->stmt);
+ // not having the result means there's nothing to close
+ if (!$this->result) {
+ return true;
}
+
+ // emulate it by fetching and discarding rows, similarly to what PDO does in this case
+ // @link http://php.net/manual/en/pdostatement.closecursor.php
+ // @link https://github.com/php/php-src/blob/php-7.0.11/ext/pdo/pdo_stmt.c#L2075
+ // deliberately do not consider multiple result sets, since doctrine/dbal doesn't support them
+ while (sqlsrv_fetch($this->stmt));
+
+ $this->result = false;
+
+ return true;
}
/**
@@ -197,8 +229,11 @@ class SQLSrvStatement implements IteratorAggregate, Statement
}
}
- $this->stmt = sqlsrv_query($this->conn, $this->sql, $this->params);
if ( ! $this->stmt) {
+ $this->stmt = $this->prepare();
+ }
+
+ if (!sqlsrv_execute($this->stmt)) {
throw SQLSrvException::fromSqlSrvErrors();
}
@@ -207,6 +242,40 @@ class SQLSrvStatement implements IteratorAggregate, Statement
sqlsrv_fetch($this->stmt);
$this->lastInsertId->setId(sqlsrv_get_field($this->stmt, 0));
}
+
+ $this->result = true;
+ }
+
+ /**
+ * Prepares SQL Server statement resource
+ *
+ * @return resource
+ * @throws SQLSrvException
+ */
+ private function prepare()
+ {
+ $params = array();
+
+ foreach ($this->variables as $column => &$variable) {
+ if ($this->types[$column] === \PDO::PARAM_LOB) {
+ $params[$column - 1] = array(
+ &$variable,
+ SQLSRV_PARAM_IN,
+ SQLSRV_PHPTYPE_STREAM(SQLSRV_ENC_BINARY),
+ SQLSRV_SQLTYPE_VARBINARY('max'),
+ );
+ } else {
+ $params[$column - 1] =& $variable;
+ }
+ }
+
+ $stmt = sqlsrv_prepare($this->conn, $this->sql, $params);
+
+ if (!$stmt) {
+ throw SQLSrvException::fromSqlSrvErrors();
+ }
+
+ return $stmt;
}
/**
@@ -236,6 +305,12 @@ class SQLSrvStatement implements IteratorAggregate, Statement
*/
public function fetch($fetchMode = null)
{
+ // do not try fetching from the statement if it's not expected to contain result
+ // in order to prevent exceptional situation
+ if (!$this->result) {
+ return false;
+ }
+
$args = func_get_args();
$fetchMode = $fetchMode ?: $this->defaultFetchMode;
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
index 57eed254..da0d77ce 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/DB2Platform.php
@@ -772,18 +772,26 @@ class DB2Platform extends AbstractPlatform
*/
protected function doModifyLimitQuery($query, $limit, $offset = null)
{
- if ($limit === null && $offset === null) {
- return $query;
+ $where = array();
+
+ if ($offset > 0) {
+ $where[] = sprintf('db22.DC_ROWNUM >= %d', $offset + 1);
}
- $limit = (int) $limit;
- $offset = (int) (($offset)?:0);
+ if ($limit !== null) {
+ $where[] = sprintf('db22.DC_ROWNUM <= %d', $offset + $limit);
+ }
- // Todo OVER() needs ORDER BY data!
- $sql = 'SELECT db22.* FROM (SELECT db21.*, ROW_NUMBER() OVER() AS DC_ROWNUM '.
- 'FROM (' . $query . ') db21) db22 WHERE db22.DC_ROWNUM BETWEEN ' . ($offset+1) .' AND ' . ($offset+$limit);
+ if (empty($where)) {
+ return $query;
+ }
- return $sql;
+ // Todo OVER() needs ORDER BY data!
+ return sprintf(
+ 'SELECT db22.* FROM (SELECT db21.*, ROW_NUMBER() OVER() AS DC_ROWNUM FROM (%s) db21) db22 WHERE %s',
+ $query,
+ implode(' AND ', $where)
+ );
}
/**
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
index 4125b620..3cc5413f 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php
@@ -655,25 +655,27 @@ LEFT JOIN user_cons_columns r_cols
$tabColumnsTableName = "user_tab_columns";
$colCommentsTableName = "user_col_comments";
- $ownerCondition = '';
+ $tabColumnsOwnerCondition = '';
+ $colCommentsOwnerCondition = '';
if (null !== $database && '/' !== $database) {
$database = $this->normalizeIdentifier($database);
$database = $this->quoteStringLiteral($database->getName());
$tabColumnsTableName = "all_tab_columns";
$colCommentsTableName = "all_col_comments";
- $ownerCondition = "AND c.owner = " . $database;
+ $tabColumnsOwnerCondition = "AND c.owner = " . $database;
+ $colCommentsOwnerCondition = "AND d.OWNER = c.OWNER";
}
return "SELECT c.*,
(
SELECT d.comments
FROM $colCommentsTableName d
- WHERE d.TABLE_NAME = c.TABLE_NAME
+ WHERE d.TABLE_NAME = c.TABLE_NAME " . $colCommentsOwnerCondition . "
AND d.COLUMN_NAME = c.COLUMN_NAME
) AS comments
FROM $tabColumnsTableName c
- WHERE c.table_name = " . $table . " $ownerCondition
+ WHERE c.table_name = " . $table . " $tabColumnsOwnerCondition
ORDER BY c.column_name";
}
@@ -972,24 +974,29 @@ LEFT JOIN user_cons_columns r_cols
*/
protected function doModifyLimitQuery($query, $limit, $offset = null)
{
- $limit = (int) $limit;
- $offset = (int) $offset;
+ if ($limit === null && $offset === null) {
+ return $query;
+ }
if (preg_match('/^\s*SELECT/i', $query)) {
if (!preg_match('/\sFROM\s/i', $query)) {
$query .= " FROM dual";
}
- if ($limit > 0) {
- $max = $offset + $limit;
- $column = '*';
- if ($offset > 0) {
- $min = $offset + 1;
- $query = 'SELECT * FROM (SELECT a.' . $column . ', rownum AS doctrine_rownum FROM (' .
- $query .
- ') a WHERE rownum <= ' . $max . ') WHERE doctrine_rownum >= ' . $min;
- } else {
- $query = 'SELECT a.' . $column . ' FROM (' . $query . ') a WHERE ROWNUM <= ' . $max;
- }
+
+ $columns = array('a.*');
+
+ if ($offset > 0) {
+ $columns[] = 'ROWNUM AS doctrine_rownum';
+ }
+
+ $query = sprintf('SELECT %s FROM (%s) a', implode(', ', $columns), $query);
+
+ if ($limit !== null) {
+ $query .= sprintf(' WHERE ROWNUM <= %d', $offset + $limit);
+ }
+
+ if ($offset > 0) {
+ $query = sprintf('SELECT * FROM (%s) WHERE doctrine_rownum >= %d', $query, $offset + 1);
}
}
@@ -1116,7 +1123,7 @@ LEFT JOIN user_cons_columns r_cols
'nvarchar2' => 'string',
'char' => 'string',
'nchar' => 'string',
- 'date' => 'datetime',
+ 'date' => 'date',
'timestamp' => 'datetime',
'timestamptz' => 'datetimetz',
'float' => 'float',
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
index d0af579a..b0e53f44 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
@@ -40,6 +40,35 @@ use Doctrine\DBAL\Schema\Table;
*/
class SQLServerPlatform extends AbstractPlatform
{
+ /**
+ * {@inheritdoc}
+ */
+ public function getCurrentDateSQL()
+ {
+ return $this->getConvertExpression('date', 'GETDATE()');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCurrentTimeSQL()
+ {
+ return $this->getConvertExpression('time', 'GETDATE()');
+ }
+
+ /**
+ * Returns an expression that converts an expression of one data type to another.
+ *
+ * @param string $dataType The target native data type. Alias data types cannot be used.
+ * @param string $expression The SQL expression to convert.
+ *
+ * @return string
+ */
+ private function getConvertExpression($dataType, $expression)
+ {
+ return sprintf('CONVERT(%s, %s)', $dataType, $expression);
+ }
+
/**
* {@inheritdoc}
*/
@@ -1224,12 +1253,16 @@ class SQLServerPlatform extends AbstractPlatform
*/
private function scrubInnerOrderBy($query)
{
- $count = substr_count(strtoupper($query), "ORDER BY");
+ $count = substr_count(strtoupper($query), 'ORDER BY');
$offset = 0;
while ($count-- > 0) {
+ $orderByPos = stripos($query, ' ORDER BY', $offset);
+ if ($orderByPos === false) {
+ break;
+ }
+
$qLen = strlen($query);
- $orderByPos = stripos($query, " ORDER BY", $offset);
$parenCount = 0;
$currentPosition = $orderByPos;
@@ -1281,7 +1314,7 @@ class SQLServerPlatform extends AbstractPlatform
}
// Only yank query text on the same nesting level as the ORDER BY clause.
- $subQueryBuffer = ($parenCount === 0 ? $query[$currentPosition] : " ") . $subQueryBuffer;
+ $subQueryBuffer = ($parenCount === 0 ? $query[$currentPosition] : ' ') . $subQueryBuffer;
$currentPosition--;
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
index cdfb6364..6c324131 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php
@@ -35,7 +35,7 @@ class SQLParserUtils
const ESCAPED_SINGLE_QUOTED_TEXT = "'(?:[^'\\\\]|\\\\'?|'')*'";
const ESCAPED_DOUBLE_QUOTED_TEXT = '"(?:[^"\\\\]|\\\\"?)*"';
const ESCAPED_BACKTICK_QUOTED_TEXT = '`(?:[^`\\\\]|\\\\`?)*`';
- const ESCAPED_BRACKET_QUOTED_TEXT = '\[(?:[^\]])*\]';
+ const ESCAPED_BRACKET_QUOTED_TEXT = '(?<!\bARRAY)\[(?:[^\]])*\]';
/**
* Gets an array of the placeholders in an sql statements as keys and their positions in the query string.
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
index a02933d2..9feecdc7 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
@@ -19,6 +19,8 @@
namespace Doctrine\DBAL\Schema;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\DriverException;
use Doctrine\DBAL\Types\Type;
/**
@@ -31,6 +33,34 @@ use Doctrine\DBAL\Types\Type;
*/
class OracleSchemaManager extends AbstractSchemaManager
{
+ /**
+ * {@inheritdoc}
+ */
+ public function dropDatabase($database)
+ {
+ try {
+ parent::dropDatabase($database);
+ } catch (DBALException $exception) {
+ $exception = $exception->getPrevious();
+
+ if (! $exception instanceof DriverException) {
+ throw $exception;
+ }
+
+ // If we have a error code 1940 (ORA-01940), the drop database operation failed
+ // because of active connections on the database.
+ // To force dropping the database, we first have to close all active connections
+ // on that database and issue the drop database operation again.
+ if ($exception->getErrorCode() !== 1940) {
+ throw $exception;
+ }
+
+ $this->killUserSessions($database);
+
+ parent::dropDatabase($database);
+ }
+ }
+
/**
* {@inheritdoc}
*/
@@ -102,7 +132,7 @@ class OracleSchemaManager extends AbstractSchemaManager
$dbType = strtolower($tableColumn['data_type']);
if (strpos($dbType, "timestamp(") === 0) {
- if (strpos($dbType, "WITH TIME ZONE")) {
+ if (strpos($dbType, "with time zone")) {
$dbType = "timestamptz";
} else {
$dbType = "timestamp";
@@ -305,7 +335,7 @@ class OracleSchemaManager extends AbstractSchemaManager
$query = 'CREATE USER ' . $username . ' IDENTIFIED BY ' . $password;
$this->_conn->executeUpdate($query);
- $query = 'GRANT CREATE SESSION, CREATE TABLE, UNLIMITED TABLESPACE, CREATE SEQUENCE, CREATE TRIGGER TO ' . $username;
+ $query = 'GRANT DBA TO ' . $username;
$this->_conn->executeUpdate($query);
return true;
@@ -354,4 +384,42 @@ class OracleSchemaManager extends AbstractSchemaManager
return $identifier;
}
+
+ /**
+ * Kills sessions connected with the given user.
+ *
+ * This is useful to force DROP USER operations which could fail because of active user sessions.
+ *
+ * @param string $user The name of the user to kill sessions for.
+ *
+ * @return void
+ */
+ private function killUserSessions($user)
+ {
+ $sql = <<<SQL
+SELECT
+ s.sid,
+ s.serial#
+FROM
+ gv\$session s,
+ gv\$process p
+WHERE
+ s.username = ?
+ AND p.addr(+) = s.paddr
+SQL;
+
+ $activeUserSessions = $this->_conn->fetchAll($sql, array(strtoupper($user)));
+
+ foreach ($activeUserSessions as $activeUserSession) {
+ $activeUserSession = array_change_key_case($activeUserSession, \CASE_LOWER);
+
+ $this->_execSql(
+ sprintf(
+ "ALTER SYSTEM KILL SESSION '%s, %s' IMMEDIATE",
+ $activeUserSession['sid'],
+ $activeUserSession['serial#']
+ )
+ );
+ }
+ }
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
index b56f8b29..100a64c2 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
@@ -19,7 +19,8 @@
namespace Doctrine\DBAL\Schema;
-use Doctrine\DBAL\Driver\SQLSrv\SQLSrvException;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\DriverException;
use Doctrine\DBAL\Types\Type;
/**
@@ -34,6 +35,34 @@ use Doctrine\DBAL\Types\Type;
*/
class SQLServerSchemaManager extends AbstractSchemaManager
{
+ /**
+ * {@inheritdoc}
+ */
+ public function dropDatabase($database)
+ {
+ try {
+ parent::dropDatabase($database);
+ } catch (DBALException $exception) {
+ $exception = $exception->getPrevious();
+
+ if (! $exception instanceof DriverException) {
+ throw $exception;
+ }
+
+ // If we have a error code 3702, the drop database operation failed
+ // because of active connections on the database.
+ // To force dropping the database, we first have to close all active connections
+ // on that database and issue the drop database operation again.
+ if ($exception->getErrorCode() !== 3702) {
+ throw $exception;
+ }
+
+ $this->closeActiveDatabaseConnections($database);
+
+ parent::dropDatabase($database);
+ }
+ }
+
/**
* {@inheritdoc}
*/
@@ -212,7 +241,7 @@ class SQLServerSchemaManager extends AbstractSchemaManager
} else {
throw $e;
}
- } catch (SQLSrvException $e) {
+ } catch (DBALException $e) {
if (strpos($e->getMessage(), 'SQLSTATE [01000, 15472]') === 0) {
return array();
} else {
@@ -258,4 +287,25 @@ class SQLServerSchemaManager extends AbstractSchemaManager
WHERE Col.[Name] = " . $this->_conn->quote($column) ." AND Tab.[Name] = " . $this->_conn->quote($table) . "
ORDER BY Col.[Name]";
}
+
+ /**
+ * Closes currently active connections on the given database.
+ *
+ * This is useful to force DROP DATABASE operations which could fail because of active connections.
+ *
+ * @param string $database The name of the database to close currently active connections for.
+ *
+ * @return void
+ */
+ private function closeActiveDatabaseConnections($database)
+ {
+ $database = new Identifier($database);
+
+ $this->_execSql(
+ sprintf(
+ 'ALTER DATABASE %s SET SINGLE_USER WITH ROLLBACK IMMEDIATE',
+ $database->getQuotedName($this->_platform)
+ )
+ );
+ }
}
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php
index 857caeb0..fb1e51da 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Table.php
@@ -253,10 +253,10 @@ class Table extends AbstractAsset
unset($this->_indexes[$oldIndexName]);
if ($oldIndex->isUnique()) {
- return $this->addUniqueIndex($oldIndex->getColumns(), $newIndexName);
+ return $this->addUniqueIndex($oldIndex->getColumns(), $newIndexName, $oldIndex->getOptions());
}
- return $this->addIndex($oldIndex->getColumns(), $newIndexName, $oldIndex->getFlags());
+ return $this->addIndex($oldIndex->getColumns(), $newIndexName, $oldIndex->getFlags(), $oldIndex->getOptions());
}
/**
diff --git a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php
index 1175aef3..f9dfb72b 100644
--- a/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php
+++ b/vendor/doctrine/dbal/lib/Doctrine/DBAL/Version.php
@@ -34,7 +34,7 @@ class Version
/**
* Current Doctrine Version.
*/
- const VERSION = '2.5.5-DEV';
+ const VERSION = '2.5.12';
/**
* Compares a Doctrine version with the current one.
diff --git a/vendor/doctrine/doctrine-bundle/.travis.yml b/vendor/doctrine/doctrine-bundle/.travis.yml
index 3f3eca46..158257d5 100644
--- a/vendor/doctrine/doctrine-bundle/.travis.yml
+++ b/vendor/doctrine/doctrine-bundle/.travis.yml
@@ -7,19 +7,16 @@ cache:
- $HOME/.composer/cache
php:
- - 5.3
- - 5.4
- 5.5
- 5.6
- 7.0
+ - 7.1
- hhvm
matrix:
include:
- - php: 5.3
+ - php: 5.5
env: deps=low SYMFONY_DEPRECATIONS_HELPER=weak
- - php: 5.6
- env: SYMFONY_VERSION="2.3.*"
- php: 5.6
env: SYMFONY_VERSION="2.8.*@dev"
- php: 5.6
diff --git a/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php b/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php
index b4e94d5f..9dcfe0ee 100644
--- a/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php
+++ b/vendor/doctrine/doctrine-bundle/Command/Proxy/RunSqlDoctrineCommand.php
@@ -41,7 +41,7 @@ class RunSqlDoctrineCommand extends RunSqlCommand
The <info>%command.name%</info> command executes the given SQL query and
outputs the results:
-<info>php %command.full_name% "SELECT * from user"</info>
+<info>php %command.full_name% "SELECT * FROM users"</info>
EOT
);
}
diff --git a/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php b/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php
index 6ced5874..694f1efb 100644
--- a/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php
+++ b/vendor/doctrine/doctrine-bundle/DataCollector/DoctrineDataCollector.php
@@ -189,4 +189,55 @@ class DoctrineDataCollector extends BaseCollector
return $this->invalidEntityCount;
}
+
+ public function getGroupedQueries()
+ {
+ static $groupedQueries = null;
+
+ if ($groupedQueries !== null) {
+ return $groupedQueries;
+ }
+
+ $groupedQueries = array();
+ $totalExecutionMS = 0;
+ foreach ($this->data['queries'] as $connection => $queries) {
+ $connectionGroupedQueries = array();
+ foreach ($queries as $i => $query) {
+ $key = $query['sql'];
+ if (!isset($connectionGroupedQueries[$key])) {
+ $connectionGroupedQueries[$key] = $query;
+ $connectionGroupedQueries[$key]['executionMS'] = 0;
+ $connectionGroupedQueries[$key]['count'] = 0;
+ $connectionGroupedQueries[$key]['index'] = $i; // "Explain query" relies on query index in 'queries'.
+ }
+ $connectionGroupedQueries[$key]['executionMS'] += $query['executionMS'];
+ $connectionGroupedQueries[$key]['count']++;
+ $totalExecutionMS += $query['executionMS'];
+ }
+ usort($connectionGroupedQueries, function ($a, $b) {
+ if ($a['executionMS'] === $b['executionMS']) {
+ return 0;
+ }
+ return ($a['executionMS'] < $b['executionMS']) ? 1 : -1;
+ });
+ $groupedQueries[$connection] = $connectionGroupedQueries;
+ }
+ foreach ($groupedQueries as $connection => $queries) {
+ foreach ($queries as $i => $query) {
+ $groupedQueries[$connection][$i]['executionPercent'] = $query['executionMS'] / $totalExecutionMS * 100;
+ }
+ }
+
+ return $groupedQueries;
+ }
+
+ public function getGroupedQueryCount()
+ {
+ $count = 0;
+ foreach ($this->getGroupedQueries() as $connectionGroupedQueries) {
+ $count += count($connectionGroupedQueries);
+ }
+
+ return $count;
+ }
}
diff --git a/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php b/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php
index bbceb8c6..c808ea80 100644
--- a/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php
+++ b/vendor/doctrine/doctrine-bundle/DependencyInjection/Compiler/EntityListenerPass.php
@@ -14,6 +14,7 @@ namespace Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Reference;
/**
@@ -39,20 +40,47 @@ class EntityListenerPass implements CompilerPassInterface
continue;
}
- $resolver = sprintf('doctrine.orm.%s_entity_listener_resolver', $name);
- if ($container->hasAlias($resolver)) {
- $resolver = (string) $container->getAlias($resolver);
- }
+ $resolverId = sprintf('doctrine.orm.%s_entity_listener_resolver', $name);
- if (!$container->hasDefinition($resolver)) {
+ if (!$container->has($resolverId)) {
continue;
}
+ $resolver = $container->findDefinition($resolverId);
+
if (isset($attributes['entity']) && isset($attributes['event'])) {
$this->attachToListener($container, $name, $id, $attributes);
}
- $container->getDefinition($resolver)->addMethodCall('register', array(new Reference($id)));
+ if (isset($attributes['lazy']) && $attributes['lazy']) {
+ $listener = $container->findDefinition($id);
+
+ if (!$listener->isPublic()) {
+ throw new InvalidArgumentException(sprintf('The service "%s" must be public as this entity listener is lazy-loaded.', $id));
+ }
+
+ if ($listener->isAbstract()) {
+ throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as this entity listener is lazy-loaded.', $id));
+ }
+
+ $interface = 'Doctrine\\Bundle\\DoctrineBundle\\Mapping\\EntityListenerServiceResolver';
+ $class = $resolver->getClass();
+
+ if (substr($class, 0, 1) === '%') {
+ // resolve container parameter first
+ $class = $container->getParameterBag()->resolveValue($resolver->getClass());
+ }
+
+ if (!is_a($class, $interface, true)) {
+ throw new InvalidArgumentException(
+ sprintf('Lazy-loaded entity listeners can only be resolved by a resolver implementing %s.', $interface)
+ );
+ }
+
+ $resolver->addMethodCall('registerService', array($listener->getClass(), $id));
+ } else {
+ $resolver->addMethodCall('register', array(new Reference($id)));
+ }
}
}
}
diff --git a/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php b/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php
index 420a6929..80ec9062 100644
--- a/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php
+++ b/vendor/doctrine/doctrine-bundle/DependencyInjection/DoctrineExtension.php
@@ -80,20 +80,26 @@ class DoctrineExtension extends AbstractDoctrineExtension
throw new \LogicException('Configuring the ORM layer requires to configure the DBAL layer as well.');
}
+ if (!class_exists('Doctrine\ORM\Version')) {
+ throw new \LogicException('To configure the ORM layer, you must first install the doctrine/orm package.');
+ }
+
$this->ormLoad($config['orm'], $container);
}
- $this->addClassesToCompile(array(
- 'Doctrine\\Common\\Annotations\\DocLexer',
- 'Doctrine\\Common\\Annotations\\FileCacheReader',
- 'Doctrine\\Common\\Annotations\\PhpParser',
- 'Doctrine\\Common\\Annotations\\Reader',
- 'Doctrine\\Common\\Lexer',
- 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
- 'Doctrine\\Common\\Persistence\\Proxy',
- 'Doctrine\\Common\\Util\\ClassUtils',
- 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Doctrine\\Common\\Annotations\\DocLexer',
+ 'Doctrine\\Common\\Annotations\\FileCacheReader',
+ 'Doctrine\\Common\\Annotations\\PhpParser',
+ 'Doctrine\\Common\\Annotations\\Reader',
+ 'Doctrine\\Common\\Lexer',
+ 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
+ 'Doctrine\\Common\\Persistence\\Proxy',
+ 'Doctrine\\Common\\Util\\ClassUtils',
+ 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
+ ));
+ }
}
/**
@@ -435,7 +441,9 @@ class DoctrineExtension extends AbstractDoctrineExtension
if (isset($entityManager['entity_listener_resolver']) && $entityManager['entity_listener_resolver']) {
$container->setAlias(sprintf('doctrine.orm.%s_entity_listener_resolver', $entityManager['name']), $entityManager['entity_listener_resolver']);
} else {
- $container->setDefinition(sprintf('doctrine.orm.%s_entity_listener_resolver', $entityManager['name']), new Definition('%doctrine.orm.entity_listener_resolver.class%'));
+ $definition = new Definition('%doctrine.orm.entity_listener_resolver.class%');
+ $definition->addArgument(new Reference('service_container'));
+ $container->setDefinition(sprintf('doctrine.orm.%s_entity_listener_resolver', $entityManager['name']), $definition);
}
$methods = array(
@@ -466,7 +474,11 @@ class DoctrineExtension extends AbstractDoctrineExtension
if (version_compare(Version::VERSION, "2.5.0-DEV") >= 0) {
$listenerId = sprintf('doctrine.orm.%s_listeners.attach_entity_listeners', $entityManager['name']);
$listenerDef = $container->setDefinition($listenerId, new Definition('%doctrine.orm.listeners.attach_entity_listeners.class%'));
- $listenerDef->addTag('doctrine.event_listener', array('event' => 'loadClassMetadata'));
+ $listenerTagParams = array('event' => 'loadClassMetadata');
+ if (isset($entityManager['connection'])) {
+ $listenerTagParams['connection'] = $entityManager['connection'];
+ }
+ $listenerDef->addTag('doctrine.event_listener', $listenerTagParams);
}
if (isset($entityManager['second_level_cache'])) {
@@ -652,9 +664,12 @@ class DoctrineExtension extends AbstractDoctrineExtension
$regionsDef = $container->setDefinition($regionsId, new Definition('%doctrine.orm.second_level_cache.regions_configuration.class%'));
$slcFactoryId = sprintf('doctrine.orm.%s_second_level_cache.default_cache_factory', $entityManager['name']);
+ $factoryClass = isset($entityManager['second_level_cache']['factory']) ? $entityManager['second_level_cache']['factory'] : '%doctrine.orm.second_level_cache.default_cache_factory.class%';
+
+ $definition = new Definition($factoryClass, array(new Reference($regionsId), new Reference($driverId)));
+
$slcFactoryDef = $container
- ->setDefinition($slcFactoryId, new Definition('%doctrine.orm.second_level_cache.default_cache_factory.class%'))
- ->setArguments(array(new Reference($regionsId), new Reference($driverId)));
+ ->setDefinition($slcFactoryId, $definition);
if (isset($entityManager['second_level_cache']['regions'])) {
foreach ($entityManager['second_level_cache']['regions'] as $name => $region) {
diff --git a/vendor/doctrine/doctrine-bundle/Registry.php b/vendor/doctrine/doctrine-bundle/Registry.php
index 63ec59e0..94652fa7 100644
--- a/vendor/doctrine/doctrine-bundle/Registry.php
+++ b/vendor/doctrine/doctrine-bundle/Registry.php
@@ -52,7 +52,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getDefaultEntityManagerName()
{
- trigger_error('getDefaultEntityManagerName is deprecated since Symfony 2.1. Use getDefaultManagerName instead', E_USER_DEPRECATED);
+ @trigger_error('getDefaultEntityManagerName is deprecated since Symfony 2.1. Use getDefaultManagerName instead', E_USER_DEPRECATED);
return $this->getDefaultManagerName();
}
@@ -68,7 +68,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getEntityManager($name = null)
{
- trigger_error('getEntityManager is deprecated since Symfony 2.1. Use getManager instead', E_USER_DEPRECATED);
+ @trigger_error('getEntityManager is deprecated since Symfony 2.1. Use getManager instead', E_USER_DEPRECATED);
return $this->getManager($name);
}
@@ -82,7 +82,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getEntityManagers()
{
- trigger_error('getEntityManagers is deprecated since Symfony 2.1. Use getManagers instead', E_USER_DEPRECATED);
+ @trigger_error('getEntityManagers is deprecated since Symfony 2.1. Use getManagers instead', E_USER_DEPRECATED);
return $this->getManagers();
}
@@ -95,7 +95,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
* it makes sense to get a new one to replace the closed one.
*
* Be warned that you will get a brand new entity manager as
- * the existing one is not useable anymore. This means that any
+ * the existing one is not usable anymore. This means that any
* other object with a dependency on this entity manager will
* hold an obsolete reference. You can inject the registry instead
* to avoid this problem.
@@ -108,7 +108,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function resetEntityManager($name = null)
{
- trigger_error('resetEntityManager is deprecated since Symfony 2.1. Use resetManager instead', E_USER_DEPRECATED);
+ @trigger_error('resetEntityManager is deprecated since Symfony 2.1. Use resetManager instead', E_USER_DEPRECATED);
$this->resetManager($name);
}
@@ -126,7 +126,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getEntityNamespace($alias)
{
- trigger_error('getEntityNamespace is deprecated since Symfony 2.1. Use getAliasNamespace instead', E_USER_DEPRECATED);
+ @trigger_error('getEntityNamespace is deprecated since Symfony 2.1. Use getAliasNamespace instead', E_USER_DEPRECATED);
return $this->getAliasNamespace($alias);
}
@@ -163,7 +163,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getEntityManagerNames()
{
- trigger_error('getEntityManagerNames is deprecated since Symfony 2.1. Use getManagerNames instead', E_USER_DEPRECATED);
+ @trigger_error('getEntityManagerNames is deprecated since Symfony 2.1. Use getManagerNames instead', E_USER_DEPRECATED);
return $this->getManagerNames();
}
@@ -179,7 +179,7 @@ class Registry extends ManagerRegistry implements RegistryInterface
*/
public function getEntityManagerForClass($class)
{
- trigger_error('getEntityManagerForClass is deprecated since Symfony 2.1. Use getManagerForClass instead', E_USER_DEPRECATED);
+ @trigger_error('getEntityManagerForClass is deprecated since Symfony 2.1. Use getManagerForClass instead', E_USER_DEPRECATED);
return $this->getManagerForClass($class);
}
diff --git a/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml b/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml
index 8c27ee9f..5a20c536 100644
--- a/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml
+++ b/vendor/doctrine/doctrine-bundle/Resources/config/orm.xml
@@ -62,7 +62,7 @@
<parameter key="doctrine.orm.quote_strategy.ansi.class">Doctrine\ORM\Mapping\AnsiQuoteStrategy</parameter>
<!-- entity listener resolver -->
- <parameter key="doctrine.orm.entity_listener_resolver.class">Doctrine\ORM\Mapping\DefaultEntityListenerResolver</parameter>
+ <parameter key="doctrine.orm.entity_listener_resolver.class">Doctrine\Bundle\DoctrineBundle\Mapping\ContainerAwareEntityListenerResolver</parameter>
<!-- second level cache -->
<parameter key="doctrine.orm.second_level_cache.default_cache_factory.class">Doctrine\ORM\Cache\DefaultCacheFactory</parameter>
diff --git a/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig b/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig
index ada203bd..c1261628 100644
--- a/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig
+++ b/vendor/doctrine/doctrine-bundle/Resources/views/Collector/db.html.twig
@@ -122,8 +122,8 @@
{% endblock %}
{% block queries %}
- {% if profiler_markup_version == 1 %}
- <style>
+ <style>
+ {% if profiler_markup_version == 1 %}
.hidden { display: none; }
.queries-table td, .queries-table th { vertical-align: top; }
.queries-table td > div { margin-bottom: 6px; }
@@ -137,8 +137,12 @@
.highlight .string { color: #718C00; }
.highlight .number { color: #F5871F; font-weight: bold; }
.highlight .error { color: #C82829; }
- </style>
- {% endif %}
+ {% endif %}
+
+ .time-container { position: relative; }
+ .time-container .nowrap { position: relative; z-index: 1; text-shadow: 0 0 2px #fff; }
+ .time-bar { display: block; position: absolute; top: 0; left: 0; bottom: 0; background: #e0e0e0; }
+ </style>
{% if profiler_markup_version > 1 %}
<h2>Query Metrics</h2>
@@ -148,6 +152,11 @@
<span class="value">{{ collector.querycount }}</span>
<span class="label">Database Queries</span>
</div>
+
+ <div class="metric">
+ <span class="value">{{ collector.groupedQueryCount }}</span>
+ <span class="label">Different statements</span>
+ </div>
<div class="metric">
<span class="value">{{ '%0.2f'|format(collector.time * 1000) }} ms</span>
@@ -176,7 +185,14 @@
</div>
{% endif %}
- <h2>Queries</h2>
+ {% set group_queries = request.query.getBoolean('group') %}
+ {% if group_queries %}
+ <h2>Grouped Statements</h2>
+ <p><a href="{{ path('_profiler', { panel: 'db', token: token }) }}">Show all queries</a></p>
+ {% else %}
+ <h2>Queries</h2>
+ <p><a href="{{ path('_profiler', { panel: 'db', token: token, group: true }) }}">Group similar statements</a></p>
+ {% endif %}
{% for connection, queries in collector.queries %}
{% if collector.connections|length > 1 %}
@@ -188,24 +204,41 @@
<p>No database queries were performed.</p>
</div>
{% else %}
+ {% if group_queries %}
+ {% set queries = collector.groupedQueries[connection] %}
+ {% endif %}
<table class="alt queries-table">
<thead>
<tr>
- <th class="nowrap" onclick="javascript:sortTable(this, 0, 'queries-{{ loop.index }}')" data-sort-direction="-1" style="cursor: pointer;">#<span class="text-muted">▲</span></th>
- <th class="nowrap" onclick="javascript:sortTable(this, 1, 'queries-{{ loop.index }}')" style="cursor: pointer;">Time<span></span></th>
+ {% if group_queries %}
+ <th class="nowrap" onclick="javascript:sortTable(this, 0, 'queries-{{ loop.index }}')" data-sort-direction="1" style="cursor: pointer;">Time<span class="text-muted">▼</span></th>
+ <th class="nowrap" onclick="javascript:sortTable(this, 1, 'queries-{{ loop.index }}')" style="cursor: pointer;">Count<span></span></th>
+ {% else %}
+ <th class="nowrap" onclick="javascript:sortTable(this, 0, 'queries-{{ loop.index }}')" data-sort-direction="-1" style="cursor: pointer;">#<span class="text-muted">▲</span></th>
+ <th class="nowrap" onclick="javascript:sortTable(this, 1, 'queries-{{ loop.index }}')" style="cursor: pointer;">Time<span></span></th>
+ {% endif %}
<th style="width: 100%;">Info</th>
</tr>
</thead>
<tbody id="queries-{{ loop.index }}">
{% for i, query in queries %}
+ {% set i = group_queries ? query.index : i %}
<tr id="queryNo-{{ i }}-{{ loop.parent.loop.index }}">
- <td class="nowrap">{{ loop.index }}</td>
- <td class="nowrap">{{ '%0.2f'|format(query.executionMS * 1000) }} ms</td>
+ {% if group_queries %}
+ <td class="time-container">
+ <span class="time-bar" style="width:{{ '%0.2f'|format(query.executionPercent) }}%"></span>
+ <span class="nowrap">{{ '%0.2f'|format(query.executionMS * 1000) }} ms<br />({{ '%0.2f'|format(query.executionPercent) }}%)</span>
+ </td>
+ <td class="nowrap">{{ query.count }}</td>
+ {% else %}
+ <td class="nowrap">{{ loop.index }}</td>
+ <td class="nowrap">{{ '%0.2f'|format(query.executionMS * 1000) }} ms</td>
+ {% endif %}
<td>
{{ query.sql|doctrine_pretty_query(highlight_only = true) }}
<div>
- <strong class="font-normal text-small">Parameters</strong>: {{ query.params|yaml_encode }}
+ <strong class="font-normal text-small">Parameters</strong>: {{ profiler_dump(query.params) }}
</div>
<div class="text-small font-normal">
diff --git a/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php b/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php
index 4add5be5..5ae506a7 100644
--- a/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php
+++ b/vendor/doctrine/doctrine-bundle/Twig/DoctrineExtension.php
@@ -32,7 +32,7 @@ class DoctrineExtension extends \Twig_Extension
/**
* Define our functions
*
- * @return array
+ * @return \Twig_SimpleFilter[]
*/
public function getFilters()
{
@@ -247,6 +247,11 @@ class DoctrineExtension extends \Twig_Extension
$result = $parameter;
switch (true) {
+ // Check if result is non-unicode string using PCRE_UTF8 modifier
+ case is_string($result) && !preg_match('//u', $result):
+ $result = '0x'. strtoupper(bin2hex($result));
+ break;
+
case is_string($result):
$result = "'".addslashes($result)."'";
break;
@@ -287,6 +292,10 @@ class DoctrineExtension extends \Twig_Extension
{
$i = 0;
+ if (!array_key_exists(0, $parameters) && array_key_exists(1, $parameters)) {
+ $i = 1;
+ }
+
$result = preg_replace_callback(
'/\?|((?<!:):[a-z0-9_]+)/i',
function ($matches) use ($parameters, &$i) {
diff --git a/vendor/doctrine/doctrine-bundle/composer.json b/vendor/doctrine/doctrine-bundle/composer.json
index 4d4e15ba..2827ba0b 100644
--- a/vendor/doctrine/doctrine-bundle/composer.json
+++ b/vendor/doctrine/doctrine-bundle/composer.json
@@ -24,23 +24,23 @@
}
],
"require": {
- "php": ">=5.3.2",
- "symfony/framework-bundle": "~2.3|~3.0",
- "symfony/console": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
+ "php": ">=5.5.9",
+ "symfony/framework-bundle": "~2.7|~3.0",
+ "symfony/console": "~2.7|~3.0",
+ "symfony/dependency-injection": "~2.7|~3.0",
"doctrine/dbal": "~2.3",
"jdorn/sql-formatter": "~1.1",
- "symfony/doctrine-bridge": "~2.2|~3.0",
+ "symfony/doctrine-bridge": "~2.7|~3.0",
"doctrine/doctrine-cache-bundle": "~1.0"
},
"require-dev": {
"doctrine/orm": "~2.3",
- "symfony/yaml": "~2.2|~3.0",
- "symfony/validator": "~2.2|~3.0",
+ "symfony/yaml": "~2.7|~3.0",
+ "symfony/validator": "~2.7|~3.0",
"symfony/property-info": "~2.8|~3.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
- "twig/twig": "~1.10",
- "satooshi/php-coveralls": "~0.6.1",
+ "twig/twig": "~1.10|~2.0",
+ "satooshi/php-coveralls": "^1.0",
"phpunit/phpunit": "~4"
},
"suggest": {
diff --git a/vendor/doctrine/orm/composer.json b/vendor/doctrine/orm/composer.json
index ce740f88..759ae5c0 100644
--- a/vendor/doctrine/orm/composer.json
+++ b/vendor/doctrine/orm/composer.json
@@ -18,7 +18,7 @@
"doctrine/collections": "~1.2",
"doctrine/dbal": ">=2.5-dev,<2.6-dev",
"doctrine/instantiator": "~1.0.1",
- "doctrine/common": ">=2.5-dev,<2.7-dev",
+ "doctrine/common": ">=2.5-dev,<2.8-dev",
"doctrine/cache": "~1.4",
"symfony/console": "~2.5|~3.0"
},
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php b/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php
index 216fca54..7ac726f4 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/AbstractQuery.php
@@ -1038,7 +1038,7 @@ abstract class AbstractQuery
$metadata = $this->_em->getClassMetadata($entityName);
- return new Cache\TimestampCacheKey($metadata->getTableName());
+ return new Cache\TimestampCacheKey($metadata->rootEntityName);
}
/**
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
index 3172fe99..abaef17a 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php
@@ -32,6 +32,7 @@ use Doctrine\Common\Util\ClassUtils;
/**
* @author Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @since 2.5
*/
abstract class AbstractCollectionPersister implements CachedCollectionPersister
@@ -164,10 +165,18 @@ abstract class AbstractCollectionPersister implements CachedCollectionPersister
public function storeCollectionCache(CollectionCacheKey $key, $elements)
{
/* @var $targetPersister CachedEntityPersister */
+ $associationMapping = $this->sourceEntity->associationMappings[$key->association];
$targetPersister = $this->uow->getEntityPersister($this->targetEntity->rootEntityName);
$targetRegion = $targetPersister->getCacheRegion();
$targetHydrator = $targetPersister->getEntityHydrator();
- $entry = $this->hydrator->buildCacheEntry($this->targetEntity, $key, $elements);
+
+ // Only preserve ordering if association configured it
+ if ( ! (isset($associationMapping['indexBy']) && $associationMapping['indexBy'])) {
+ // Elements may be an array or a Collection
+ $elements = array_values(is_array($elements) ? $elements : $elements->getValues());
+ }
+
+ $entry = $this->hydrator->buildCacheEntry($this->targetEntity, $key, $elements);
foreach ($entry->identifiers as $index => $entityKey) {
if ($targetRegion->contains($entityKey)) {
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
index a2071f42..0a5aa1c6 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
@@ -131,7 +131,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
$this->cacheLogger = $cacheConfig->getCacheLogger();
$this->timestampRegion = $cacheFactory->getTimestampRegion();
$this->hydrator = $cacheFactory->buildEntityHydrator($em, $class);
- $this->timestampKey = new TimestampCacheKey($this->class->getTableName());
+ $this->timestampKey = new TimestampCacheKey($this->class->rootEntityName);
}
/**
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php
index d50d8c50..b4f63e56 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php
@@ -27,6 +27,7 @@ use Doctrine\ORM\Cache\EntityCacheKey;
* Specific non-strict read/write cached entity persister
*
* @author Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @since 2.5
*/
class NonStrictReadWriteCachedEntityPersister extends AbstractEntityPersister
@@ -78,13 +79,16 @@ class NonStrictReadWriteCachedEntityPersister extends AbstractEntityPersister
*/
public function delete($entity)
{
- $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity));
+ $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity));
+ $deleted = $this->persister->delete($entity);
- if ($this->persister->delete($entity)) {
+ if ($deleted) {
$this->region->evict($key);
}
$this->queuedCache['delete'][] = $key;
+
+ return $deleted;
}
/**
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
index 8413082d..07cac510 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php
@@ -30,6 +30,7 @@ use Doctrine\ORM\Cache\EntityCacheKey;
* Specific read-write entity persister
*
* @author Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @since 2.5
*/
class ReadWriteCachedEntityPersister extends AbstractEntityPersister
@@ -100,21 +101,24 @@ class ReadWriteCachedEntityPersister extends AbstractEntityPersister
*/
public function delete($entity)
{
- $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity));
- $lock = $this->region->lock($key);
+ $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity));
+ $lock = $this->region->lock($key);
+ $deleted = $this->persister->delete($entity);
- if ($this->persister->delete($entity)) {
+ if ($deleted) {
$this->region->evict($key);
}
if ($lock === null) {
- return;
+ return $deleted;
}
$this->queuedCache['delete'][] = array(
'lock' => $lock,
'key' => $key
);
+
+ return $deleted;
}
/**
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php b/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php
index 83eab8cf..c2e11dfb 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/PersistentCollection.php
@@ -536,6 +536,8 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
public function clear()
{
if ($this->initialized && $this->isEmpty()) {
+ $this->collection->clear();
+
return;
}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php b/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php
index 09489567..2e85b67f 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/Persisters/Collection/AbstractCollectionPersister.php
@@ -90,10 +90,6 @@ abstract class AbstractCollectionPersister implements CollectionPersister
// If Entity is scheduled for inclusion, it is not in this collection.
// We can assure that because it would have return true before on array check
- if ($entityState === UnitOfWork::STATE_MANAGED && $this->uow->isScheduledForInsert($entity)) {
- return false;
- }
-
- return true;
+ return ! ($entityState === UnitOfWork::STATE_MANAGED && $this->uow->isScheduledForInsert($entity));
}
}
diff --git a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
index 184b291d..fcbd3ab9 100644
--- a/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
+++ b/vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php
@@ -733,7 +733,6 @@ class UnitOfWork implements PropertyChangedListener
// Look for changes in associations of the entity
foreach ($class->associationMappings as $field => $assoc) {
-
if (($val = $class->reflFields[$field]->getValue($entity)) === null) {
continue;
}
@@ -799,7 +798,7 @@ class UnitOfWork implements PropertyChangedListener
// Only MANAGED entities that are NOT SCHEDULED FOR INSERTION OR DELETION are processed here.
$oid = spl_object_hash($entity);
- if ( ! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
+ if ( ! isset($this->entityInsertions[$oid]) && ! isset($this->entityDeletions[$oid]) && isset($this->entityStates[$oid])) {
$this->computeChangeSet($class, $entity);
}
}
@@ -826,10 +825,7 @@ class UnitOfWork implements PropertyChangedListener
if ($value instanceof PersistentCollection && $value->isDirty()) {
$coid = spl_object_hash($value);
- if ($assoc['isOwningSide']) {
- $this->collectionUpdates[$coid] = $value;
- }
-
+ $this->collectionUpdates[$coid] = $value;
$this->visitedCollections[$coid] = $value;
}
@@ -1803,7 +1799,7 @@ class UnitOfWork implements PropertyChangedListener
* @throws OptimisticLockException If the entity uses optimistic locking through a version
* attribute and the version check against the managed copy fails.
* @throws ORMInvalidArgumentException If the entity instance is NEW.
- * @throws EntityNotFoundException
+ * @throws EntityNotFoundException if an assigned identifier is used in the entity, but none is provided
*/
private function doMerge($entity, array &$visited, $prevManagedCopy = null, $assoc = null)
{
@@ -1835,6 +1831,7 @@ class UnitOfWork implements PropertyChangedListener
if ( ! $id) {
$managedCopy = $this->newInstance($class);
+ $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
$this->persistNew($class, $managedCopy);
} else {
$flatId = ($class->containsForeignIdentifier)
@@ -1866,31 +1863,16 @@ class UnitOfWork implements PropertyChangedListener
$managedCopy = $this->newInstance($class);
$class->setIdentifierValues($managedCopy, $id);
+ $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
$this->persistNew($class, $managedCopy);
- }
- }
-
- if ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity)) {
- $reflField = $class->reflFields[$class->versionField];
- $managedCopyVersion = $reflField->getValue($managedCopy);
- $entityVersion = $reflField->getValue($entity);
-
- // Throw exception if versions don't match.
- if ($managedCopyVersion != $entityVersion) {
- throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
+ } else {
+ $this->ensureVersionMatch($class, $entity, $managedCopy);
+ $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
}
}
$visited[$oid] = $managedCopy; // mark visited
- if ($this->isLoaded($entity)) {
- if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized()) {
- $managedCopy->__load();
- }
-
- $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
- }
-
if ($class->isChangeTrackingDeferredExplicit()) {
$this->scheduleForDirtyCheck($entity);
}
@@ -1908,6 +1890,33 @@ class UnitOfWork implements PropertyChangedListener
return $managedCopy;
}
+ /**
+ * @param ClassMetadata $class
+ * @param object $entity
+ * @param object $managedCopy
+ *
+ * @return void
+ *
+ * @throws OptimisticLockException
+ */
+ private function ensureVersionMatch(ClassMetadata $class, $entity, $managedCopy)
+ {
+ if (! ($class->isVersioned && $this->isLoaded($managedCopy) && $this->isLoaded($entity))) {
+ return;
+ }
+
+ $reflField = $class->reflFields[$class->versionField];
+ $managedCopyVersion = $reflField->getValue($managedCopy);
+ $entityVersion = $reflField->getValue($entity);
+
+ // Throw exception if versions don't match.
+ if ($managedCopyVersion == $entityVersion) {
+ return;
+ }
+
+ throw OptimisticLockException::lockFailedVersionMismatch($entity, $entityVersion, $managedCopyVersion);
+ }
+
/**
* Tests if an entity is loaded - must either be a loaded proxy or not a proxy
*
@@ -3360,6 +3369,14 @@ class UnitOfWork implements PropertyChangedListener
*/
private function mergeEntityStateIntoManagedCopy($entity, $managedCopy)
{
+ if (! $this->isLoaded($entity)) {
+ return;
+ }
+
+ if (! $this->isLoaded($managedCopy)) {
+ $managedCopy->__load();
+ }
+
$class = $this->em->getClassMetadata(get_class($entity));
foreach ($this->reflectionPropertiesGetter->getProperties($class->name) as $prop) {
diff --git a/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php b/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php
index 1205c885..47a2fc17 100644
--- a/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php
+++ b/vendor/sensio/distribution-bundle/Composer/ScriptHandler.php
@@ -254,7 +254,6 @@ class ScriptHandler
'Symfony\\Component\\HttpFoundation\\Request',
'Symfony\\Component\\ClassLoader\\ClassCollectionLoader',
- 'Symfony\\Component\\ClassLoader\\ApcClassLoader',
);
if (method_exists('Symfony\Component\ClassLoader\ClassCollectionLoader', 'inline')) {
@@ -394,6 +393,7 @@ EOF;
protected static function getPhpArguments()
{
+ $ini = null;
$arguments = array();
$phpFinder = new PhpExecutableFinder();
@@ -401,7 +401,14 @@ EOF;
$arguments = $phpFinder->findArguments();
}
- if (false !== $ini = php_ini_loaded_file()) {
+ if ($env = strval(getenv('COMPOSER_ORIGINAL_INIS'))) {
+ $paths = explode(PATH_SEPARATOR, $env);
+ $ini = array_shift($paths);
+ } else {
+ $ini = php_ini_loaded_file();
+ }
+
+ if ($ini) {
$arguments[] = '--php-ini='.$ini;
}
diff --git a/vendor/sensio/distribution-bundle/LICENSE b/vendor/sensio/distribution-bundle/LICENSE
index ad32bc52..b420d719 100644
--- a/vendor/sensio/distribution-bundle/LICENSE
+++ b/vendor/sensio/distribution-bundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010,2013 Fabien Potencier
+Copyright (c) 2010-2017 Fabien Potencier
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/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php b/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php
index 7e7723af..7e7a99de 100644
--- a/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php
+++ b/vendor/sensio/distribution-bundle/Resources/skeleton/app/SymfonyRequirements.php
@@ -780,7 +780,11 @@ class SymfonyRequirements extends RequirementCollection
{
$size = ini_get('realpath_cache_size');
$size = trim($size);
- $unit = strtolower(substr($size, -1, 1));
+ $unit = '';
+ if (!ctype_digit($size)) {
+ $unit = strtolower(substr($size, -1, 1));
+ $size = (int) substr($size, 0, -1);
+ }
switch ($unit) {
case 'g':
return $size * 1024 * 1024 * 1024;
diff --git a/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php b/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php
index 8bdfd464..b5e0ef91 100644
--- a/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php
+++ b/vendor/sensio/distribution-bundle/Resources/skeleton/web/config.php
@@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
}
.sf-reset ul a,
.sf-reset ul a:hover {
- background: url(../images/blue-arrow.png) no-repeat right 6px;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
padding-right: 10px;
}
.sf-reset ul, ol {
diff --git a/vendor/sensio/framework-extra-bundle/.travis.yml b/vendor/sensio/framework-extra-bundle/.travis.yml
index ea3bcedd..0c6ae83d 100644
--- a/vendor/sensio/framework-extra-bundle/.travis.yml
+++ b/vendor/sensio/framework-extra-bundle/.travis.yml
@@ -3,31 +3,42 @@ language: php
sudo: false
cache:
- directories:
- - $HOME/.composer/cache
+ directories:
+ - $HOME/.composer/cache/files
+ - .phpunit
php:
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - 7.0
- - hhvm
+ - 5.3
+ - 5.4
+ - 5.5
+ - 5.6
+ - 7.0
matrix:
- include:
- - php: 5.3
- env: deps=low
- fast_finish: true
+ include:
+ - php: 7.0
+ env: deps=low
+ # Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
+ - php: hhvm-3.12
+ sudo: required
+ dist: trusty
+ group: edge
+ fast_finish: true
env:
- global:
- - deps=no
+ global:
+ - deps=no
before_install:
- - travis_retry composer self-update
+ - export SYMFONY_PHPUNIT_DIR="$(pwd)/.phpunit"
+ - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then INI_FILE=~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; else INI_FILE=/etc/hhvm/php.ini; fi
+ - echo memory_limit = -1 >> $INI_FILE
+ - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
install:
- - if [[ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update symfony/psr-http-message-bridge zendframework/zend-diactoros; fi;
- - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
- - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
+ - if [[ "$TRAVIS_PHP_VERSION" == "5.3" ]]; then composer remove --dev --no-update symfony/psr-http-message-bridge zendframework/zend-diactoros; fi;
+ - if [ "$deps" = "no" ]; then composer install; fi;
+ - if [ "$deps" = "low" ]; then composer --prefer-lowest --prefer-stable update; fi;
+
+script:
+ - ./vendor/bin/simple-phpunit
diff --git a/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php b/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php
index 3a5d430f..b3654305 100644
--- a/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php
+++ b/vendor/sensio/framework-extra-bundle/DependencyInjection/Compiler/AddParamConverterPass.php
@@ -35,7 +35,7 @@ class AddParamConverterPass implements CompilerPassInterface
$name = isset($converter['converter']) ? $converter['converter'] : null;
$priority = isset($converter['priority']) ? $converter['priority'] : 0;
- if ($priority === 'false') {
+ if ($priority === 'false' || $priority === false) {
$priority = null;
}
diff --git a/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php b/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php
index ac4ec771..a8ba091e 100644
--- a/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php
+++ b/vendor/sensio/framework-extra-bundle/DependencyInjection/SensioFrameworkExtraExtension.php
@@ -43,39 +43,47 @@ class SensioFrameworkExtraExtension extends Extension
if ($config['router']['annotations']) {
$annotationsToLoad[] = 'routing.xml';
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
+ ));
+ }
}
if ($config['request']['converters']) {
$annotationsToLoad[] = 'converters.xml';
- $this->addClassesToCompile(array(
- // cannot be added because it has some annotations
- //'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ParamConverter',
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ // cannot be added because it has some annotations
+ //'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ParamConverter',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
+ ));
+ }
}
if ($config['view']['annotations']) {
$annotationsToLoad[] = 'view.xml';
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
+ ));
+ }
}
if ($config['cache']['annotations']) {
$annotationsToLoad[] = 'cache.xml';
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
+ ));
+ }
}
if ($config['security']['annotations']) {
@@ -87,9 +95,11 @@ class SensioFrameworkExtraExtension extends Extension
$container->removeDefinition('sensio_framework_extra.security.expression_language.default');
}
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
+ ));
+ }
}
if ($annotationsToLoad) {
@@ -100,9 +110,11 @@ class SensioFrameworkExtraExtension extends Extension
$loader->load($configFile);
}
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
+ ));
+ }
if ($config['request']['converters']) {
$container->getDefinition('sensio_framework_extra.converter.listener')->replaceArgument(1, $config['request']['auto_convert']);
diff --git a/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php b/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php
index ffd8fcf1..50712901 100644
--- a/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php
+++ b/vendor/sensio/framework-extra-bundle/EventListener/ControllerListener.php
@@ -50,7 +50,13 @@ class ControllerListener implements EventSubscriberInterface
*/
public function onKernelController(FilterControllerEvent $event)
{
- if (!is_array($controller = $event->getController())) {
+ $controller = $event->getController();
+
+ if (!is_array($controller) && method_exists($controller, '__invoke')) {
+ $controller = array($controller, '__invoke');
+ }
+
+ if (!is_array($controller)) {
return;
}
diff --git a/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php b/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php
index 127d874d..2119d10a 100644
--- a/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php
+++ b/vendor/sensio/framework-extra-bundle/EventListener/HttpCacheListener.php
@@ -65,6 +65,7 @@ class HttpCacheListener implements EventSubscriberInterface
$event->setController(function () use ($response) {
return $response;
});
+ $event->stopPropagation();
} else {
if ($etag) {
$this->etags[$request] = $etag;
diff --git a/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php b/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php
index 0417b697..49df7ce5 100644
--- a/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php
+++ b/vendor/sensio/framework-extra-bundle/EventListener/ParamConverterListener.php
@@ -32,6 +32,11 @@ class ParamConverterListener implements EventSubscriberInterface
protected $autoConvert;
+ /**
+ * @var bool
+ */
+ private $isParameterTypeSupported;
+
/**
* Constructor.
*
@@ -42,6 +47,7 @@ class ParamConverterListener implements EventSubscriberInterface
{
$this->manager = $manager;
$this->autoConvert = $autoConvert;
+ $this->isParameterTypeSupported = method_exists('ReflectionParameter', 'getType');
}
/**
@@ -96,7 +102,7 @@ class ParamConverterListener implements EventSubscriberInterface
$configurations[$name]->setClass($param->getClass()->getName());
}
- $configurations[$name]->setIsOptional($param->isOptional());
+ $configurations[$name]->setIsOptional($param->isOptional() || $this->isParameterTypeSupported && $param->hasType() && $param->getType()->allowsNull());
}
return $configurations;
diff --git a/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php b/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php
index b85791df..d2e01b9b 100644
--- a/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php
+++ b/vendor/sensio/framework-extra-bundle/EventListener/SecurityListener.php
@@ -61,7 +61,7 @@ class SecurityListener implements EventSubscriberInterface
}
if (null === $this->language) {
- throw new \LogicException('To use the @Security tag, you need to use the Security component 2.4 or newer and to install the ExpressionLanguage component.');
+ throw new \LogicException('To use the @Security tag, you need to use the Security component 2.4 or newer and install the ExpressionLanguage component.');
}
if (!$this->language->evaluate($configuration->getExpression(), $this->getVariables($request))) {
diff --git a/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php b/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php
index 2287305d..d7eb05cf 100644
--- a/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php
+++ b/vendor/sensio/framework-extra-bundle/EventListener/TemplateListener.php
@@ -143,14 +143,18 @@ class TemplateListener implements EventSubscriberInterface
$arguments = array();
foreach ($r->getMethod($action)->getParameters() as $param) {
- $arguments[] = $param->getName();
+ $arguments[] = $param;
}
}
// fetch the arguments of @Template.vars or everything if desired
// and assign them to the designated template
foreach ($arguments as $argument) {
- $parameters[$argument] = $request->attributes->get($argument);
+ if ($argument instanceof \ReflectionParameter) {
+ $parameters[$name = $argument->getName()] = !$request->attributes->has($name) && $argument->isDefaultValueAvailable() ? $argument->getDefaultValue() : $request->attributes->get($name);
+ } else {
+ $parameters[$argument] = $request->attributes->get($argument);
+ }
}
return $parameters;
diff --git a/vendor/sensio/framework-extra-bundle/LICENSE b/vendor/sensio/framework-extra-bundle/LICENSE
index ad32bc52..b420d719 100644
--- a/vendor/sensio/framework-extra-bundle/LICENSE
+++ b/vendor/sensio/framework-extra-bundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010,2013 Fabien Potencier
+Copyright (c) 2010-2017 Fabien Potencier
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/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php b/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php
index bea90f33..176a7424 100644
--- a/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php
+++ b/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DateTimeParamConverter.php
@@ -47,11 +47,11 @@ class DateTimeParamConverter implements ParamConverterInterface
$date = DateTime::createFromFormat($options['format'], $value);
if (!$date) {
- throw new NotFoundHttpException('Invalid date given.');
+ throw new NotFoundHttpException(sprintf('Invalid date given for parameter "%s".', $param));
}
} else {
if (false === strtotime($value)) {
- throw new NotFoundHttpException('Invalid date given.');
+ throw new NotFoundHttpException(sprintf('Invalid date given for parameter "%s".', $param));
}
$date = new DateTime($value);
diff --git a/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php b/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php
index e57c1f30..c44558f1 100644
--- a/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php
+++ b/vendor/sensio/framework-extra-bundle/Request/ParamConverter/DoctrineParamConverter.php
@@ -57,7 +57,7 @@ class DoctrineParamConverter implements ParamConverterInterface
if ($configuration->isOptional()) {
$object = null;
} else {
- throw new \LogicException('Unable to guess how to get a Doctrine instance from the request information.');
+ throw new \LogicException(sprintf('Unable to guess how to get a Doctrine instance from the request information for parameter "%s".', $name));
}
}
}
diff --git a/vendor/sensio/framework-extra-bundle/composer.json b/vendor/sensio/framework-extra-bundle/composer.json
index 47d7fd40..920764e4 100644
--- a/vendor/sensio/framework-extra-bundle/composer.json
+++ b/vendor/sensio/framework-extra-bundle/composer.json
@@ -18,12 +18,18 @@
"require-dev": {
"symfony/expression-language": "~2.4|~3.0",
"symfony/finder": "~2.3|~3.0",
+ "symfony/psr-http-message-bridge": "^0.3",
"symfony/security-bundle": "~2.4|~3.0",
+ "symfony/yaml": "~2.3|~3.0",
"symfony/twig-bundle": "~2.3|~3.0",
"twig/twig": "~1.11|~2.0",
+ "symfony/asset": "~2.7|~3.0",
"symfony/browser-kit": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/dom-crawler": "~2.3|~3.0"
+ "symfony/phpunit-bridge": "~3.2",
+ "symfony/dom-crawler": "~2.3|~3.0",
+ "symfony/templating": "~2.3|~3.0",
+ "symfony/translation": "~2.3|~3.0",
+ "zendframework/zend-diactoros": "^1.3"
},
"suggest": {
"symfony/psr-http-message-bridge": "To use the PSR-7 converters",
diff --git a/vendor/swiftmailer/swiftmailer/VERSION b/vendor/swiftmailer/swiftmailer/VERSION
index d2a91d9c..ec48d808 100644
--- a/vendor/swiftmailer/swiftmailer/VERSION
+++ b/vendor/swiftmailer/swiftmailer/VERSION
@@ -1 +1 @@
-Swift-5.4.4
+Swift-5.4.6
diff --git a/vendor/swiftmailer/swiftmailer/composer.json b/vendor/swiftmailer/swiftmailer/composer.json
index 86691bdb..8335f58a 100644
--- a/vendor/swiftmailer/swiftmailer/composer.json
+++ b/vendor/swiftmailer/swiftmailer/composer.json
@@ -18,7 +18,8 @@
"php": ">=5.3.3"
},
"require-dev": {
- "mockery/mockery": "~0.9.1"
+ "mockery/mockery": "~0.9.1",
+ "symfony/phpunit-bridge": "~3.2"
},
"autoload": {
"files": ["lib/swift_required.php"]
diff --git a/vendor/swiftmailer/swiftmailer/doc/overview.rst b/vendor/swiftmailer/swiftmailer/doc/overview.rst
index b6dd296b..ebfe0083 100644
--- a/vendor/swiftmailer/swiftmailer/doc/overview.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/overview.rst
@@ -84,8 +84,6 @@ use for your environment.
+---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
| ``Swift_SendmailTransport`` | Communicates with a locally installed ``sendmail`` executable (Linux/UNIX) | Quick time-to-run; Provides less-accurate feedback than SMTP; Requires ``sendmail`` installation |
+---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
-| ``Swift_MailTransport`` | Uses PHP's built-in ``mail()`` function | Very portable; Potentially unpredictable results; Provides extremely weak feedback |
-+---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
| ``Swift_LoadBalancedTransport`` | Cycles through a collection of the other Transports to manage load-reduction | Provides graceful fallback if one Transport fails (e.g. an SMTP server is down); Keeps the load on remote services down by spreading the work |
+---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
| ``Swift_FailoverTransport`` | Works in conjunction with a collection of the other Transports to provide high-availability | Provides graceful fallback if one Transport fails (e.g. an SMTP server is down) |
diff --git a/vendor/swiftmailer/swiftmailer/doc/sending.rst b/vendor/swiftmailer/swiftmailer/doc/sending.rst
index 44608455..f340404c 100644
--- a/vendor/swiftmailer/swiftmailer/doc/sending.rst
+++ b/vendor/swiftmailer/swiftmailer/doc/sending.rst
@@ -10,7 +10,7 @@ create the Mailer, then you use the Mailer to send the message.
To send a Message:
* Create a Transport from one of the provided Transports --
- ``Swift_SmtpTransport``, ``Swift_SendmailTransport``, ``Swift_MailTransport``
+ ``Swift_SmtpTransport``, ``Swift_SendmailTransport``
or one of the aggregate Transports.
* Create an instance of the ``Swift_Mailer`` class, using the Transport as
@@ -46,13 +46,10 @@ recipients are delivered to successfully then the value 5 will be returned.
;
/*
- You could alternatively use a different transport such as Sendmail or Mail:
+ You could alternatively use a different transport such as Sendmail:
// Sendmail
$transport = Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs');
-
- // Mail
- $transport = Swift_MailTransport::newInstance();
*/
// Create the Mailer using your created Transport
@@ -350,39 +347,6 @@ Serious drawbacks when using this Transport are:
It's a last resort, and we say that with a passion!
-Using the Mail Transport
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-To use the Mail Transport you simply need to call
-``Swift_MailTransport::newInstance()``. It's unlikely you'll need to configure
-the Transport.
-
-To use the Mail Transport:
-
-* Call ``Swift_MailTransport::newInstance()``.
-
-* Use the returned object to create the Mailer.
-
-Messages will be sent using the ``mail()`` function.
-
-.. note::
-
- The ``mail()`` function can take a ``$additional_parameters`` parameter.
- Swift Mailer sets this to "``-f%s``" by default, where the "``%s``" is
- substituted with the address of the sender (via a ``sprintf()``) at send
- time. You may override this default by passing an argument to
- ``newInstance()``.
-
- .. code-block:: php
-
- require_once 'lib/swift_required.php';
-
- // Create the Transport
- $transport = Swift_MailTransport::newInstance();
-
- // Create the Mailer using your created Transport
- $mailer = Swift_Mailer::newInstance($transport);
-
Available Methods for Sending Messages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -414,7 +378,7 @@ To send a Message with ``send()``:
* Create a Transport from one of the provided Transports --
``Swift_SmtpTransport``, ``Swift_SendmailTransport``,
- ``Swift_MailTransport`` or one of the aggregate Transports.
+ or one of the aggregate Transports.
* Create an instance of the ``Swift_Mailer`` class, using the Transport as
it's constructor parameter.
@@ -474,7 +438,7 @@ own address shows up in the ``To:`` field, follow the following recipe:
* Create a Transport from one of the provided Transports --
``Swift_SmtpTransport``, ``Swift_SendmailTransport``,
- ``Swift_MailTransport`` or one of the aggregate Transports.
+ or one of the aggregate Transports.
* Create an instance of the ``Swift_Mailer`` class, using the Transport as
it's constructor parameter.
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
index 3d5e854a..4267adbc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader.php
@@ -48,8 +48,8 @@ interface Swift_CharacterReader
* A value of zero means this is already a valid character.
* A value of -1 means this cannot possibly be a valid character.
*
- * @param integer[] $bytes
- * @param int $size
+ * @param int[] $bytes
+ * @param int $size
*
* @return int
*/
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 7379bda2..22746bd8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -19,22 +19,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
/** Pre-computed for optimization */
private static $length_map = array(
// N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x0N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x1N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x2N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x3N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x4N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x5N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x6N
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x7N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x8N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x9N
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xAN
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xBN
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xCN
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xDN
- 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, // 0xEN
- 4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0, // 0xFN
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x3N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x4N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x5N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x6N
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x7N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x8N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x9N
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xAN
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xBN
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
+ 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
);
private static $s_length_map = array(
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index d695a6e1..7213a40d 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -155,7 +155,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
*
* @param int $length
*
- * @return integer[]
+ * @return int[]
*/
public function readBytes($length)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index 8a81fe39..edec10c5 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -235,8 +235,8 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
/**
* Encode the given byte array into a verbatim QP form.
*
- * @param integer[] $bytes
- * @param int $size
+ * @param int[] $bytes
+ * @param int $size
*
* @return string
*/
@@ -262,7 +262,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
*
* @param int $size number of bytes to read
*
- * @return integer[]
+ * @return int[]
*/
protected function _nextSequence($size = 4)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
index 253977b6..24587870 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
@@ -55,8 +55,6 @@ class Swift_Encoding
return self::_lookup('mime.base64contentencoder');
}
- // -- Private Static Methods
-
private static function _lookup($key)
{
return Swift_DependencyContainer::getInstance()->lookup($key);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 7dc381d9..674e6b5e 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -25,7 +25,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
/**
* An array of codes which a successful response will contain.
*
- * @var integer[]
+ * @var int[]
*/
private $_successCodes = array();
@@ -56,7 +56,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
/**
* Get the numeric response codes which indicate success for this command.
*
- * @return integer[]
+ * @return int[]
*/
public function getSuccessCodes()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
index 858ca814..994df3ec 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
@@ -12,6 +12,8 @@
* Sends Messages using the mail() function.
*
* @author Chris Corbyn
+ *
+ * @deprecated since 5.4.5 (to be removed in 6.0)
*/
class Swift_MailTransport extends Swift_Transport_MailTransport
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index 54fe7868..a6bb6593 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -68,7 +68,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
* @param string $contentType
* @param string $charset
*
- * @return Swift_Message
+ * @return $this
*/
public static function newInstance($subject = null, $body = null, $contentType = null, $charset = null)
{
@@ -82,7 +82,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
* @param string $contentType
* @param string $charset
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addPart($body, $contentType = null, $charset = null)
{
@@ -96,7 +96,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
*
* @param Swift_Signer $signer
*
- * @return Swift_Message
+ * @return $this
*/
public function attachSigner(Swift_Signer $signer)
{
@@ -114,7 +114,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
*
* @param Swift_Signer $signer
*
- * @return Swift_Message
+ * @return $this
*/
public function detachSigner(Swift_Signer $signer)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index fbd9258a..3a6d7b39 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -219,8 +219,6 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
return $this->toString();
}
- // -- Points of extension
-
/**
* Set the name of this Header field.
*
@@ -449,7 +447,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
*/
protected function toTokens($string = null)
{
- if (is_null($string)) {
+ if (null === $string) {
$string = $this->getFieldBody();
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 4fd66742..4075cbfa 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -95,7 +95,7 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
*/
public function setTimestamp($timestamp)
{
- if (!is_null($timestamp)) {
+ if (null !== $timestamp) {
$timestamp = (int) $timestamp;
}
$this->clearCachedValueIf($this->_timestamp != $timestamp);
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index 222a57c4..e4567fc8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -231,15 +231,13 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
public function getFieldBody()
{
// Compute the string value of the header only if needed
- if (is_null($this->getCachedValue())) {
+ if (null === $this->getCachedValue()) {
$this->setCachedValue($this->createMailboxListString($this->_mailboxes));
}
return $this->getCachedValue();
}
- // -- Points of extension
-
/**
* Normalizes a user-input list of mailboxes into consistent key=>value pairs.
*
@@ -298,7 +296,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
* Redefine the encoding requirements for mailboxes.
*
* All "specials" must be encoded as the full header value will not be quoted
- *
+ *
* @see RFC 2822 3.2.1
*
* @param string $token
@@ -323,7 +321,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
foreach ($mailboxes as $email => $name) {
$mailboxStr = $email;
- if (!is_null($name)) {
+ if (null !== $name) {
$nameStr = $this->createDisplayNameString($name, empty($strings));
$mailboxStr = $nameStr.' <'.$mailboxStr.'>';
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index c506daec..c1777d33 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -131,7 +131,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
{
$body = parent::getFieldBody();
foreach ($this->_params as $name => $value) {
- if (!is_null($value)) {
+ if (null !== $value) {
// Add the parameter
$body .= '; '.$this->_createParameter($name, $value);
}
@@ -156,7 +156,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
// Try creating any parameters
foreach ($this->_params as $name => $value) {
- if (!is_null($value)) {
+ if (null !== $value) {
// Add the semi-colon separator
$tokens[count($tokens) - 1] .= ';';
$tokens = array_merge($tokens, $this->generateTokenLines(
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index 2fffc7b4..4a814b12 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -80,7 +80,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
*/
public function setAddress($address)
{
- if (is_null($address)) {
+ if (null === $address) {
$this->_address = null;
} elseif ('' == $address) {
$this->_address = '';
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index 50fadfb7..c08ba9dc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -40,7 +40,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
{
parent::__construct($headers, $encoder, $cache, $grammar);
$this->setContentType('text/plain');
- if (!is_null($charset)) {
+ if (null !== $charset) {
$this->setCharset($charset);
}
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index 776c7ebf..72d40cee 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -73,7 +73,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param string $subject
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setSubject($subject)
{
@@ -99,7 +99,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param int $date
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setDate($date)
{
@@ -125,7 +125,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param string $address
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setReturnPath($address)
{
@@ -154,7 +154,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setSender($address, $name = null)
{
@@ -187,7 +187,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addFrom($address, $name = null)
{
@@ -208,7 +208,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string|array $addresses
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setFrom($addresses, $name = null)
{
@@ -241,7 +241,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addReplyTo($address, $name = null)
{
@@ -262,7 +262,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param mixed $addresses
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setReplyTo($addresses, $name = null)
{
@@ -295,7 +295,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addTo($address, $name = null)
{
@@ -317,7 +317,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param mixed $addresses
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setTo($addresses, $name = null)
{
@@ -350,7 +350,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addCc($address, $name = null)
{
@@ -369,7 +369,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param mixed $addresses
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setCc($addresses, $name = null)
{
@@ -402,7 +402,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param string $address
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function addBcc($address, $name = null)
{
@@ -421,7 +421,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
* @param mixed $addresses
* @param string $name optional
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setBcc($addresses, $name = null)
{
@@ -453,7 +453,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param int $priority
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setPriority($priority)
{
@@ -501,7 +501,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param array $addresses
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function setReadReceiptTo($addresses)
{
@@ -528,7 +528,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param Swift_Mime_MimeEntity $entity
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function attach(Swift_Mime_MimeEntity $entity)
{
@@ -542,7 +542,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
*
* @param Swift_Mime_MimeEntity $entity
*
- * @return Swift_Mime_SimpleMessage
+ * @return $this
*/
public function detach(Swift_Mime_MimeEntity $entity)
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index 0694ee1b..2f33c8d3 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -161,7 +161,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @param string $type
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setContentType($type)
{
@@ -192,7 +192,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @param string $id
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setId($id)
{
@@ -223,7 +223,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @param string $description
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setDescription($description)
{
@@ -251,7 +251,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @param int $length
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setMaxLineLength($length)
{
@@ -276,7 +276,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
* @param Swift_Mime_MimeEntity[] $children
* @param int $compoundLevel For internal use only
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setChildren(array $children, $compoundLevel = null)
{
@@ -355,7 +355,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
* @param mixed $body
* @param string $contentType optional
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setBody($body, $contentType = null)
{
@@ -386,7 +386,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @param Swift_Mime_ContentEncoder $encoder
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setEncoder(Swift_Mime_ContentEncoder $encoder)
{
@@ -422,7 +422,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
*
* @throws Swift_RfcComplianceException
*
- * @return Swift_Mime_SimpleMimeEntity
+ * @return $this
*/
public function setBoundary($boundary)
{
@@ -802,14 +802,14 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
return $typePrefs[0] >= $typePrefs[1] ? 1 : -1;
}
- // -- Destructor
-
/**
* Empties it's own contents from the cache.
*/
public function __destruct()
{
- $this->_cache->clearAll($this->_cacheKey);
+ if ($this->_cache instanceof Swift_KeyCache) {
+ $this->_cache->clearAll($this->_cacheKey);
+ }
}
/**
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index 7552b67a..58344405 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -18,7 +18,7 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
/**
* The sender to impersonate.
*
- * @var String
+ * @var string
*/
private $_sender;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index e622cb37..5ff1d932 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,7 +16,7 @@
class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
{
/**
- * @var array
+ * @var Swift_Mime_Message[]
*/
private $messages;
@@ -28,7 +28,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
/**
* Get the message list.
*
- * @return array
+ * @return Swift_Mime_Message[]
*/
public function getMessages()
{
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 24bc929e..2f4b9a75 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -98,16 +98,16 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
$duration = $time - $this->_start;
switch ($this->_mode) {
- case self::BYTES_PER_MINUTE :
+ case self::BYTES_PER_MINUTE:
$sleep = $this->_throttleBytesPerMinute($duration);
break;
- case self::MESSAGES_PER_SECOND :
+ case self::MESSAGES_PER_SECOND:
$sleep = $this->_throttleMessagesPerSecond($duration);
break;
- case self::MESSAGES_PER_MINUTE :
+ case self::MESSAGES_PER_MINUTE:
$sleep = $this->_throttleMessagesPerMinute($duration);
break;
- default :
+ default:
$sleep = 0;
break;
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index b7a62091..9d0a45d8 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -39,9 +39,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* Hash algorithm used.
*
+ * @see RFC6376 3.3: Signers MUST implement and SHOULD sign using rsa-sha256.
+ *
* @var string
*/
- protected $_hashAlgorithm = 'rsa-sha1';
+ protected $_hashAlgorithm = 'rsa-sha256';
/**
* Body canon method.
@@ -101,7 +103,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* When will the signature expires false means not embedded, if sigTimestamp is auto
- * Expiration is relative, otherwhise it's absolute.
+ * Expiration is relative, otherwise it's absolute.
*
* @var int
*/
@@ -123,7 +125,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
protected $_signedHeaders = array();
/**
- * If debugHeaders is set store debugDatas here.
+ * If debugHeaders is set store debugData here.
*
* @var string
*/
@@ -174,6 +176,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
$this->_domainName = $domainName;
$this->_signerIdentity = '@'.$domainName;
$this->_selector = $selector;
+
+ // keep fallback hash algorithm sha1 if php version is lower than 5.4.8
+ if (PHP_VERSION_ID < 50408) {
+ $this->_hashAlgorithm = 'rsa-sha1';
+ }
}
/**
@@ -223,6 +230,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
*
* @return int
*/
+ // TODO fix return
public function write($bytes)
{
$this->_canonicalizeBody($bytes);
@@ -234,8 +242,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* For any bytes that are currently buffered inside the stream, force them
* off the buffer.
- *
- * @throws Swift_IoException
*/
public function commit()
{
@@ -276,8 +282,6 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
return;
}
}
-
- return;
}
/**
@@ -292,19 +296,28 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
}
/**
- * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1 defaults to rsa-sha256.
+ * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1.
*
- * @param string $hash
+ * @param string $hash 'rsa-sha1' or 'rsa-sha256'
+ *
+ * @throws Swift_SwiftException
*
* @return Swift_Signers_DKIMSigner
*/
public function setHashAlgorithm($hash)
{
- // Unable to sign with rsa-sha256
- if ($hash == 'rsa-sha1') {
- $this->_hashAlgorithm = 'rsa-sha1';
- } else {
- $this->_hashAlgorithm = 'rsa-sha256';
+ switch ($hash) {
+ case 'rsa-sha1':
+ $this->_hashAlgorithm = 'rsa-sha1';
+ break;
+ case 'rsa-sha256':
+ $this->_hashAlgorithm = 'rsa-sha256';
+ if (!defined('OPENSSL_ALGO_SHA256')) {
+ throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
+ }
+ break;
+ default:
+ throw new Swift_SwiftException('Unable to set the hash algorithm, must be one of rsa-sha1 or rsa-sha256 (%s given).', $hash);
}
return $this;
@@ -432,10 +445,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
{
// Init
switch ($this->_hashAlgorithm) {
- case 'rsa-sha256' :
+ case 'rsa-sha256':
$this->_bodyHashHandler = hash_init('sha256');
break;
- case 'rsa-sha1' :
+ case 'rsa-sha1':
$this->_bodyHashHandler = hash_init('sha1');
break;
}
@@ -567,14 +580,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
protected function _addHeader($header, $is_sig = false)
{
switch ($this->_headerCanon) {
- case 'relaxed' :
+ case 'relaxed':
// Prepare Header and cascade
$exploded = explode(':', $header, 2);
$name = strtolower(trim($exploded[0]));
$value = str_replace("\r\n", '', $exploded[1]);
$value = preg_replace("/[ \t][ \t]+/", ' ', $value);
$header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
- case 'simple' :
+ case 'simple':
// Nothing to do
}
$this->_addToHeaderHash($header);
@@ -583,7 +596,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
/**
* @deprecated This method is currently useless in this class but it must be
* kept for BC reasons due to its "protected" scope. This method
- * might be overriden by custom client code.
+ * might be overridden by custom client code.
*/
protected function _endOfHeaders()
{
@@ -600,10 +613,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
continue;
}
switch ($string[$i]) {
- case "\r" :
+ case "\r":
$this->_bodyCanonLastChar = "\r";
break;
- case "\n" :
+ case "\n":
if ($this->_bodyCanonLastChar == "\r") {
if ($method) {
$this->_bodyCanonSpace = false;
@@ -619,13 +632,13 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
// todo handle it but should never happen
}
break;
- case ' ' :
- case "\t" :
+ case ' ':
+ case "\t":
if ($method) {
$this->_bodyCanonSpace = true;
break;
}
- default :
+ default:
if ($this->_bodyCanonEmptyCounter > 0) {
$canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
$this->_bodyCanonEmptyCounter = 0;
@@ -678,6 +691,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
private function _getEncryptedHash()
{
$signature = '';
+
switch ($this->_hashAlgorithm) {
case 'rsa-sha1':
$algorithm = OPENSSL_ALGO_SHA1;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 43210f07..786cee7b 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -413,14 +413,14 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
protected function _addHeader($header)
{
switch ($this->_canon) {
- case 'nofws' :
+ case 'nofws':
// Prepare Header and cascade
$exploded = explode(':', $header, 2);
$name = strtolower(trim($exploded[0]));
$value = str_replace("\r\n", '', $exploded[1]);
$value = preg_replace("/[ \t][ \t]+/", ' ', $value);
$header = $name.':'.trim($value)."\r\n";
- case 'simple' :
+ case 'simple':
// Nothing to do
}
$this->_addToHash($header);
@@ -442,10 +442,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
continue;
}
switch ($string[$i]) {
- case "\r" :
+ case "\r":
$this->_bodyCanonLastChar = "\r";
break;
- case "\n" :
+ case "\n":
if ($this->_bodyCanonLastChar == "\r") {
if ($nofws) {
$this->_bodyCanonSpace = false;
@@ -461,14 +461,14 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
throw new Swift_SwiftException('Invalid new line sequence in mail found \n without preceding \r');
}
break;
- case ' ' :
- case "\t" :
+ case ' ':
+ case "\t":
case "\x09": //HTAB
if ($nofws) {
$this->_bodyCanonSpace = true;
break;
}
- default :
+ default:
if ($this->_bodyCanonEmptyCounter > 0) {
$canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
$this->_bodyCanonEmptyCounter = 0;
@@ -498,7 +498,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
{
// Init
switch ($this->_hashAlgorithm) {
- case 'rsa-sha1' :
+ case 'rsa-sha1':
$this->_hashHandler = hash_init('sha1');
break;
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index b267099a..80d39841 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -84,7 +84,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
/**
* Set the certificate location to use for signing.
*
- * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
+ * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
*
* @param string $certificate
* @param string|array $privateKey If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -117,8 +117,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
/**
* Set the certificate location to use for encryption.
*
- * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
- * @link http://nl3.php.net/manual/en/openssl.ciphers.php
+ * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+ * @see http://nl3.php.net/manual/en/openssl.ciphers.php
*
* @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
* @param int $cipher
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index 0418750f..9412b1dc 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -131,7 +131,7 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
// We try to find if the next byte is part of a search pattern
for ($j = 0; $j <= $this->_treeMaxLen; ++$j) {
// We have a new byte for a search pattern
- if (isset($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
+ if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
$search_pos = $search_pos[$buffer[$p]];
// We have a complete pattern, save, in case we don't find a better match later
if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
index d0db8b96..f64144af 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -42,6 +42,10 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
*/
public function shouldBuffer($buffer)
{
+ if ('' === $buffer) {
+ return false;
+ }
+
$endOfBuffer = substr($buffer, -1);
foreach ((array) $this->_search as $needle) {
if (false !== strpos($needle, $endOfBuffer)) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index f4d9967a..76d9e069 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -396,7 +396,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
do {
$line = $this->_buffer->readLine($seq);
$response .= $line;
- } while (null !== $line && false !== $line && ' ' != $line{3});
+ } while (null !== $line && false !== $line && ' ' != $line[3]);
} catch (Swift_TransportException $e) {
$this->_throwException($e);
} catch (Swift_IoException $e) {
@@ -491,6 +491,9 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
*/
public function __destruct()
{
- $this->stop();
+ try {
+ $this->stop();
+ } catch (Exception $e) {
+ }
}
}
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index eb04acf0..2c7deb19 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -296,9 +296,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
return explode('\\', $name);
}
- list($user, $domain) = explode('@', $name);
+ if (false !== strpos($name, '@')) {
+ list($user, $domain) = explode('@', $name);
- return array($domain, $user);
+ return array($domain, $user);
+ }
+
+ // no domain passed
+ return array('', $name);
}
/**
@@ -459,6 +464,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
}
/** HELPER FUNCTIONS */
+
/**
* Create our security buffer depending on length and offset.
*
@@ -561,6 +567,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
}
/** ENCRYPTION ALGORITHMS */
+
/**
* DES Encryption.
*
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index a220e6fa..e1f471a0 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -140,7 +140,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
*/
public function setEncryption($encryption)
{
- $encryption = strtolower($encryption);
+ $encryption = strtolower($encryption);
if ('tls' == $encryption) {
$this->_params['protocol'] = 'tcp';
$this->_params['tls'] = true;
@@ -270,8 +270,6 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
return parent::executeCommand($command, $codes, $failures);
}
- // -- Mixin invocation code
-
/** Mixin handling method for ESMTP handlers */
public function __call($method, $args)
{
@@ -281,7 +279,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
)) {
$return = call_user_func_array(array($handler, $method), $args);
// Allow fluid method calls
- if (is_null($return) && substr($method, 0, 3) == 'set') {
+ if (null === $return && substr($method, 0, 3) == 'set') {
return $this;
} else {
return $return;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
index ab3983f0..23e114b2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
@@ -20,6 +20,8 @@
* all-or-nothing result from sending.
*
* @author Chris Corbyn
+ *
+ * @deprecated since 5.4.5 (to be removed in 6.0)
*/
class Swift_Transport_MailTransport implements Swift_Transport
{
@@ -40,6 +42,8 @@ class Swift_Transport_MailTransport implements Swift_Transport
*/
public function __construct(Swift_Transport_MailInvoker $invoker, Swift_Events_EventDispatcher $eventDispatcher)
{
+ @trigger_error(sprintf('The %s class is deprecated since version 5.4.5 and will be removed in 6.0. Use the Sendmail or SMTP transport instead.', __CLASS__), E_USER_DEPRECATED);
+
$this->_invoker = $invoker;
$this->_eventDispatcher = $eventDispatcher;
}
@@ -160,11 +164,13 @@ class Swift_Transport_MailTransport implements Swift_Transport
$headers = str_replace("\r\n", PHP_EOL, $headers);
$subject = str_replace("\r\n", PHP_EOL, $subject);
$body = str_replace("\r\n", PHP_EOL, $body);
+ $to = str_replace("\r\n", PHP_EOL, $to);
} else {
// Windows, using SMTP
$headers = str_replace("\r\n.", "\r\n..", $headers);
$subject = str_replace("\r\n.", "\r\n..", $subject);
$body = str_replace("\r\n.", "\r\n..", $body);
+ $to = str_replace("\r\n.", "\r\n..", $to);
}
if ($this->_invoker->mail($to, $subject, $body, $headers, $this->_formatExtraParams($this->_extraParams, $reversePath))) {
@@ -238,6 +244,36 @@ class Swift_Transport_MailTransport implements Swift_Transport
return $path;
}
+ /**
+ * Fix CVE-2016-10074 by disallowing potentially unsafe shell characters.
+ *
+ * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+ *
+ * @param string $string The string to be validated
+ *
+ * @return bool
+ */
+ private function _isShellSafe($string)
+ {
+ // Future-proof
+ if (escapeshellcmd($string) !== $string || !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))) {
+ return false;
+ }
+
+ $length = strlen($string);
+ for ($i = 0; $i < $length; ++$i) {
+ $c = $string[$i];
+ // All other characters have a special meaning in at least one common shell, including = and +.
+ // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+ // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+ if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/**
* Return php mail extra params to use for invoker->mail.
*
@@ -249,8 +285,11 @@ class Swift_Transport_MailTransport implements Swift_Transport
private function _formatExtraParams($extraParams, $reversePath)
{
if (false !== strpos($extraParams, '-f%s')) {
- // no need to escape $reversePath) as mail() already does it
- $extraParams = empty($reversePath) ? str_replace('-f%s', '', $extraParams) : sprintf($extraParams, $reversePath);
+ if (empty($reversePath) || false === $this->_isShellSafe($reversePath)) {
+ $extraParams = str_replace('-f%s', '', $extraParams);
+ } else {
+ $extraParams = sprintf($extraParams, $reversePath);
+ }
}
return !empty($extraParams) ? $extraParams : null;
diff --git a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 5134ea48..9f2fff4b 100644
--- a/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/vendor/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -84,7 +84,6 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
if ($this->_stream) {
stream_set_blocking($this->_stream, 1);
}
-
}
}
$this->_params[$param] = $value;
@@ -292,6 +291,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
1 => array('pipe', 'w'),
2 => array('pipe', 'w'),
);
+ $pipes = array();
$this->_stream = proc_open($command, $descriptorSpec, $pipes);
stream_set_blocking($pipes[2], 0);
if ($err = stream_get_contents($pipes[2])) {
diff --git a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
index 56169c92..d575e4f2 100644
--- a/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/vendor/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -117,7 +117,7 @@ Swift_DependencyContainer::getInstance()
// As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
// see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
->register('mime.qpcontentencoder')
- ->asAliasOf(version_compare(phpversion(), '5.4.7', '>=') ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
+ ->asAliasOf(PHP_VERSION_ID >= 50407 ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
;
unset($swift_mime_types);
diff --git a/vendor/swiftmailer/swiftmailer/lib/preferences.php b/vendor/swiftmailer/swiftmailer/lib/preferences.php
index e5195014..0b430e67 100644
--- a/vendor/swiftmailer/swiftmailer/lib/preferences.php
+++ b/vendor/swiftmailer/swiftmailer/lib/preferences.php
@@ -20,6 +20,6 @@ if (@is_writable($tmpDir = sys_get_temp_dir())) {
// this should only be done when Swiftmailer won't use the native QP content encoder
// see mime_deps.php
-if (version_compare(phpversion(), '5.4.7', '<')) {
+if (PHP_VERSION_ID < 50407) {
$preferences->setQPDotEscape(false);
}
diff --git a/vendor/swiftmailer/swiftmailer/phpunit.xml.dist b/vendor/swiftmailer/swiftmailer/phpunit.xml.dist
index 0d3e698e..606c5b44 100644
--- a/vendor/swiftmailer/swiftmailer/phpunit.xml.dist
+++ b/vendor/swiftmailer/swiftmailer/phpunit.xml.dist
@@ -14,6 +14,7 @@
<ini name="intl.default_locale" value="en"/>
<ini name="intl.error_level" value="0"/>
<ini name="memory_limit" value="-1"/>
+ <ini name="error_reporting" value="-1" />
</php>
<testsuites>
@@ -32,6 +33,7 @@
</testsuites>
<listeners>
- <listener class="Mockery\Adapter\Phpunit\TestListener"/>
+ <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+ <listener class="Mockery\Adapter\Phpunit\TestListener" />
</listeners>
</phpunit>
diff --git a/vendor/symfony/monolog-bundle/CHANGELOG.md b/vendor/symfony/monolog-bundle/CHANGELOG.md
index 4e68618c..b373039b 100644
--- a/vendor/symfony/monolog-bundle/CHANGELOG.md
+++ b/vendor/symfony/monolog-bundle/CHANGELOG.md
@@ -1,5 +1,19 @@
-* 2.0.0 (2016-XX-XX)
+## 3.0.3 (2017-01-10)
- * Removed class parameters for the container configuration
- * Bumped minimum version of supported Symfony version to 2.7
- * Removed `NotFoundActivationStrategy` (the bundle now uses the class from MonologBridge)
+* Fixed deprecation notices when using Symfony 3.3+ and PHP7+
+
+## 3.0.2 (2017-01-03)
+
+* Revert disabling DebugHandler in CLI environments
+* Update configuration for slack handlers for Monolog 1.22 new options
+* Revert the removal of the DebugHandlerPass (needed for Symfony <3.2)
+
+## 3.0.1 (2016-11-15)
+
+* Removed obsolete code (DebugHandlerPass)
+
+## 3.0.0 (2016-11-06)
+
+* Removed class parameters for the container configuration
+* Bumped minimum version of supported Symfony version to 2.7
+* Removed `NotFoundActivationStrategy` (the bundle now uses the class from MonologBridge)
diff --git a/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php b/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php
index 881ecb6b..70473fe9 100644
--- a/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php
+++ b/vendor/symfony/monolog-bundle/DependencyInjection/Configuration.php
@@ -207,6 +207,24 @@ use Monolog\Logger;
* - [level]: level name or int value, defaults to DEBUG
* - [bubble]: bool, defaults to true
*
+ * - slackwebhook:
+ * - webhook_url: slack webhook URL
+ * - channel: channel name (with starting #)
+ * - [bot_name]: defaults to Monolog
+ * - [icon_emoji]: defaults to null
+ * - [use_attachment]: bool, defaults to true
+ * - [use_short_attachment]: bool, defaults to false
+ * - [include_extra]: bool, defaults to false
+ * - [level]: level name or int value, defaults to DEBUG
+ * - [bubble]: bool, defaults to true
+ *
+ * - slackbot:
+ * - team: slack team slug
+ * - token: slackbot token
+ * - channel: channel name (with starting #)
+ * - [level]: level name or int value, defaults to DEBUG
+ * - [bubble]: bool, defaults to true
+ *
* - cube:
* - url: http/udp url to the cube server
* - [level]: level name or int value, defaults to DEBUG
@@ -231,6 +249,10 @@ use Monolog\Logger;
* - [level]: level name or int value, defaults to DEBUG
* - [bubble]: bool, defaults to true
*
+ * - debug:
+ * - [level]: level name or int value, defaults to DEBUG
+ * - [bubble]: bool, defaults to true
+ *
* - loggly:
* - token: loggly api token
* - [level]: level name or int value, defaults to DEBUG
@@ -351,15 +373,17 @@ class Configuration implements ConfigurationInterface
->scalarNode('room')->end() // hipchat
->scalarNode('message_format')->defaultValue('text')->end() // hipchat
->scalarNode('api_version')->defaultNull()->end() // hipchat
- ->scalarNode('channel')->end() // slack
- ->scalarNode('bot_name')->defaultValue('Monolog')->end() // slack
- ->scalarNode('use_attachment')->defaultTrue()->end() // slack
- ->scalarNode('use_short_attachment')->defaultFalse()->end() // slack
- ->scalarNode('include_extra')->defaultFalse()->end() // slack
- ->scalarNode('icon_emoji')->defaultNull()->end() // slack
+ ->scalarNode('channel')->defaultNull()->end() // slack & slackwebhook & slackbot
+ ->scalarNode('bot_name')->defaultValue('Monolog')->end() // slack & slackwebhook
+ ->scalarNode('use_attachment')->defaultTrue()->end() // slack & slackwebhook
+ ->scalarNode('use_short_attachment')->defaultFalse()->end() // slack & slackwebhook
+ ->scalarNode('include_extra')->defaultFalse()->end() // slack & slackwebhook
+ ->scalarNode('icon_emoji')->defaultNull()->end() // slack & slackwebhook
+ ->scalarNode('webhook_url')->end() // slackwebhook
+ ->scalarNode('slack_team')->end() // slackbot
->scalarNode('notify')->defaultFalse()->end() // hipchat
->scalarNode('nickname')->defaultValue('Monolog')->end() // hipchat
- ->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar & slack
+ ->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar & slack & slackbot
->scalarNode('source')->end() // flowdock
->booleanNode('use_ssl')->defaultTrue()->end() // logentries & hipchat
->variableNode('user') // pushover
@@ -692,6 +716,14 @@ class Configuration implements ConfigurationInterface
->ifTrue(function ($v) { return 'slack' === $v['type'] && (empty($v['token']) || empty($v['channel'])); })
->thenInvalid('The token and channel have to be specified to use a SlackHandler')
->end()
+ ->validate()
+ ->ifTrue(function ($v) { return 'slackwebhook' === $v['type'] && (empty($v['webhook_url'])); })
+ ->thenInvalid('The webhook_url have to be specified to use a SlackWebhookHandler')
+ ->end()
+ ->validate()
+ ->ifTrue(function ($v) { return 'slackbot' === $v['type'] && (empty($v['stack_team']) || empty($v['token']) || empty($v['channel'])); })
+ ->thenInvalid('The stack_team, token and channel have to be specified to use a SlackbotHandler')
+ ->end()
->validate()
->ifTrue(function ($v) { return 'cube' === $v['type'] && empty($v['url']); })
->thenInvalid('The url has to be specified to use a CubeHandler')
@@ -736,6 +768,10 @@ class Configuration implements ConfigurationInterface
->thenInvalid('The source has to be specified to use a FlowdockHandler')
->end()
->end()
+ ->validate()
+ ->ifTrue(function ($v) { return isset($v['debug']); })
+ ->thenInvalid('The "debug" name cannot be used as it is reserved for the handler of the profiler')
+ ->end()
->example(array(
'syslog' => array(
'type' => 'stream',
diff --git a/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php b/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php
index 59dfd88a..09d7b54c 100644
--- a/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php
+++ b/vendor/symfony/monolog-bundle/DependencyInjection/MonologExtension.php
@@ -91,21 +91,23 @@ class MonologExtension extends Extension
}
$container->setParameter('monolog.handlers_to_channels', $handlersToChannels);
- $this->addClassesToCompile(array(
- 'Monolog\\Formatter\\FormatterInterface',
- 'Monolog\\Formatter\\LineFormatter',
- 'Monolog\\Handler\\HandlerInterface',
- 'Monolog\\Handler\\AbstractHandler',
- 'Monolog\\Handler\\AbstractProcessingHandler',
- 'Monolog\\Handler\\StreamHandler',
- 'Monolog\\Handler\\FingersCrossedHandler',
- 'Monolog\\Handler\\FilterHandler',
- 'Monolog\\Handler\\TestHandler',
- 'Monolog\\Logger',
- 'Symfony\\Bridge\\Monolog\\Logger',
- 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
- 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
- ));
+ if (PHP_VERSION_ID < 70000) {
+ $this->addClassesToCompile(array(
+ 'Monolog\\Formatter\\FormatterInterface',
+ 'Monolog\\Formatter\\LineFormatter',
+ 'Monolog\\Handler\\HandlerInterface',
+ 'Monolog\\Handler\\AbstractHandler',
+ 'Monolog\\Handler\\AbstractProcessingHandler',
+ 'Monolog\\Handler\\StreamHandler',
+ 'Monolog\\Handler\\FingersCrossedHandler',
+ 'Monolog\\Handler\\FilterHandler',
+ 'Monolog\\Handler\\TestHandler',
+ 'Monolog\\Logger',
+ 'Symfony\\Bridge\\Monolog\\Logger',
+ 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
+ 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
+ ));
+ }
}
$container->setParameter('monolog.additional_channels', isset($config['channels']) ? $config['channels'] : array());
@@ -532,6 +534,30 @@ class MonologExtension extends Extension
));
break;
+ case 'slackwebhook':
+ $definition->setArguments(array(
+ $handler['webhook_url'],
+ $handler['channel'],
+ $handler['bot_name'],
+ $handler['use_attachment'],
+ $handler['icon_emoji'],
+ $handler['use_short_attachment'],
+ $handler['include_extra'],
+ $handler['level'],
+ $handler['bubble'],
+ ));
+ break;
+
+ case 'slackbot':
+ $definition->setArguments(array(
+ $handler['slack_team'],
+ $handler['token'],
+ $handler['channel'],
+ $handler['level'],
+ $handler['bubble'],
+ ));
+ break;
+
case 'cube':
$definition->setArguments(array(
$handler['url'],
@@ -657,6 +683,7 @@ class MonologExtension extends Extension
case 'browser_console':
case 'test':
case 'null':
+ case 'debug':
$definition->setArguments(array(
$handler['level'],
$handler['bubble'],
@@ -712,6 +739,7 @@ class MonologExtension extends Extension
'browser_console' => 'Monolog\Handler\BrowserConsoleHandler',
'firephp' => 'Symfony\Bridge\Monolog\Handler\FirePHPHandler',
'chromephp' => 'Symfony\Bridge\Monolog\Handler\ChromePhpHandler',
+ 'debug' => 'Symfony\Bridge\Monolog\Handler\DebugHandler',
'swift_mailer' => 'Symfony\Bridge\Monolog\Handler\SwiftMailerHandler',
'native_mailer' => 'Monolog\Handler\NativeMailerHandler',
'socket' => 'Monolog\Handler\SocketHandler',
@@ -720,6 +748,8 @@ class MonologExtension extends Extension
'newrelic' => 'Monolog\Handler\NewRelicHandler',
'hipchat' => 'Monolog\Handler\HipChatHandler',
'slack' => 'Monolog\Handler\SlackHandler',
+ 'slackwebhook' => 'Monolog\Handler\SlackWebhookHandler',
+ 'slackbot' => 'Monolog\Handler\SlackbotHandler',
'cube' => 'Monolog\Handler\CubeHandler',
'amqp' => 'Monolog\Handler\AmqpHandler',
'error_log' => 'Monolog\Handler\ErrorLogHandler',
@@ -738,5 +768,4 @@ class MonologExtension extends Extension
return $typeToClassMapping[$handlerType];
}
-
}
diff --git a/vendor/symfony/monolog-bundle/MonologBundle.php b/vendor/symfony/monolog-bundle/MonologBundle.php
index b6931472..ba159196 100644
--- a/vendor/symfony/monolog-bundle/MonologBundle.php
+++ b/vendor/symfony/monolog-bundle/MonologBundle.php
@@ -18,6 +18,7 @@ use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\AddSwiftMailerTran
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass;
+use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass;
use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\AddProcessorsPass;
use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\FixEmptyLoggerPass;
@@ -33,6 +34,9 @@ class MonologBundle extends Bundle
parent::build($container);
$container->addCompilerPass($channelPass = new LoggerChannelPass());
+ if (!class_exists('Symfony\Bridge\Monolog\Processor\DebugProcessor') || !class_exists('Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass')) {
+ $container->addCompilerPass(new DebugHandlerPass($channelPass));
+ }
$container->addCompilerPass(new FixEmptyLoggerPass($channelPass));
$container->addCompilerPass(new AddProcessorsPass());
$container->addCompilerPass(new AddSwiftMailerTransportPass());
diff --git a/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd b/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd
index 91aa93f0..12fe3f8a 100644
--- a/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd
+++ b/vendor/symfony/monolog-bundle/Resources/config/schema/monolog-1.0.xsd
@@ -84,6 +84,8 @@
<xsd:attribute name="api_version" type="xsd:string" />
<xsd:attribute name="include-stacktraces" type="xsd:string" />
<xsd:attribute name="content-type" type="xsd:string" />
+ <xsd:attribute name="webhook-url" type="xsd:string" />
+ <xsd:attribute name="slack-team" type="xsd:string" />
</xsd:complexType>
<xsd:simpleType name="level">
diff --git a/vendor/symfony/monolog-bundle/composer.json b/vendor/symfony/monolog-bundle/composer.json
index c8578f47..1e4f120f 100644
--- a/vendor/symfony/monolog-bundle/composer.json
+++ b/vendor/symfony/monolog-bundle/composer.json
@@ -21,7 +21,7 @@
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
- "monolog/monolog": "~1.18"
+ "monolog/monolog": "~1.22"
},
"require-dev": {
"symfony/yaml": "~2.3|~3.0",
diff --git a/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php b/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php
index ca85d8ab..831a26ad 100644
--- a/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php
+++ b/vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php
@@ -141,7 +141,7 @@ class DeprecationErrorHandler
return "\x1B[{$color}m{$str}\x1B[0m";
};
} else {
- $colorize = function ($str) {return $str;};
+ $colorize = function ($str) { return $str; };
}
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
$mode = $getMode();
@@ -152,7 +152,7 @@ class DeprecationErrorHandler
restore_error_handler();
if (DeprecationErrorHandler::MODE_WEAK === $mode) {
- $colorize = function ($str) {return $str;};
+ $colorize = function ($str) { return $str; };
}
if ($currErrorHandler !== $deprecationHandler) {
echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";
diff --git a/vendor/symfony/phpunit-bridge/LICENSE b/vendor/symfony/phpunit-bridge/LICENSE
index 39fa189d..207646a0 100644
--- a/vendor/symfony/phpunit-bridge/LICENSE
+++ b/vendor/symfony/phpunit-bridge/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
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/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php b/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php
index 0d873732..843522a0 100644
--- a/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php
+++ b/vendor/symfony/phpunit-bridge/SymfonyTestsListener.php
@@ -34,6 +34,9 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
*/
public function __construct(array $mockedNamespaces = array())
{
+ \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\DeprecationErrorHandler'] = 1;
+ \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1;
+
$warn = false;
foreach ($mockedNamespaces as $type => $namespaces) {
if (!is_array($namespaces)) {
@@ -174,11 +177,14 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
{
if ($this->expectedDeprecations) {
restore_error_handler();
- try {
- $prefix = "@expectedDeprecation:\n ";
- $test->assertStringMatchesFormat($prefix.implode("\n ", $this->expectedDeprecations), $prefix.implode("\n ", $this->gatheredDeprecations));
- } catch (\PHPUnit_Framework_AssertionFailedError $e) {
- $test->getTestResultObject()->addFailure($test, $e, $time);
+
+ if (!in_array($test->getStatus(), array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR), true)) {
+ try {
+ $prefix = "@expectedDeprecation:\n";
+ $test->assertStringMatchesFormat($prefix.'%A '.implode("\n%A ", $this->expectedDeprecations)."\n%A", $prefix.' '.implode("\n ", $this->gatheredDeprecations)."\n");
+ } catch (\PHPUnit_Framework_AssertionFailedError $e) {
+ $test->getTestResultObject()->addFailure($test, $e, $time);
+ }
}
$this->expectedDeprecations = $this->gatheredDeprecations = array();
diff --git a/vendor/symfony/phpunit-bridge/bin/simple-phpunit b/vendor/symfony/phpunit-bridge/bin/simple-phpunit
index a832b68b..331ff8a0 100755
--- a/vendor/symfony/phpunit-bridge/bin/simple-phpunit
+++ b/vendor/symfony/phpunit-bridge/bin/simple-phpunit
@@ -43,6 +43,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
@unlink("$PHPUNIT_VERSION.zip");
passthru("wget https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip");
}
+ if (!class_exists('ZipArchive')) {
+ throw new \Exception('simple-phpunit requires the "zip" PHP extension to be installed and enabled in order to uncompress the downloaded PHPUnit packages.');
+ }
$zip = new ZipArchive();
$zip->open("$PHPUNIT_VERSION.zip");
$zip->extractTo(getcwd());
@@ -53,7 +56,10 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
}
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");
- passthru("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", $exit);
+ $prevRoot = getenv('COMPOSER_ROOT_VERSION');
+ putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
+ $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
+ putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
if ($exit) {
exit($exit);
}
diff --git a/vendor/symfony/phpunit-bridge/composer.json b/vendor/symfony/phpunit-bridge/composer.json
index 1cf3ef04..2d6a8667 100644
--- a/vendor/symfony/phpunit-bridge/composer.json
+++ b/vendor/symfony/phpunit-bridge/composer.json
@@ -21,7 +21,8 @@
"php": ">=5.3.3"
},
"suggest": {
- "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
+ "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader",
+ "ext-zip": "Zip support is required when using bin/simple-phpunit"
},
"autoload": {
"files": [ "bootstrap.php" ],
diff --git a/vendor/symfony/swiftmailer-bundle/CHANGELOG b/vendor/symfony/swiftmailer-bundle/CHANGELOG
index b4aa0d4e..bedbbe76 100644
--- a/vendor/symfony/swiftmailer-bundle/CHANGELOG
+++ b/vendor/symfony/swiftmailer-bundle/CHANGELOG
@@ -1,3 +1,11 @@
+* 2.4.2 (2016-12-20)
+
+ * fixed compatibility with Symfony 3.3
+
+* 2.4.1 (2016-12-20)
+
+ * added missing attachments in the web profiler
+
* 2.4.0 (2016-10-09)
* added support for setLocalDomain() and setStreamOptions()
diff --git a/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php b/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php
index 539ec5ef..9b9079a1 100644
--- a/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php
+++ b/vendor/symfony/swiftmailer-bundle/DataCollector/MessageDataCollector.php
@@ -145,6 +145,19 @@ class MessageDataCollector extends DataCollector
return $this->data['defaultMailer'] == $name;
}
+ public function extractAttachments(\Swift_Message $message)
+ {
+ $attachments = array();
+
+ foreach ($message->getChildren() as $child) {
+ if ($child instanceof \Swift_Attachment) {
+ $attachments[] = $child;
+ }
+ }
+
+ return $attachments;
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php b/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php
index 066d751f..c39e7203 100644
--- a/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php
+++ b/vendor/symfony/swiftmailer-bundle/DependencyInjection/SwiftmailerExtension.php
@@ -13,6 +13,7 @@ namespace Symfony\Bundle\SwiftmailerBundle\DependencyInjection;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -143,24 +144,24 @@ class SwiftmailerExtension extends Extension
$container->setParameter(sprintf('swiftmailer.mailer.%s.transport.smtp.%s', $name, $key), $mailer[$key]);
}
- $definitionDecorator = new DefinitionDecorator('swiftmailer.transport.eventdispatcher.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.transport.eventdispatcher.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.eventdispatcher', $name), $definitionDecorator)
;
if ('smtp' === $transport) {
- $authDecorator = new DefinitionDecorator('swiftmailer.transport.authhandler.abstract');
+ $authDecorator = $this->createChildDefinition('swiftmailer.transport.authhandler.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.authhandler', $name), $authDecorator)
->addMethodCall('setUsername', array(sprintf('%%swiftmailer.mailer.%s.transport.smtp.username%%', $name)))
->addMethodCall('setPassword', array(sprintf('%%swiftmailer.mailer.%s.transport.smtp.password%%', $name)))
->addMethodCall('setAuthMode', array(sprintf('%%swiftmailer.mailer.%s.transport.smtp.auth_mode%%', $name)));
- $bufferDecorator = new DefinitionDecorator('swiftmailer.transport.buffer.abstract');
+ $bufferDecorator = $this->createChildDefinition('swiftmailer.transport.buffer.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.buffer', $name), $bufferDecorator);
- $configuratorDecorator = new DefinitionDecorator('swiftmailer.transport.smtp.configurator.abstract');
+ $configuratorDecorator = $this->createChildDefinition('swiftmailer.transport.smtp.configurator.abstract');
$container
->setDefinition(sprintf('swiftmailer.transport.configurator.%s', $name), $configuratorDecorator)
->setArguments(array(
@@ -169,7 +170,7 @@ class SwiftmailerExtension extends Extension
))
;
- $definitionDecorator = new DefinitionDecorator('swiftmailer.transport.smtp.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.transport.smtp.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.smtp', $name), $definitionDecorator)
->setArguments(array(
@@ -192,11 +193,11 @@ class SwiftmailerExtension extends Extension
$container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
} elseif ('sendmail' === $transport) {
- $bufferDecorator = new DefinitionDecorator('swiftmailer.transport.buffer.abstract');
+ $bufferDecorator = $this->createChildDefinition('swiftmailer.transport.buffer.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.buffer', $name), $bufferDecorator);
- $configuratorDecorator = new DefinitionDecorator('swiftmailer.transport.smtp.configurator.abstract');
+ $configuratorDecorator = $this->createChildDefinition('swiftmailer.transport.smtp.configurator.abstract');
$container
->setDefinition(sprintf('swiftmailer.transport.configurator.%s', $name), $configuratorDecorator)
->setArguments(array(
@@ -205,7 +206,7 @@ class SwiftmailerExtension extends Extension
))
;
- $definitionDecorator = new DefinitionDecorator(sprintf('swiftmailer.transport.%s.abstract', $transport));
+ $definitionDecorator = $this->createChildDefinition(sprintf('swiftmailer.transport.%s.abstract', $transport));
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport), $definitionDecorator)
->setArguments(array(
@@ -217,14 +218,14 @@ class SwiftmailerExtension extends Extension
$container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
} elseif ('mail' === $transport) {
- $definitionDecorator = new DefinitionDecorator(sprintf('swiftmailer.transport.%s.abstract', $transport));
+ $definitionDecorator = $this->createChildDefinition(sprintf('swiftmailer.transport.%s.abstract', $transport));
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport), $definitionDecorator)
->addArgument(new Reference(sprintf('swiftmailer.mailer.%s.transport.eventdispatcher', $name)))
;
$container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.%s.transport.%s', $name, $transport));
} elseif ('null' === $transport) {
- $definitionDecorator = new DefinitionDecorator('swiftmailer.transport.null.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.transport.null.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.null', $name, $transport), $definitionDecorator)
->setArguments(array(
@@ -236,7 +237,7 @@ class SwiftmailerExtension extends Extension
$container->setAlias(sprintf('swiftmailer.mailer.%s.transport', $name), sprintf('swiftmailer.mailer.transport.%s', $transport));
}
- $definitionDecorator = new DefinitionDecorator('swiftmailer.mailer.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.mailer.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s', $name), $definitionDecorator)
->replaceArgument(0, new Reference(sprintf('swiftmailer.mailer.%s.transport', $name)))
@@ -255,7 +256,7 @@ class SwiftmailerExtension extends Extension
}
}
- $definitionDecorator = new DefinitionDecorator(sprintf('swiftmailer.spool.%s.abstract', $type));
+ $definitionDecorator = $this->createChildDefinition(sprintf('swiftmailer.spool.%s.abstract', $type));
if ('file' === $type) {
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.spool.file', $name), $definitionDecorator)
@@ -268,7 +269,7 @@ class SwiftmailerExtension extends Extension
}
$container->setAlias(sprintf('swiftmailer.mailer.%s.spool', $name), sprintf('swiftmailer.mailer.%s.spool.%s', $name, $type));
- $definitionDecorator = new DefinitionDecorator('swiftmailer.transport.spool.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.transport.spool.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.transport.spool', $name), $definitionDecorator)
->setArguments(array(
@@ -297,7 +298,7 @@ class SwiftmailerExtension extends Extension
{
if (isset($mailer['sender_address']) && $mailer['sender_address']) {
$container->setParameter(sprintf('swiftmailer.mailer.%s.sender_address', $name), $mailer['sender_address']);
- $definitionDecorator = new DefinitionDecorator('swiftmailer.plugin.impersonate.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.plugin.impersonate.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.plugin.impersonate', $name), $definitionDecorator)
->setArguments(array(
@@ -319,7 +320,7 @@ class SwiftmailerExtension extends Extension
if (isset($mailer['antiflood'])) {
$container->setParameter(sprintf('swiftmailer.mailer.%s.antiflood.threshold', $name), $mailer['antiflood']['threshold']);
$container->setParameter(sprintf('swiftmailer.mailer.%s.antiflood.sleep', $name), $mailer['antiflood']['sleep']);
- $definitionDecorator = new DefinitionDecorator('swiftmailer.plugin.antiflood.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.plugin.antiflood.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.plugin.antiflood', $name), $definitionDecorator)
->setArguments(array(
@@ -340,7 +341,7 @@ class SwiftmailerExtension extends Extension
$container->setParameter(sprintf('swiftmailer.mailer.%s.single_address', $name), $mailer['delivery_addresses'][0]);
$container->setParameter(sprintf('swiftmailer.mailer.%s.delivery_addresses', $name), $mailer['delivery_addresses']);
$container->setParameter(sprintf('swiftmailer.mailer.%s.delivery_whitelist', $name), $mailer['delivery_whitelist']);
- $definitionDecorator = new DefinitionDecorator('swiftmailer.plugin.redirecting.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.plugin.redirecting.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.plugin.redirecting', $name), $definitionDecorator)
->setArguments(array(
@@ -361,7 +362,7 @@ class SwiftmailerExtension extends Extension
{
if ($mailer['logging']) {
$container->getDefinition('swiftmailer.plugin.messagelogger.abstract');
- $definitionDecorator = new DefinitionDecorator('swiftmailer.plugin.messagelogger.abstract');
+ $definitionDecorator = $this->createChildDefinition('swiftmailer.plugin.messagelogger.abstract');
$container
->setDefinition(sprintf('swiftmailer.mailer.%s.plugin.messagelogger', $name), $definitionDecorator)
;
@@ -396,4 +397,13 @@ class SwiftmailerExtension extends Extension
{
return new Configuration($container->getParameter('kernel.debug'));
}
+
+ private function createChildDefinition($id)
+ {
+ if (class_exists('Symfony\Component\DependencyInjection\ChildDefinition')) {
+ return new ChildDefinition($id);
+ }
+
+ return new DefinitionDecorator($id);
+ }
}
diff --git a/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig b/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig
index bd440fcb..4a1547c8 100644
--- a/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig
+++ b/vendor/symfony/swiftmailer-bundle/Resources/views/Collector/swiftmailer.html.twig
@@ -175,6 +175,28 @@
</pre>
</div>
{% endfor %}
+
+ {% set attachments = collector.extractAttachments(message) %}
+ {% if attachments %}
+ <div class="card-block">
+ <span class="label">
+ {% if attachments|length > 1 %}
+ {{ attachments|length }} Attachments
+ {% else %}
+ 1 Attachment
+ {% endif %}
+ </span>
+
+ <ol>
+ {% for attachment in attachments %}
+ <li>
+ Filename:
+ {{ attachment.filename }}
+ </li>
+ {% endfor %}
+ </ol>
+ </div>
+ {% endif %}
</div>
{% endfor %}
{% endif %}
diff --git a/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md b/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md
index 216a2ba4..c9c3b753 100644
--- a/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md
+++ b/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
| Q | A
| ------------- | ---
-| Branch? | master / 2.7, 2.8, 3.1 or 3.2 <!--see comment below-->
+| Branch? | master / 2.7, 2.8 or 3.2 <!--see comment below-->
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
diff --git a/vendor/symfony/symfony/.github/build-packages.php b/vendor/symfony/symfony/.github/build-packages.php
index ec629998..02a22397 100644
--- a/vendor/symfony/symfony/.github/build-packages.php
+++ b/vendor/symfony/symfony/.github/build-packages.php
@@ -43,16 +43,20 @@ foreach ($dirs as $k => $dir) {
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
exit(1);
}
- $package->version = str_replace('-dev', '.999', $package->extra->{'branch-alias'}->{'dev-master'});
+ $package->version = str_replace('-dev', '.x-dev', $package->extra->{'branch-alias'}->{'dev-master'});
$package->dist['type'] = 'tar';
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
$packages[$package->name][$package->version] = $package;
$versions = file_get_contents('https://packagist.org/packages/'.$package->name.'.json');
- $versions = json_decode($versions);
+ $versions = json_decode($versions)->package->versions;
- foreach ($versions->package->versions as $v => $package) {
+ if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
+ unset($versions->{'dev-master'});
+ }
+
+ foreach ($versions as $v => $package) {
$packages[$package->name] += array($v => $package);
}
}
diff --git a/vendor/symfony/symfony/.php_cs b/vendor/symfony/symfony/.php_cs
deleted file mode 100644
index 77701dd9..00000000
--- a/vendor/symfony/symfony/.php_cs
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-return Symfony\CS\Config\Config::create()
- ->setUsingLinter(false)
- ->setUsingCache(true)
- ->fixers(array(
- 'long_array_syntax',
- 'php_unit_construct',
- 'php_unit_dedicate_assert',
- ))
- ->finder(
- Symfony\CS\Finder\DefaultFinder::create()
- ->in(__DIR__)
- ->exclude(array(
- // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
- 'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
- 'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
- // fixture templates
- 'src/Symfony/Component/Templating/Tests/Fixtures/templates',
- 'src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
- // generated fixtures
- 'src/Symfony/Component/VarDumper/Tests/Fixtures',
- // resource templates
- 'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
- ))
- // file content autogenerated by `var_export`
- ->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
- // autogenerated xmls
- ->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_1.xml')
- ->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_2.xml')
- // yml
- ->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
- // test template
- ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
- // explicit heredoc test
- ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
- )
-;
diff --git a/vendor/symfony/symfony/.travis.yml b/vendor/symfony/symfony/.travis.yml
index 423d9260..7769d6a7 100644
--- a/vendor/symfony/symfony/.travis.yml
+++ b/vendor/symfony/symfony/.travis.yml
@@ -20,7 +20,7 @@ env:
matrix:
include:
# Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
- - php: hhvm-stable
+ - php: hhvm-3.15
sudo: required
dist: trusty
group: edge
@@ -86,16 +86,17 @@ install:
- if [[ ! $skip && $deps ]]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
- if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
- if [[ ! $skip ]]; then composer update; fi
- - if [[ ! $skip ]]; then COMPOSER_ROOT_VERSION= ./phpunit install; fi
+ - if [[ ! $skip ]]; then ./phpunit install; fi
- if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
script:
+ - REPORT=' && echo -e "\\e[32mOK\\e[0m {}\\n\\n" || (echo -e "\\e[41mKO\\e[0m {}\\n\\n" && $(exit 1))'
- if [[ $skip ]]; then echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"; fi
- - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi
+ - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'"$REPORT"; fi
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
- if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
- if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
- - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi
- - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi
+ - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY"$REPORT"; fi
+ - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'"$REPORT"; fi
# Test the PhpUnit bridge using the original phpunit script
- if [[ $deps = low ]]; then (cd src/Symfony/Bridge/PhpUnit && phpenv global 5.3 && php --version && composer update && phpunit); fi
diff --git a/vendor/symfony/symfony/CHANGELOG-3.1.md b/vendor/symfony/symfony/CHANGELOG-3.1.md
index 228cbff5..36efff58 100644
--- a/vendor/symfony/symfony/CHANGELOG-3.1.md
+++ b/vendor/symfony/symfony/CHANGELOG-3.1.md
@@ -7,6 +7,90 @@ in 3.1 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
+* 3.1.9 (2017-01-12)
+
+ * bug #21218 [Form] DateTimeToLocalizedStringTransformer does not use timezone when using date only (magnetik)
+ * bug #20605 [Ldap] Always have a valid connection when using the EntryManager (bobvandevijver)
+ * bug #21104 [FrameworkBundle] fix IPv6 address handling in server commands (xabbuh)
+ * bug #20793 [Validator] Fix caching of constraints derived from non-serializable parents (uwej711)
+ * bug #19586 [TwigBundle] Fix bug where namespaced paths don't take parent bundles in account (wesleylancel)
+ * bug #21237 [FrameworkBundle] Fix relative paths used as cache keys (nicolas-grekas)
+ * bug #21183 [Validator] respect groups when merging constraints (xabbuh)
+ * bug #21179 [TwigBundle] Fixing regression in TwigEngine exception handling (Bertalan Attila)
+ * bug #21220 [DI] Fix missing new line after private alias (ogizanagi)
+ * bug #21211 Classloader tmpname (lyrixx)
+ * bug #21205 [TwigBundle] fixed usage when Templating is not installed (fabpot)
+ * bug #21155 [Validator] Check cascasdedGroups for being countable (scaytrase)
+ * bug #21200 [Filesystem] Check that directory is writable after created it in dumpFile() (chalasr)
+ * bug #21165 [Serializer] int is valid when float is expected when deserializing JSON (dunglas)
+ * bug #21166 [Cache] Fix order of writes in ChainAdapter (nicolas-grekas)
+ * bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
+ * bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
+ * bug #20925 [HttpFoundation] Validate/cast cookie expire time (ro0NL)
+ * bug #21032 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService (lyrixx)
+ * bug #21078 [Console] Escape default value when dumping help (lyrixx)
+ * bug #21076 [Console] OS X Can't call cli_set_process_title php without superuser (ogizanagi)
+ * bug #20900 [Console] Descriptors should use Helper::strlen (ogizanagi)
+ * bug #21025 [Cache] remove is_writable check on filesystem cache (4rthem)
+ * bug #21064 [Debug] Wrap call to ->log in a try catch block (lyrixx)
+ * bug #21010 [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes (SpacePossum)
+ * bug #20991 [cache] Bump RedisAdapter default timeout to 5s (Nicofuma)
+ * bug #20859 Avoid warning in PHP 7.2 because of non-countable data (wouterj)
+ * bug #21053 [Validator] override property constraints in child class (xabbuh)
+ * bug #21034 [FrameworkBundle] Make TemplateController working without the Templating component (dunglas)
+ * bug #20970 [Console] Fix question formatting using SymfonyStyle::ask() (chalasr, ogizanagi)
+ * bug #20999 [HttpKernel] Continuation of #20599 for 3.1 (ro0NL)
+ * bug #20975 [Form] fix group sequence based validation (xabbuh)
+ * bug #20599 [WebProfilerBundle] Display multiple HTTP headers in WDT (ro0NL)
+ * bug #20799 [TwigBundle] do not try to register incomplete definitions (xabbuh)
+ * bug #20961 [Validator] phpize default option values (xabbuh)
+ * bug #20934 [FrameworkBundle] Fix PHP form templates on translatable attributes (ro0NL)
+ * bug #20957 [FrameworkBundle] test for the Validator component to be present (xabbuh)
+ * bug #20936 [DependencyInjection] Fix on-invalid attribute type in xsd (ogizanagi)
+ * bug #20931 [VarDumper] Fix dumping by-ref variadics (nicolas-grekas)
+ * bug #20734 [Security] AbstractVoter->supportsAttribute gives false positive if attribute is zero (0) (martynas-foodpanda)
+ * bug #14082 [config] Fix issue when key removed and left value only (zerustech)
+ * bug #20910 [HttpFoundation] Fix cookie to string conversion for raw cookies (ro0NL)
+ * bug #20847 [Console] fixed BC issue with static closures (araines)
+
+* 3.1.8 (2016-12-13)
+
+ * bug #20714 [FrameworkBundle] Fix unresolved parameters from default configs in debug:config (chalasr)
+ * bug #20442 [FrameworkBundle] Bundle commands are not available via find() (julienfalque)
+ * bug #20840 [WebProfilerBundle] add dependency on Twig (xabbuh)
+ * bug #20828 [Validator] Fix init of YamlFileLoader::$classes for empty files (nicolas-grekas)
+ * bug #20745 [Validator] add class name to the cache key (Simperfit)
+ * bug #20530 [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize (dunglas)
+ * bug #19141 Throw less misleading exception when property access not found (bramtweedegolf)
+ * bug #20539 Cast result to int before adding to it (alcaeus)
+ * bug #20831 [Twig] Fix deprecations with Twig 1.29 (nicolas-grekas)
+ * bug #20816 [FrameworkBundle] Removed kernel.debug from the cache pool namespace seed (Sander Toonen)
+ * bug #20646 Maintain the selected panel when redirecting to another profile (javiereguiluz)
+ * bug #20767 [Cache] Fix dumping SplDoublyLinkedList iter mode (nicolas-grekas)
+ * bug #20736 [Console] fixed PHP7 Errors when not using Dispatcher (keradus)
+ * bug #20756 [HttpKernel] Regression test for missing controller arguments (iltar)
+ * bug #20755 [HttpKernel] Regression test for missing controller arguments (iltar)
+ * bug #20732 fix the inline level for dumped multi-line strings (xabbuh)
+ * bug #20418 [Form][DX] FileType "multiple" fixes (yceruto)
+ * bug #19902 [DependencyInjection] PhpDumper.php: hasReference() shouldn't search references in lazy service. (antanas-arvasevicius)
+ * bug #20704 [Console] Fix wrong handling of multiline arg/opt descriptions (ogizanagi)
+ * bug #20712 [TwigBundle] Fix twig loader registered twice (ogizanagi)
+ * bug #20716 [WebProfilerBundle] Fix dump block is unfairly restrained (ogizanagi)
+ * bug #20671 [Config] ConfigCache::isFresh() should return false when unserialize() fails (nicolas-grekas)
+ * bug #20676 [ClassLoader] Use only forward slashes in generated class map (nicolas-grekas)
+ * bug #20664 [Validator] ensure the proper context for nested validations (xabbuh)
+ * bug #20661 bug #20653 [WebProfilerBundle] Profiler includes ghost panels (jzawadzki)
+ * bug #20374 [FrameworkBundle] Improve performance of ControllerNameParser (enumag)
+ * bug #20474 [Routing] Fail properly when a route parameter name cannot be used as a PCRE subpattern name (fancyweb)
+ * bug #20566 [DI] Initialize properties before method calls (ro0NL)
+ * bug #20609 [DI] Fixed custom services definition BC break introduced in ec7e70fb… (kiler129)
+ * bug #20598 [DI] Aliases should preserve the aliased invalid behavior (nicolas-grekas)
+ * bug #20600 [Process] Fix process continuing after reached timeout using getIterator() (chalasr)
+ * bug #20602 [HttpKernel] Revert BC breaking change of Request::isMethodSafe() (nicolas-grekas)
+ * bug #20499 [Doctrine][Form] support large integers (xabbuh)
+ * bug #20576 [Process] Do feat test before enabling TTY mode (nicolas-grekas)
+ * bug #20577 [FrameworkBundle] Mark cache.default_*_provider services private (nicolas-grekas)
+
* 3.1.7 (2016-11-21)
* bug #20550 [YAML] Fix processing timestamp strings with timezone (myesain)
diff --git a/vendor/symfony/symfony/CHANGELOG-3.2.md b/vendor/symfony/symfony/CHANGELOG-3.2.md
index 39dd7fa8..2d191a0e 100644
--- a/vendor/symfony/symfony/CHANGELOG-3.2.md
+++ b/vendor/symfony/symfony/CHANGELOG-3.2.md
@@ -7,6 +7,105 @@ in 3.2 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.2.0...v3.2.1
+* 3.2.3 (2017-02-06)
+
+ * bug #21528 [Cache] Fix class exists checks in PhpArrayAdapter (nicolas-grekas)
+ * bug #20844 [Config] Fix checking cache for non existing meta file (hason)
+ * bug #21063 [Form] Fixed DateType format option for single text widget (HeahDude)
+ * bug #21430 Casting TableCell value to string. (jaydiablo)
+ * bug #21359 [FrameworkBundle] fixed custom domain for translations in php templates (robinlehrmann)
+ * bug #21485 [Process] Non ASCII characters disappearing during the escapeshellarg (GuillaumeVerdon)
+ * bug #21370 [FrameworkBundle] Execute the PhpDocExtractor earlier (GuilhemN)
+ * bug #21462 [BrowserKit] ignore invalid cookies expires date format (xabbuh)
+ * bug #21438 [Console] Fix TableCell issues with decoration (ogizanagi)
+ * bug #21431 [DoctrineBridge] always check for all fields to be mapped (xabbuh)
+ * bug #21360 [PropertyAccess] Handle interfaces in the invalid argument exception (fancyweb)
+ * bug #21403 [DI] Fix defaults overriding empty strings in AutowirePass (nicolas-grekas)
+ * bug #21401 [Debug] Workaround "null" $context (nicolas-grekas)
+ * bug #21381 [FrameworkBundle] Dont wire "annotations.cached_reader" before removing passes (nicolas-grekas)
+ * bug #21387 Fix double escaping of the decision attributes in the profiler (stof)
+ * bug #21372 [DependencyInjection] Fixed variadic method parameter in autowired classes (brainexe)
+ * bug #21338 [Cache] Fix tags expiration (nicolas-grekas)
+ * bug #21333 [HttpKernel] Fix ArgumentValueResolver for arguments default null (chalasr)
+ * bug #20871 [HttpKernel] Give higher priority to adding request formats (akeeman)
+ * bug #21332 [PropertyInfo] Don't try to access a property thru a static method (dunglas)
+ * bug #21336 [PhpUnit] Blacklist DeprecationErrorHandler in stack traces (nicolas-grekas)
+ * bug #21331 [PropertyInfo] Exclude static methods form properties guessing (dunglas)
+ * bug #21280 [Workflow] Fixed support of multiple transitions with the same name. (lyrixx)
+ * bug #21271 [Workflow] Added new validator to make sure each place has unique translation names (Nyholm)
+ * bug #21323 [Cache] [PdoAdapter] Fix MySQL 1170 error (blob as primary key) (akeeman)
+ * bug #21318 Don't add csp-headers if none are required (arjenm)
+ * bug #21291 [Ldap] Ldap username case fix (quentinus95)
+ * bug #21311 [Debug] Fix fatal error when changing ErrorHandler loggers if an exception is buffered (skalpa)
+ * bug #21288 [Doctrine Bridge] fix UniqueEntityValidator for composite object primary keys (dmaicher, HeahDude)
+ * bug #21285 [TwigBundle] do not lose already set method calls (xabbuh)
+ * bug #21279 #20411 fix Yaml parsing for very long quoted strings (RichardBradley)
+ * bug #21276 [Cache] Fix missing use statement in FilesystemAdapter (Lctrs)
+ * bug #21269 [Cache] Using strpbrk() instead of strcspn() is faster (nicolas-grekas)
+
+* 3.2.2 (2017-01-12)
+
+ * bug #21257 [Profiler][Form] Fix form profiler errors profiler_dump (ogizanagi)
+ * bug #21243 [FrameworkBundle] Fix class_exists() checks in PhpArrayAdapter-related cache warmers (nicolas-grekas, mpajunen)
+ * bug #21218 [Form] DateTimeToLocalizedStringTransformer does not use timezone when using date only (magnetik)
+ * bug #20605 [Ldap] Always have a valid connection when using the EntryManager (bobvandevijver)
+ * bug #21104 [FrameworkBundle] fix IPv6 address handling in server commands (xabbuh)
+ * bug #20793 [Validator] Fix caching of constraints derived from non-serializable parents (uwej711)
+ * bug #19586 [TwigBundle] Fix bug where namespaced paths don't take parent bundles in account (wesleylancel)
+ * bug #21237 [FrameworkBundle] Fix relative paths used as cache keys (nicolas-grekas)
+ * bug #21183 [Validator] respect groups when merging constraints (xabbuh)
+ * bug #21179 [TwigBundle] Fixing regression in TwigEngine exception handling (Bertalan Attila)
+ * bug #21220 [DI] Fix missing new line after private alias (ogizanagi)
+ * bug #21211 Classloader tmpname (lyrixx)
+ * bug #21205 [TwigBundle] fixed usage when Templating is not installed (fabpot)
+ * bug #21155 [Validator] Check cascasdedGroups for being countable (scaytrase)
+ * bug #21200 [Filesystem] Check that directory is writable after created it in dumpFile() (chalasr)
+ * bug #21186 [Bridge/PhpUnit] Relax expectedDeprecation for forward compat (nicolas-grekas)
+ * bug #21184 [FrameworkBundle] Remove Response* from classes to compile (nicolas-grekas)
+ * bug #21165 [Serializer] int is valid when float is expected when deserializing JSON (dunglas)
+ * bug #21167 [Cache] Remove silenced warning tiggered by PhpArrayAdapter (nicolas-grekas)
+ * bug #21166 [Cache] Fix order of writes in ChainAdapter (nicolas-grekas)
+ * bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
+ * bug #20995 [DependencyInjection] Fix the priority order of compiler pass trait (francoispluchino)
+ * bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
+ * bug #21143 [PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing (nicolas-grekas)
+ * bug #20925 [HttpFoundation] Validate/cast cookie expire time (ro0NL)
+ * bug #21138 [PhpUnitBridge] skip tests with failure and error states too (xabbuh)
+ * bug #21135 [PhpUnitBridge] hide stack trace of expected deprecation failures (xabbuh)
+ * bug #21117 [Yaml] add missing indicator character (xabbuh)
+ * bug #21121 [PhpUnitBridge] respect skipped and incomplete tests (xabbuh)
+ * bug #21032 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService (lyrixx)
+ * bug #21078 [Console] Escape default value when dumping help (lyrixx)
+ * bug #21076 [Console] OS X Can't call cli_set_process_title php without superuser (ogizanagi)
+ * bug #20900 [Console] Descriptors should use Helper::strlen (ogizanagi)
+ * bug #21025 [Cache] remove is_writable check on filesystem cache (4rthem)
+ * bug #21064 [Debug] Wrap call to ->log in a try catch block (lyrixx)
+ * bug #21069 [Debug] Fixed cast of stream (lyrixx)
+ * bug #21010 [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes (SpacePossum)
+ * bug #20991 [cache] Bump RedisAdapter default timeout to 5s (Nicofuma)
+ * bug #20959 [FrameworkBundle] Ignore AnnotationException exceptions in the AnnotationsCacheWarmer (fancyweb)
+ * bug #20795 [FrameworkBundle] Allow multiple transitions with the same name (Padam87)
+ * bug #20859 Avoid warning in PHP 7.2 because of non-countable data (wouterj)
+ * bug #21053 [Validator] override property constraints in child class (xabbuh)
+ * bug #21034 [FrameworkBundle] Make TemplateController working without the Templating component (dunglas)
+ * bug #20970 [Console] Fix question formatting using SymfonyStyle::ask() (chalasr, ogizanagi)
+ * bug #20999 [HttpKernel] Continuation of #20599 for 3.1 (ro0NL)
+ * bug #20975 [Form] fix group sequence based validation (xabbuh)
+ * bug #20599 [WebProfilerBundle] Display multiple HTTP headers in WDT (ro0NL)
+ * bug #20799 [TwigBundle] do not try to register incomplete definitions (xabbuh)
+ * bug #20961 [Validator] phpize default option values (xabbuh)
+ * bug #20934 [FrameworkBundle] Fix PHP form templates on translatable attributes (ro0NL)
+ * bug #20957 [FrameworkBundle] test for the Validator component to be present (xabbuh)
+ * bug #20936 [DependencyInjection] Fix on-invalid attribute type in xsd (ogizanagi)
+ * bug #20931 [VarDumper] Fix dumping by-ref variadics (nicolas-grekas)
+ * bug #20749 [FrameworkBundle] Smarter default for framework.annotations (ogizanagi)
+ * bug #20734 [Security] AbstractVoter->supportsAttribute gives false positive if attribute is zero (0) (martynas-foodpanda)
+ * bug #14082 [config] Fix issue when key removed and left value only (zerustech)
+ * bug #20910 [HttpFoundation] Fix cookie to string conversion for raw cookies (ro0NL)
+ * bug #20909 Fix misresolved parameters in debug:config on 3.2 (chalasr)
+ * bug #20904 [TwigBundle] Config is now a hard dependency (dunglas)
+ * bug #20847 [Console] fixed BC issue with static closures (araines)
+
* 3.2.1 (2016-12-13)
* bug #20891 Add support for REDIS_URL environment variables. (robinvdvleuten)
diff --git a/vendor/symfony/symfony/CONTRIBUTING.md b/vendor/symfony/symfony/CONTRIBUTING.md
index ae18925c..7902d9af 100644
--- a/vendor/symfony/symfony/CONTRIBUTING.md
+++ b/vendor/symfony/symfony/CONTRIBUTING.md
@@ -5,6 +5,7 @@ Symfony is an open source, community-driven project.
If you'd like to contribute, please read the following documents:
+* [Reviewing issues/pull requests][0]
* [Reporting a Bug][1]
* [Submitting a Patch][2]
* [Symfony Core Team][3]
@@ -14,6 +15,7 @@ If you'd like to contribute, please read the following documents:
* [Coding Standards][7]
* [Conventions][8]
+[0]: https://symfony.com/doc/current/contributing/community/reviews.html
[1]: https://symfony.com/doc/current/contributing/code/bugs.html
[2]: https://symfony.com/doc/current/contributing/code/patches.html
[3]: https://symfony.com/doc/current/contributing/code/core_team.html
diff --git a/vendor/symfony/symfony/CONTRIBUTORS.md b/vendor/symfony/symfony/CONTRIBUTORS.md
index c5fb26e0..f740b56a 100644
--- a/vendor/symfony/symfony/CONTRIBUTORS.md
+++ b/vendor/symfony/symfony/CONTRIBUTORS.md
@@ -27,15 +27,16 @@ Symfony is the result of the work of many people who made the code better
- Karma Dordrak (drak)
- Lukas Kahwe Smith (lsmith)
- Martin Hasoň (hason)
+ - Grégoire Pineau (lyrixx)
- Jeremy Mikola (jmikola)
- Jean-François Simon (jfsimon)
- - Grégoire Pineau (lyrixx)
- Benjamin Eberlei (beberlei)
- Igor Wiedler (igorw)
- Eriksen Costa (eriksencosta)
+ - Maxime Steinhausser (ogizanagi)
- Jules Pietri (heah)
+ - Robin Chalas (chalas_r)
- Sarah Khalil (saro0h)
- - Maxime Steinhausser (ogizanagi)
- Jonathan Wage (jwage)
- Diego Saint Esteben (dosten)
- Alexandre Salomé (alexandresalome)
@@ -45,17 +46,17 @@ Symfony is the result of the work of many people who made the code better
- stealth35 (stealth35)
- Alexander Mols (asm89)
- Bulat Shakirzyanov (avalanche123)
- - Robin Chalas (chalas_r)
- Saša Stamenković (umpirsky)
- Henrik Bjørnskov (henrikbjorn)
- Miha Vrhovnik
- - Diego Saint Esteben (dii3g0)
- Ener-Getick (energetick)
+ - Diego Saint Esteben (dii3g0)
- Konstantin Kudryashov (everzet)
+ - Iltar van der Berg (kjarli)
+ - Roland Franssen (ro0)
- Bilal Amarni (bamarni)
- Florin Patan (florinpatan)
- Peter Rehm (rpet)
- - Iltar van der Berg (kjarli)
- Kevin Bond (kbond)
- Andrej Hudec (pulzarraider)
- Gábor Egyed (1ed)
@@ -69,24 +70,23 @@ Symfony is the result of the work of many people who made the code better
- Henrik Westphal (snc)
- Dariusz Górecki (canni)
- Douglas Greenshields (shieldo)
+ - Titouan Galopin (tgalopin)
- Konstantin Myakshin (koc)
- Lee McDermott
- Brandon Turner
- Luis Cordova (cordoval)
- Graham Campbell (graham)
- - Titouan Galopin (tgalopin)
- Daniel Holmes (dholmes)
- Pierre du Plessis (pierredup)
+ - Toni Uebernickel (havvg)
- Bart van den Burg (burgov)
- Jordan Alliot (jalliot)
- John Wards (johnwards)
- - Toni Uebernickel (havvg)
- Fran Moreno (franmomu)
+ - Jáchym Toušek (enumag)
- Antoine Hérault (herzult)
- Paráda József (paradajozsef)
- - Roland Franssen (ro0)
- Dariusz Ruminski
- - Jáchym Toušek (enumag)
- Arnaud Le Blanc (arnaud-lb)
- Jérôme Tamarelle (gromnan)
- Michal Piotrowski (eventhorizon)
@@ -98,6 +98,7 @@ Symfony is the result of the work of many people who made the code better
- lenar
- Włodzimierz Gajda (gajdaw)
- Baptiste Clavié (talus)
+ - Maxime STEINHAUSSER
- Alexander Schwenn (xelaris)
- Florian Voutzinos (florianv)
- Colin Frei
@@ -120,6 +121,7 @@ Symfony is the result of the work of many people who made the code better
- Stefano Sala (stefano.sala)
- Evgeniy (ewgraf)
- Juti Noppornpitak (shiroyuki)
+ - Tobias Nyholm (tobias)
- Tigran Azatyan (tigranazatyan)
- Sebastian Hörl (blogsh)
- Daniel Gomes (danielcsgomes)
@@ -129,10 +131,10 @@ Symfony is the result of the work of many people who made the code better
- Pablo Godel (pgodel)
- Jérémie Augustin (jaugustin)
- Andréia Bohner (andreia)
+ - Yonel Ceruto González (yonelceruto)
- Rafael Dohms (rdohms)
- Arnaud Kleinpeter (nanocom)
- jwdeitch
- - Tobias Nyholm (tobias)
- Joel Wurtz (brouznouf)
- Philipp Wahala (hifi)
- Vyacheslav Pavlov
@@ -146,7 +148,6 @@ Symfony is the result of the work of many people who made the code better
- Clemens Tolboom
- Helmer Aaviksoo
- Hiromi Hishida (77web)
- - Yonel Ceruto González (yonelceruto)
- Richard van Laak (rvanlaak)
- Matthieu Ouellette-Vachon (maoueh)
- Michał Pipa (michal.pipa)
@@ -168,7 +169,6 @@ Symfony is the result of the work of many people who made the code better
- Andreas Hucks (meandmymonkey)
- Noel Guilbert (noel)
- Lars Strojny (lstrojny)
- - Maxime STEINHAUSSER
- Stepan Anchugov (kix)
- bronze1man
- sun (sun)
@@ -179,6 +179,7 @@ Symfony is the result of the work of many people who made the code better
- fivestar
- Dominique Bongiraud
- Jeremy Livingston (jeremylivingston)
+ - Michael Lee (zerustech)
- Matthieu Auger (matthieuauger)
- Leszek Prabucki (l3l0)
- François Zaninotto (fzaninotto)
@@ -187,6 +188,7 @@ Symfony is the result of the work of many people who made the code better
- John Kary (johnkary)
- Justin Hileman (bobthecow)
- Blanchon Vincent (blanchonvincent)
+ - Chris Wilkinson (thewilkybarkid)
- Michele Orselli (orso)
- Tom Van Looy (tvlooy)
- Sven Paulus (subsven)
@@ -195,6 +197,7 @@ Symfony is the result of the work of many people who made the code better
- Dawid Nowak
- Eugene Wissner
- Julien Brochet (mewt)
+ - Tristan Darricau (nicofuma)
- Sergey Linnik (linniksa)
- Michaël Perrin (michael.perrin)
- Marcel Beerta (mazen)
@@ -202,7 +205,6 @@ Symfony is the result of the work of many people who made the code better
- Jannik Zschiesche (apfelbox)
- Marco Pivetta (ocramius)
- julien pauli (jpauli)
- - Michael Lee (zerustech)
- Lorenz Schori
- Sébastien Lavoie (lavoiesl)
- Francois Zaninotto
@@ -216,20 +218,20 @@ Symfony is the result of the work of many people who made the code better
- Roman Marintšenko (inori)
- Christian Schmidt
- Xavier Montaña Carreras (xmontana)
- - Chris Wilkinson (thewilkybarkid)
- Mickaël Andrieu (mickaelandrieu)
- Xavier Perez
- Arjen Brouwer (arjenjb)
- Katsuhiro OGAWA
+ - Patrick McDougle (patrick-mcdougle)
- James Halsall (jaitsu)
- Alif Rachmawadi
- Kristen Gilden (kgilden)
+ - SpacePossum
- Pierre-Yves LEBECQ (pylebecq)
- Alex Pott
- Jakub Kucharovic (jkucharovic)
- Eugene Leonovich (rybakit)
- Filippo Tessarotto
- - Tristan Darricau (nicofuma)
- Joseph Rouff (rouffj)
- Félix Labrecque (woodspire)
- GordonsLondon
@@ -259,10 +261,10 @@ Symfony is the result of the work of many people who made the code better
- Peter Kruithof (pkruithof)
- Michael Holm (hollo)
- Marc Weistroff (futurecat)
- - SpacePossum
- Hidde Wieringa (hiddewie)
- Chris Smith (cs278)
- Florian Klein (docteurklein)
+ - Julien Falque (julienfalque)
- Oleg Voronkovich
- Manuel Kiessling (manuelkiessling)
- Daniel Wehner
@@ -277,12 +279,14 @@ Symfony is the result of the work of many people who made the code better
- Ismael Ambrosi (iambrosi)
- Uwe Jäger (uwej711)
- Aurelijus Valeiša (aurelijus)
+ - Victor Bocharsky (bocharsky_bw)
- Jan Decavele (jandc)
- Gustavo Piltcher
- Stepan Tanasiychuk (stfalcon)
- Tiago Ribeiro (fixe)
- Hidde Boomsma (hboomsma)
- John Bafford (jbafford)
+ - Pavel Batanov (scaytrase)
- Bob den Otter (bopp)
- Adrian Rudnik (kreischweide)
- Francesc Rosàs (frosas)
@@ -303,6 +307,7 @@ Symfony is the result of the work of many people who made the code better
- Matthew Lewinski (lewinski)
- Magnus Nordlander (magnusnordlander)
- alquerci
+ - Adam Prager (padam87)
- Francesco Levorato
- Vitaliy Zakharov (zakharovvi)
- Tobias Sjösten (tobiassjosten)
@@ -323,6 +328,7 @@ Symfony is the result of the work of many people who made the code better
- Clément Gautier (clementgautier)
- Eduardo Gulias (egulias)
- giulio de donato (liuggio)
+ - ShinDarth
- Stéphane PY (steph_py)
- Philipp Kräutli (pkraeutli)
- Kirill chEbba Chebunin (chebba)
@@ -331,9 +337,12 @@ Symfony is the result of the work of many people who made the code better
- Loïc Chardonnet (gnusat)
- Marek Kalnik (marekkalnik)
- Vyacheslav Salakhutdinov (megazoll)
+ - Jerzy Zawadzki (jzawadzki)
- Hassan Amouhzi
- Tamas Szijarto
- Pavel Volokitin (pvolok)
+ - François Pluchino (francoispluchino)
+ - Nicolas Dewez (nicolas_dewez)
- Endre Fejes
- Tobias Naumann (tna)
- Daniel Beyer
@@ -351,7 +360,6 @@ Symfony is the result of the work of many people who made the code better
- Xavier HAUSHERR
- Albert Jessurum (ajessu)
- Laszlo Korte
- - Pavel Batanov (scaytrase)
- Miha Vrhovnik
- Alessandro Desantis
- hubert lecorche (hlecorche)
@@ -408,6 +416,7 @@ Symfony is the result of the work of many people who made the code better
- boombatower
- Fabrice Bernhard (fabriceb)
- Jérôme Macias (jeromemacias)
+ - Andrey Astakhov (aast)
- Fabian Lange (codingfabian)
- Frank Neff (fneff)
- Roman Lapin (memphys)
@@ -418,6 +427,7 @@ Symfony is the result of the work of many people who made the code better
- Pablo Díez (pablodip)
- Kevin McBride
- Sergio Santoro
+ - Robin van der Vleuten (robinvdvleuten)
- Philipp Rieber (bicpi)
- Manuel de Ruiter (manuel)
- Eduardo Oliveira (entering)
@@ -427,7 +437,6 @@ Symfony is the result of the work of many people who made the code better
- Roy Van Ginneken (rvanginneken)
- ondrowan
- Barry vd. Heuvel (barryvdh)
- - Jerzy Zawadzki (jzawadzki)
- Evan S Kaufman (evanskaufman)
- mcben
- Jérôme Vieilledent (lolautruche)
@@ -437,9 +446,7 @@ Symfony is the result of the work of many people who made the code better
- Markus Lanthaler (lanthaler)
- Remi Collet
- Vicent Soria Durá (vicentgodella)
- - Nicolas Dewez (nicolas_dewez)
- Anthony Ferrara
- - Victor Bocharsky (bocharsky_bw)
- Ioan Negulescu
- Jakub Škvára (jskvara)
- Andrew Udvare (audvare)
@@ -477,13 +484,13 @@ Symfony is the result of the work of many people who made the code better
- Alexander Deruwe (aderuwe)
- Alain Hippolyte (aloneh)
- Dave Hulbert (dave1010)
- - François Pluchino (francoispluchino)
- Ivan Rey (ivanrey)
- Marcin Chyłek (songoq)
- Ned Schwartz
- Ziumin
- Jeremy Benoist
- Lenar Lõhmus
+ - Sander Toonen (xatoo)
- Benjamin Laugueux (yzalis)
- Zach Badgett (zachbadgett)
- Aurélien Fredouelle
@@ -510,6 +517,7 @@ Symfony is the result of the work of many people who made the code better
- Konstantin S. M. Möllers (ksmmoellers)
- Sinan Eldem
- Alexandre Dupuy (satchette)
+ - Rob Frawley 2nd
- Nahuel Cuesta (ncuesta)
- Chris Boden (cboden)
- Asmir Mustafic (goetas)
@@ -520,7 +528,9 @@ Symfony is the result of the work of many people who made the code better
- Åsmund Garfors
- Maxime Douailin
- Jean Pasdeloup (pasdeloup)
+ - Benjamin Cremer (bcremer)
- Javier López (loalf)
+ - Andreas Braun
- Reinier Kip
- Geoffrey Brier (geoffrey-brier)
- Dustin Dobervich (dustin10)
@@ -550,6 +560,7 @@ Symfony is the result of the work of many people who made the code better
- Ulumuddin Yunus (joenoez)
- Luc Vieillescazes (iamluc)
- Johann Saunier (prophet777)
+ - Samuel ROZE (sroze)
- Michael Devery (mickadoo)
- Antoine Corcy
- Artur Eshenbrener
@@ -581,6 +592,7 @@ Symfony is the result of the work of many people who made the code better
- develop
- ReenExe
- Mark Sonnabaum
+ - Thomas Royer (cydonia7)
- Richard Quadling
- jochenvdv
- Arturas Smorgun (asarturas)
@@ -588,16 +600,18 @@ Symfony is the result of the work of many people who made the code better
- Michael Piecko
- yclian
- twifty
+ - Indra Gunawan (guind)
- Peter Ward
+ - Julien DIDIER (juliendidier)
- Dominik Ritter (dritter)
- Sebastian Grodzicki (sgrodzicki)
- Martin Hujer (martinhujer)
- Pascal Helfenstein
- Baldur Rensch (brensch)
+ - Thomas Calvet
- Vladyslav Petrovych
- Alex Xandra Albert Sim
- Carson Full
- - Andrey Astakhov (aast)
- Trent Steel (trsteel88)
- Yuen-Chi Lian
- Besnik Br
@@ -613,6 +627,7 @@ Symfony is the result of the work of many people who made the code better
- michaelwilliams
- 1emming
- Leevi Graham (leevigraham)
+ - Nykopol (nykopol)
- Jordan Deitch
- Casper Valdemar Poulsen
- Josiah (josiah)
@@ -623,11 +638,13 @@ Symfony is the result of the work of many people who made the code better
- Christian Soronellas (theunic)
- Romain Gautier (mykiwi)
- Yosmany Garcia (yosmanyga)
+ - Wouter J
- Wouter de Wild
- Miroslav Sustek
- Degory Valentine
- Benoit Lévêque (benoit_leveque)
- Jeroen Fiege (fieg)
+ - Arthur de Moulins (4rthem)
- Krzysiek Łabuś
- Xavier Lacot (xavier)
- possum
@@ -635,6 +652,7 @@ Symfony is the result of the work of many people who made the code better
- Olivier Maisonneuve (olineuve)
- Masterklavi
- Francis Turmel (fturmel)
+ - Nikita Nefedov (nikita2206)
- cgonzalez
- Ben
- Jayson Xu (superjavason)
@@ -676,8 +694,10 @@ Symfony is the result of the work of many people who made the code better
- Ivan Menshykov
- David Romaní
- Patrick Allaert
+ - Fabien Bourigault (fbourigault)
- Gustavo Falco (gfalco)
- Matt Robinson (inanimatt)
+ - Ruud Kamphuis (ruudk)
- Aleksey Podskrebyshev
- Calin Mihai Pristavu
- David Marín Carreño (davefx)
@@ -696,9 +716,9 @@ Symfony is the result of the work of many people who made the code better
- abdul malik ikhsan (samsonasik)
- Henry Snoek (snoek09)
- Simone Di Maulo (toretto460)
- - Sander Toonen (xatoo)
- Christian Morgan
- Alexander Miehe (engerim)
+ - Jérôme Parmentier (lctrs)
- Morgan Auchede (mauchede)
- Don Pinkster
- Maksim Muruev
@@ -727,7 +747,6 @@ Symfony is the result of the work of many people who made the code better
- Mikhail Yurasov (mym)
- LOUARDI Abdeltif (ouardisoft)
- Robert Gruendler (pulse00)
- - Robin van der Vleuten (robinvdvleuten)
- Simon Terrien (sterrien)
- Benoît Merlet (trompette)
- Koen Kuipers
@@ -756,6 +775,7 @@ Symfony is the result of the work of many people who made the code better
- Colin O'Dell (colinodell)
- xaav
- Mahmoud Mostafa (mahmoud)
+ - Alessandro Lai
- Pieter
- Michael Tibben
- Sander Marechal
@@ -769,13 +789,13 @@ Symfony is the result of the work of many people who made the code better
- fabios
- Sander Coolen (scoolen)
- Nicolas Le Goff (nlegoff)
- - Andreas Braun
- Ben Oman
- Manuele Menozzi
- Anton Babenko (antonbabenko)
- Irmantas Šiupšinskas (irmantas)
- Danilo Silva
- Zachary Tong (polyfractal)
+ - Amrouche Hamza
- Hryhorii Hrebiniuk
- Dennis Fridrich (dfridrich)
- mcfedr (mcfedr)
@@ -804,14 +824,16 @@ Symfony is the result of the work of many people who made the code better
- Nicolas Macherey
- Lin Clark
- Jeremy David (jeremy.david)
+ - Denis Brumann (dbrumann)
- Troy McCabe
- Ville Mattila
+ - ilyes kooli
- Boris Vujicic (boris.vujicic)
- Max Beutel
+ - Antanas Arvasevicius
- nacho
- Piotr Antosik (antek88)
- Artem Lopata
- - Samuel ROZE (sroze)
- Sergey Novikov (s12v)
- Marcos Quesada (marcos_quesada)
- Matthew Vickery (mattvick)
@@ -825,6 +847,7 @@ Symfony is the result of the work of many people who made the code better
- Christian
- Sergii Smertin (nfx)
- hugofonseca (fonsecas72)
+ - Martynas Narbutas
- Bailey Parker
- Eddie Jaoude
- Haritz Iturbe (hizai)
@@ -839,9 +862,9 @@ Symfony is the result of the work of many people who made the code better
- Alex Demchenko (pilot)
- Tadas Gliaubicas (tadcka)
- Benoit Garret
- - Thomas Royer (cydonia7)
- DerManoMann
- Olaf Klischat
+ - orlovv
- Jhonny Lidfors (jhonny)
- Julien Bianchi (jubianchi)
- Robert Meijers
@@ -859,7 +882,6 @@ Symfony is the result of the work of many people who made the code better
- rpg600
- Péter Buri (burci)
- Davide Borsatto (davide.borsatto)
- - Indra Gunawan (guind)
- kaiwa
- Charles Sanquer (csanquer)
- Albert Ganiev (helios-ag)
@@ -877,6 +899,7 @@ Symfony is the result of the work of many people who made the code better
- Taras Girnyk
- Eduardo García Sanz (coma)
- James Gilliland
+ - fduch (fduch)
- Rhodri Pugh (rodnaph)
- David de Boer (ddeboer)
- Klaus Purer
@@ -900,6 +923,7 @@ Symfony is the result of the work of many people who made the code better
- Krzysztof Przybyszewski
- Paul Matthews
- Juan Traverso
+ - Tarjei Huse (tarjei)
- Philipp Strube
- Christian Sciberras
- Clement Herreman (clemherreman)
@@ -950,6 +974,7 @@ Symfony is the result of the work of many people who made the code better
- Sebastian Utz
- Adrien Gallou (agallou)
- Karol Sójko (karolsojko)
+ - Grzegorz Zdanowski (kiler129)
- sl_toto (sl_toto)
- Walter Dal Mut (wdalmut)
- Albin Kerouaton
@@ -962,6 +987,7 @@ Symfony is the result of the work of many people who made the code better
- Samuel Vogel (samuelvogel)
- Berat Doğan
- Juanmi Rodriguez Cerón
+ - Andy Raines
- Anthony Ferrara
- Klaas Cuvelier (kcuvelier)
- Steve Frécinaux
@@ -987,6 +1013,7 @@ Symfony is the result of the work of many people who made the code better
- Alberto Pirovano (geezmo)
- Pete Mitchell (peterjmit)
- Tom Corrigan (tomcorrigan)
+ - Luis Galeas
- Martin Pärtel
- Noah Heck (myesain)
- Patrick Daley (padrig)
@@ -997,11 +1024,12 @@ Symfony is the result of the work of many people who made the code better
- Ahmed TAILOULOUTE (ahmedtai)
- Maxime Veber (nek-)
- Sullivan SENECHAL
+ - Dariusz Ruminski
- Tadcka
- Beth Binkovitz
- Romain Geissler
+ - Adrien Moiruad
- Tomaz Ahlin
- - Benjamin Cremer (bcremer)
- Marcus Stöhr (dafish)
- Emmanuel Vella (emmanuel.vella)
- Carsten Nielsen (phreaknerd)
@@ -1015,7 +1043,6 @@ Symfony is the result of the work of many people who made the code better
- Max Romanovsky (maxromanovsky)
- Mathieu Morlon
- Daniel Tschinder
- - Nykopol (nykopol)
- Rafał Muszyński (rafmus90)
- Timothy Anido (xanido)
- Rick Prent
@@ -1024,6 +1051,7 @@ Symfony is the result of the work of many people who made the code better
- Damien Tournoud
- Jon Gotlin (jongotlin)
- Michael Dowling (mtdowling)
+ - Karlos Presumido (oneko)
- BilgeXA
- r1pp3rj4ck
- Robert Queck
@@ -1093,7 +1121,6 @@ Symfony is the result of the work of many people who made the code better
- Adrian Olek (adrianolek)
- Przemysław Piechota (kibao)
- Leonid Terentyev (li0n)
- - Adam Prager (padam87)
- ryunosuke
- victoria
- Francisco Facioni (fran6co)
@@ -1152,6 +1179,7 @@ Symfony is the result of the work of many people who made the code better
- Julius Beckmann
- Romain Dorgueil
- Grayson Koonce (breerly)
+ - Fabien LUCAS (flucas2)
- Karim Cassam Chenaï (ka)
- Nicolas Bastien (nicolas_bastien)
- Denis (yethee)
@@ -1200,7 +1228,6 @@ Symfony is the result of the work of many people who made the code better
- Bram Van der Sype (brammm)
- Guile (guile)
- Julien Moulin (lizjulien)
- - Nikita Nefedov (nikita2206)
- Mauro Foti (skler)
- Yannick Warnier (ywarnier)
- Kevin Decherf
@@ -1223,7 +1250,9 @@ Symfony is the result of the work of many people who made the code better
- Tischoi
- J Bruni
- Alexey Prilipko
+ - vlakoff
- bertillon
+ - Bertalan Attila
- Yannick Bensacq (cibou)
- Luca Genuzio (genuzio)
- Hans Nilsson (hansnilsson)
@@ -1242,7 +1271,6 @@ Symfony is the result of the work of many people who made the code better
- Joel Marcey
- David Christmann
- root
- - Wouter J
- James Hudson
- Tom Maguire
- David Zuelke
@@ -1254,11 +1282,11 @@ Symfony is the result of the work of many people who made the code better
- Jan Eichhorn (exeu)
- Grégory Pelletier (ip512)
- John Nickell (jrnickell)
- - Julien DIDIER (juliendidier)
- Martin Mayer (martin)
- Grzegorz Łukaszewicz (newicz)
- Götz Gottwald
- Veres Lajos
+ - Michael Babker
- grifx
- Robert Campbell
- Matt Lehner
@@ -1297,6 +1325,7 @@ Symfony is the result of the work of many people who made the code better
- ddebree
- Tomas Liubinas
- Alex
+ - Patrick Dawkins
- Klaas Naaijkens
- Daniel González Cerviño
- Rafał
@@ -1319,16 +1348,15 @@ Symfony is the result of the work of many people who made the code better
- Jelle Bekker (jbekker)
- Ian Jenkins (jenkoian)
- Jorge Martin (jorgemartind)
- - Julien Falque (julienfalque)
- Kevin Herrera (kherge)
- Luis Ramón López López (lrlopez)
- Muriel (metalmumu)
- Michael Pohlers (mick_the_big)
- Cayetano Soriano Gallego (neoshadybeat)
- Ondrej Machulda (ondram)
- - Patrick McDougle (patrick-mcdougle)
- Pablo Monterde Perez (plebs)
- Jimmy Leger (redpanda)
+ - Marcin Szepczynski (szepczynski)
- Cyrille Jouineau (tuxosaurus)
- Yorkie Chadwick (yorkie76)
- Yanick Witschi
@@ -1341,6 +1369,7 @@ Symfony is the result of the work of many people who made the code better
- Saem Ghani
- Stefan Oderbolz
- Curtis
+ - Gabriel Moreira
- Alexey Popkov
- Joseph Deray
- Damian Sromek
@@ -1350,6 +1379,7 @@ Symfony is the result of the work of many people who made the code better
- Arnaud Buathier (arnapou)
- chesteroni (chesteroni)
- Mauricio Lopez (diaspar)
+ - HADJEDJ Vincent (hadjedjvincent)
- Daniele Cesarini (ijanki)
- Ismail Asci (ismailasci)
- Simon CONSTANS (kosssi)
@@ -1362,6 +1392,7 @@ Symfony is the result of the work of many people who made the code better
- Wotre
- goohib
- Xavier HAUSHERR
+ - Edwin Hageman
- Mantas Urnieža
- Cas
- Dusan Kasan
@@ -1393,6 +1424,7 @@ Symfony is the result of the work of many people who made the code better
- Dariusz Czech
- Anonymous User
- Eric J. Duran
+ - Alexandru Bucur
- cmfcmf
- Drew Butler
- Steve Müller
@@ -1477,18 +1509,19 @@ Symfony is the result of the work of many people who made the code better
- Daniel Basten (axhm3a)
- Bill Hance (billhance)
- Bernd Matzner (bmatzner)
+ - Bram Tweedegolf (bram_tweedegolf)
- Choong Wei Tjeng (choonge)
- Kousuke Ebihara (co3k)
- Loïc Vernet (coil)
- Christoph Schaefer (cvschaefer)
- Damon Jones (damon__jones)
+ - Łukasz Giza (destroyer)
- Daniel Londero (dlondero)
- Sebastian Landwehr (dword123)
- Adel ELHAIBA (eadel)
- Damián Nohales (eagleoneraptor)
- Elliot Anderson (elliot)
- Fabien D. (fabd)
- - Fabien Bourigault (fbourigault)
- Carsten Eilers (fnc)
- Sorin Gitlan (forapathy)
- Yohan Giarelli (frequence-web)
@@ -1497,6 +1530,7 @@ Symfony is the result of the work of many people who made the code better
- Arash Tabriziyan (ghost098)
- ibasaw (ibasaw)
- Vladislav Krupenkin (ideea)
+ - Imangazaliev Muhammad (imangazaliev)
- joris de wit (jdewit)
- Jérémy CROMBEZ (jeremy)
- Jose Manuel Gonzalez (jgonzalez)
@@ -1506,10 +1540,10 @@ Symfony is the result of the work of many people who made the code better
- JuntaTom (juntatom)
- Ismail Faizi (kanafghan)
- Sébastien Armand (khepin)
+ - Pierre-Chanel Gauthier (kmecnin)
- Krzysztof Menżyk (krymen)
- samuel laulhau (lalop)
- Laurent Bachelier (laurentb)
- - Jérôme Parmentier (lctrs)
- Florent Viel (luxifer)
- Matthieu Moquet (mattketmo)
- Moritz Borgmann (mborgmann)
@@ -1531,7 +1565,6 @@ Symfony is the result of the work of many people who made the code better
- Daniel Perez Pinazo (pitiflautico)
- Brayden Williams (redstar504)
- Rich Sage (richsage)
- - Ruud Kamphuis (ruudk)
- Bart Ruysseveldt (ruyss)
- Sascha Dens (saschadens)
- scourgen hung (scourgen)
diff --git a/vendor/symfony/symfony/LICENSE b/vendor/symfony/symfony/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/LICENSE
+++ b/vendor/symfony/symfony/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/UPGRADE-3.0.md b/vendor/symfony/symfony/UPGRADE-3.0.md
index 866bd981..cda0f4a0 100644
--- a/vendor/symfony/symfony/UPGRADE-3.0.md
+++ b/vendor/symfony/symfony/UPGRADE-3.0.md
@@ -1907,3 +1907,9 @@ UPGRADE FROM 2.x to 3.0
```php
$request->query->get('foo')['bar'];
```
+### Monolog Bridge
+
+ * `Symfony\Bridge\Monolog\Logger::emerg()` was removed. Use `emergency()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::crit()` was removed. Use `critical()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::err()` was removed. Use `error()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::warn()` was removed. Use `warning()` which is PSR-3 compatible.
diff --git a/vendor/symfony/symfony/UPGRADE-3.2.md b/vendor/symfony/symfony/UPGRADE-3.2.md
index e977a845..d5abb758 100644
--- a/vendor/symfony/symfony/UPGRADE-3.2.md
+++ b/vendor/symfony/symfony/UPGRADE-3.2.md
@@ -94,6 +94,11 @@ HttpFoundation
- `isInvalid`/`isSuccessful`/`isRedirection`/`isClientError`/`isServerError`
- `isOk`/`isForbidden`/`isNotFound`/`isRedirect`/`isEmpty`
+ * Checking only for cacheable HTTP methods with `Request::isMethodSafe()` is deprecated
+ since version 3.2 and will throw an exception in 4.0. Disable checking only for
+ cacheable methods by calling the method with `false` as first argument or use
+ `Request::isMethodCacheable()` instead.
+
HttpKernel
----------
@@ -128,8 +133,36 @@ Serializer
TwigBridge
----------
- * Deprecated the possibility to inject the Form Twig Renderer into the form
- extension. Inject it into the `TwigRendererEngine` instead.
+ * Injecting the Form `TwigRenderer` into the `FormExtension` is deprecated and has no more effect.
+ Upgrade Twig to `^1.30`, inject the `Twig_Environment` into the `TwigRendererEngine` and load
+ the `TwigRenderer` using the `Twig_FactoryRuntimeLoader` instead.
+
+ Before:
+
+ ```php
+ use Symfony\Bridge\Twig\Extension\FormExtension;
+ use Symfony\Bridge\Twig\Form\TwigRenderer;
+ use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+
+ // ...
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'));
+ $rendererEngine->setEnvironment($twig);
+ $twig->addExtension(new FormExtension(new TwigRenderer($rendererEngine, $csrfTokenManager)));
+ ```
+
+ After:
+
+ ```php
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'), $twig);
+ $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
+ TwigRenderer::class => function () use ($rendererEngine, $csrfTokenManager) {
+ return new TwigRenderer($rendererEngine, $csrfTokenManager);
+ },
+ )));
+ $twig->addExtension(new FormExtension());
+ ```
+
+ * Deprecated the `TwigRendererEngineInterface` interface, it will be removed in 4.0.
Validator
---------
diff --git a/vendor/symfony/symfony/UPGRADE-4.0.md b/vendor/symfony/symfony/UPGRADE-4.0.md
index 76b6b51b..cc7584de 100644
--- a/vendor/symfony/symfony/UPGRADE-4.0.md
+++ b/vendor/symfony/symfony/UPGRADE-4.0.md
@@ -151,6 +151,9 @@ HttpFoundation
- `isInvalid`/`isSuccessful`/`isRedirection`/`isClientError`/`isServerError`
- `isOk`/`isForbidden`/`isNotFound`/`isRedirect`/`isEmpty`
+ * The ability to check only for cacheable HTTP methods using `Request::isMethodSafe()` is
+ not supported anymore, use `Request::isMethodCacheable()` instead.
+
HttpKernel
----------
@@ -183,8 +186,36 @@ Translation
TwigBridge
----------
- * The possibility to inject the Form Twig Renderer into the form extension
- has been removed. Inject it into the `TwigRendererEngine` instead.
+ * Removed the possibility to inject the Form `TwigRenderer` into the `FormExtension`.
+ Upgrade Twig to `^1.30`, inject the `Twig_Environment` into the `TwigRendererEngine` and load
+ the `TwigRenderer` using the `Twig_FactoryRuntimeLoader` instead.
+
+ Before:
+
+ ```php
+ use Symfony\Bridge\Twig\Extension\FormExtension;
+ use Symfony\Bridge\Twig\Form\TwigRenderer;
+ use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+
+ // ...
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'));
+ $rendererEngine->setEnvironment($twig);
+ $twig->addExtension(new FormExtension(new TwigRenderer($rendererEngine, $csrfTokenManager)));
+ ```
+
+ After:
+
+ ```php
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'), $twig);
+ $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
+ TwigRenderer::class => function () use ($rendererEngine, $csrfTokenManager) {
+ return new TwigRenderer($rendererEngine, $csrfTokenManager);
+ },
+ )));
+ $twig->addExtension(new FormExtension());
+ ```
+
+ * Removed the `TwigRendererEngineInterface` interface.
Validator
---------
@@ -219,7 +250,7 @@ Validator
```
* The default value of the strict option of the `Choice` Constraint has been
- changed to `true` as of 4.0. If you need the the previous behaviour ensure to
+ changed to `true` as of 4.0. If you need the previous behaviour ensure to
set the option to `false`.
Yaml
diff --git a/vendor/symfony/symfony/appveyor.yml b/vendor/symfony/symfony/appveyor.yml
index 63f7319e..d5c663d5 100644
--- a/vendor/symfony/symfony/appveyor.yml
+++ b/vendor/symfony/symfony/appveyor.yml
@@ -3,7 +3,7 @@ clone_depth: 1
clone_folder: c:\projects\symfony
cache:
- - c:\projects\symfony\composer.phar
+ - composer.phar
- .phpunit -> phpunit
init:
@@ -46,13 +46,12 @@ install:
- echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
- copy /Y php.ini-max php.ini
- cd c:\projects\symfony
- - IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.2.1/composer.phar)
+ - IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
- php composer.phar self-update
- copy /Y .composer\* %APPDATA%\Composer\
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
- php composer.phar update --no-progress --ansi
- - SET COMPOSER_ROOT_VERSION=
- php phpunit install
test_script:
diff --git a/vendor/symfony/symfony/composer.json b/vendor/symfony/symfony/composer.json
index 9677a864..a1302a67 100644
--- a/vendor/symfony/symfony/composer.json
+++ b/vendor/symfony/symfony/composer.json
@@ -90,7 +90,8 @@
"symfony/phpunit-bridge": "~3.2",
"symfony/polyfill-apcu": "~1.1",
"symfony/security-acl": "~2.8|~3.0",
- "phpdocumentor/reflection-docblock": "^3.0"
+ "phpdocumentor/reflection-docblock": "^3.0",
+ "sensio/framework-extra-bundle": "^3.0.2"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0",
@@ -116,6 +117,9 @@
"**/Tests/"
]
},
+ "autoload-dev": {
+ "files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
+ },
"minimum-stability": "dev",
"extra": {
"branch-alias": {
diff --git a/vendor/symfony/symfony/phpunit b/vendor/symfony/symfony/phpunit
index f9243bcb..1e79197e 100755
--- a/vendor/symfony/symfony/phpunit
+++ b/vendor/symfony/symfony/phpunit
@@ -1,6 +1,8 @@
#!/usr/bin/env php
<?php
+// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/4f2aa873d2872a3b9782b25879fd628a0c418bc9
+
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
exit(1);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
index ed8e0a79..fe86b103 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
@@ -14,38 +14,20 @@ namespace Symfony\Bridge\Doctrine\Form;
use Doctrine\Common\Persistence\ManagerRegistry;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractExtension;
-use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
-use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
-use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
-use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
class DoctrineOrmExtension extends AbstractExtension
{
protected $registry;
- /**
- * @var PropertyAccessorInterface
- */
- private $propertyAccessor;
-
- /**
- * @var ChoiceListFactoryInterface
- */
- private $choiceListFactory;
-
- public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null)
+ public function __construct(ManagerRegistry $registry)
{
$this->registry = $registry;
- $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
- $this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor));
}
protected function loadTypes()
{
return array(
- new EntityType($this->registry, $this->propertyAccessor, $this->choiceListFactory),
+ new EntityType($this->registry),
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
index 45d0310e..6fa34345 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -139,7 +139,7 @@ class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
->method('getDatabasePlatform')
->will($this->returnValue(new MySqlPlatform()));
- $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$registry
->expects($this->any())
->method('getConnectionNames')
@@ -152,7 +152,7 @@ class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
->method('getConnection')
->will($this->returnValue($connection));
- $logger = $this->getMock('Doctrine\DBAL\Logging\DebugStack');
+ $logger = $this->getMockBuilder('Doctrine\DBAL\Logging\DebugStack')->getMock();
$logger->queries = $queries;
$collector = new DoctrineDataCollector($registry);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php
index 53ad5a0e..77d89088 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php
@@ -18,7 +18,7 @@ class ContainerAwareLoaderTest extends \PHPUnit_Framework_TestCase
{
public function testShouldSetContainerOnContainerAwareFixture()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$loader = new ContainerAwareLoader($container);
$fixture = new ContainerAwareFixture();
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
index c86ef117..85e35f9b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
@@ -15,7 +15,6 @@ class RegisterMappingsPassTest extends \PHPUnit_Framework_TestCase
public function testNoDriverParmeterException()
{
$container = $this->createBuilder(array(
-
));
$this->process($container, array(
'manager.param.one',
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php
index 6bf22c18..9c6b23ff 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php
@@ -20,7 +20,7 @@ class DoctrineParserCacheTest extends \PHPUnit_Framework_TestCase
{
public function testFetch()
{
- $doctrineCacheMock = $this->getMock('Doctrine\Common\Cache\Cache');
+ $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
$parserCache = new DoctrineParserCache($doctrineCacheMock);
$doctrineCacheMock->expects($this->once())
@@ -34,7 +34,7 @@ class DoctrineParserCacheTest extends \PHPUnit_Framework_TestCase
public function testFetchUnexisting()
{
- $doctrineCacheMock = $this->getMock('Doctrine\Common\Cache\Cache');
+ $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
$parserCache = new DoctrineParserCache($doctrineCacheMock);
$doctrineCacheMock
@@ -47,7 +47,7 @@ class DoctrineParserCacheTest extends \PHPUnit_Framework_TestCase
public function testSave()
{
- $doctrineCacheMock = $this->getMock('Doctrine\Common\Cache\Cache');
+ $doctrineCacheMock = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
$parserCache = new DoctrineParserCache($doctrineCacheMock);
$expression = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParsedExpression')
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
index 6444fd1b..f20340b0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
@@ -66,14 +66,14 @@ class DoctrineChoiceLoaderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->factory = $this->getMock('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface');
- $this->om = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
- $this->repository = $this->getMock('Doctrine\Common\Persistence\ObjectRepository');
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
+ $this->om = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();
+ $this->repository = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectRepository')->getMock();
$this->class = 'stdClass';
$this->idReader = $this->getMockBuilder('Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader')
->disableOriginalConstructor()
->getMock();
- $this->objectLoader = $this->getMock('Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface');
+ $this->objectLoader = $this->getMockBuilder('Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface')->getMock();
$this->obj1 = (object) array('name' => 'A');
$this->obj2 = (object) array('name' => 'B');
$this->obj3 = (object) array('name' => 'C');
@@ -117,7 +117,7 @@ class DoctrineChoiceLoaderTest extends \PHPUnit_Framework_TestCase
*/
public function testLegacyLoadChoiceList()
{
- $factory = $this->getMock('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface');
+ $factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
$loader = new DoctrineChoiceLoader(
$factory,
$this->om,
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
index 0cb900f6..f6b96bb2 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
@@ -86,10 +86,10 @@ class DoctrineOrmTypeGuesserTest extends \PHPUnit_Framework_TestCase
private function getGuesser(ClassMetadata $classMetadata)
{
- $em = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
+ $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();
$em->expects($this->once())->method('getClassMetaData')->with('TestEntity')->will($this->returnValue($classMetadata));
- $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$registry->expects($this->once())->method('getManagers')->will($this->returnValue(array($em)));
return new DoctrineOrmTypeGuesser($registry);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
index 8c4ec7a2..8ee44b57 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php
@@ -31,7 +31,7 @@ class MergeDoctrineCollectionListenerTest extends \PHPUnit_Framework_TestCase
{
$this->collection = new ArrayCollection(array('test'));
$this->dispatcher = new EventDispatcher();
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$this->form = $this->getBuilder()
->getForm();
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
index 57df4195..16bf4e11 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
@@ -32,7 +32,7 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
protected function getExtensions()
{
- $manager = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $manager = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$manager->expects($this->any())
->method('getManager')
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index f5752fb7..e87713f5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -1274,7 +1274,7 @@ class EntityTypeTest extends TypeTestCase
protected function createRegistryMock($name, $em)
{
- $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$registry->expects($this->any())
->method('getManager')
->with($this->equalTo($name))
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
index 6acc47fe..ddfd506c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -20,7 +20,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
*/
public function testLog($sql, $params, $logParams)
{
- $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
$dbalLogger = $this
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
@@ -52,7 +52,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
public function testLogNonUtf8()
{
- $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
$dbalLogger = $this
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
@@ -75,7 +75,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
public function testLogNonUtf8Array()
{
- $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
$dbalLogger = $this
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
@@ -106,7 +106,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
public function testLogLongString()
{
- $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
$dbalLogger = $this
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
@@ -134,7 +134,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
public function testLogUTF8LongString()
{
- $logger = $this->getMock('Psr\\Log\\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\\Log\\LoggerInterface')->getMock();
$dbalLogger = $this
->getMockBuilder('Symfony\\Bridge\\Doctrine\\Logger\\DbalLogger')
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
index 3a3a8456..3f224649 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
@@ -150,12 +150,12 @@ class EntityUserProviderTest extends \PHPUnit_Framework_TestCase
public function testLoadUserByUserNameShouldLoadUserWhenProperInterfaceProvided()
{
- $repository = $this->getMock('\Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface');
+ $repository = $this->getMockBuilder('\Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface')->getMock();
$repository->expects($this->once())
->method('loadUserByUsername')
->with('name')
->willReturn(
- $this->getMock('\Symfony\Component\Security\Core\User\UserInterface')
+ $this->getMockBuilder('\Symfony\Component\Security\Core\User\UserInterface')->getMock()
);
$provider = new EntityUserProvider(
@@ -171,7 +171,7 @@ class EntityUserProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadUserByUserNameShouldDeclineInvalidInterface()
{
- $repository = $this->getMock('\Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $repository = $this->getMockBuilder('\Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$provider = new EntityUserProvider(
$this->getManager($this->getObjectManager($repository)),
@@ -183,7 +183,7 @@ class EntityUserProviderTest extends \PHPUnit_Framework_TestCase
private function getManager($em, $name = null)
{
- $manager = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $manager = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$manager->expects($this->any())
->method('getManager')
->with($this->equalTo($name))
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index 21d39503..2881ed5f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -19,6 +19,7 @@ use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
use Symfony\Bridge\Doctrine\Test\TestRepositoryFactory;
use Symfony\Bridge\Doctrine\Tests\Fixtures\Employee;
use Symfony\Bridge\Doctrine\Tests\Fixtures\Person;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeObjectNoToStringIdEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleNameEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity;
@@ -71,7 +72,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
protected function createRegistryMock(ObjectManager $em = null)
{
- $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
$registry->expects($this->any())
->method('getManager')
->with($this->equalTo(self::EM_NAME))
@@ -100,7 +101,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
->will($this->returnValue($repositoryMock))
;
- $classMetadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
+ $classMetadata = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
$classMetadata
->expects($this->any())
->method('hasField')
@@ -146,6 +147,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity2'),
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\Person'),
$em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\Employee'),
+ $em->getClassMetadata('Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeObjectNoToStringIdEntity'),
));
}
@@ -179,7 +181,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$this->buildViolation('myMessage')
->atPath('property.path.name')
->setParameter('{{ value }}', '"Foo"')
- ->setInvalidValue('Foo')
+ ->setInvalidValue($entity2)
->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
->assertRaised();
}
@@ -204,7 +206,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$this->buildViolation('myMessage')
->atPath('property.path.bar')
->setParameter('{{ value }}', '"Foo"')
- ->setInvalidValue('Foo')
+ ->setInvalidValue($entity2)
->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
->assertRaised();
}
@@ -262,6 +264,23 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
->assertRaised();
}
+ /**
+ * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+ */
+ public function testAllConfiguredFieldsAreCheckedOfBeingMappedByDoctrineWithIgnoreNullEnabled()
+ {
+ $constraint = new UniqueEntity(array(
+ 'message' => 'myMessage',
+ 'fields' => array('name', 'name2'),
+ 'em' => self::EM_NAME,
+ 'ignoreNull' => true,
+ ));
+
+ $entity1 = new SingleIntIdEntity(1, null);
+
+ $this->validator->validate($entity1, $constraint);
+ }
+
public function testValidateUniquenessWithValidCustomErrorPath()
{
$constraint = new UniqueEntity(array(
@@ -423,7 +442,7 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$this->buildViolation('myMessage')
->atPath('property.path.single')
- ->setParameter('{{ value }}', $entity1)
+ ->setParameter('{{ value }}', 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity") identified by (id => 1)')
->setInvalidValue($entity1)
->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
->assertRaised();
@@ -456,12 +475,12 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$this->validator->validate($associated2, $constraint);
- $expectedValue = 'Object of class "Symfony\Bridge\Doctrine\Tests\Fixtures\AssociationEntity2" identified by "2"';
+ $expectedValue = 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity") identified by (id => 1)';
$this->buildViolation('myMessage')
->atPath('property.path.single')
- ->setParameter('{{ value }}', '"'.$expectedValue.'"')
- ->setInvalidValue($expectedValue)
+ ->setParameter('{{ value }}', $expectedValue)
+ ->setInvalidValue($entity1)
->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
->assertRaised();
}
@@ -617,4 +636,38 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
$entity = new Person(1, 'Foo');
$this->validator->validate($entity, $constraint);
}
+
+ public function testValidateUniquenessWithCompositeObjectNoToStringIdEntity()
+ {
+ $constraint = new UniqueEntity(array(
+ 'message' => 'myMessage',
+ 'fields' => array('objectOne', 'objectTwo'),
+ 'em' => self::EM_NAME,
+ ));
+
+ $objectOne = new SingleIntIdNoToStringEntity(1, 'foo');
+ $objectTwo = new SingleIntIdNoToStringEntity(2, 'bar');
+
+ $this->em->persist($objectOne);
+ $this->em->persist($objectTwo);
+ $this->em->flush();
+
+ $entity = new CompositeObjectNoToStringIdEntity($objectOne, $objectTwo);
+
+ $this->em->persist($entity);
+ $this->em->flush();
+
+ $newEntity = new CompositeObjectNoToStringIdEntity($objectOne, $objectTwo);
+
+ $this->validator->validate($newEntity, $constraint);
+
+ $expectedValue = 'object("Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity") identified by (id => 1)';
+
+ $this->buildViolation('myMessage')
+ ->atPath('property.path.objectOne')
+ ->setParameter('{{ value }}', $expectedValue)
+ ->setInvalidValue($objectOne)
+ ->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
+ ->assertRaised();
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 9867a277..b079770c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -12,6 +12,8 @@
namespace Symfony\Bridge\Doctrine\Validator\Constraints;
use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\ObjectManager;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
@@ -84,12 +86,14 @@ class UniqueEntityValidator extends ConstraintValidator
throw new ConstraintDefinitionException(sprintf('The field "%s" is not mapped by Doctrine, so it cannot be validated for uniqueness.', $fieldName));
}
- $criteria[$fieldName] = $class->reflFields[$fieldName]->getValue($entity);
+ $fieldValue = $class->reflFields[$fieldName]->getValue($entity);
- if ($constraint->ignoreNull && null === $criteria[$fieldName]) {
- return;
+ if ($constraint->ignoreNull && null === $fieldValue) {
+ continue;
}
+ $criteria[$fieldName] = $fieldValue;
+
if (null !== $criteria[$fieldName] && $class->hasAssociation($fieldName)) {
/* Ensure the Proxy is initialized before using reflection to
* read its identifiers. This is necessary because the wrapped
@@ -99,6 +103,12 @@ class UniqueEntityValidator extends ConstraintValidator
}
}
+ // skip validation if there are no criteria (this can happen when the
+ // "ignoreNull" option is enabled and fields to be checked are null
+ if (empty($criteria)) {
+ return;
+ }
+
if (null !== $constraint->entityClass) {
/* Retrieve repository from given entity name.
* We ensure the retrieved repository can handle the entity
@@ -141,15 +151,41 @@ class UniqueEntityValidator extends ConstraintValidator
$errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];
$invalidValue = isset($criteria[$errorPath]) ? $criteria[$errorPath] : $criteria[$fields[0]];
- if (is_object($invalidValue) && !method_exists($invalidValue, '__toString')) {
- $invalidValue = sprintf('Object of class "%s" identified by "%s"', get_class($entity), implode(', ', $class->getIdentifierValues($entity)));
- }
-
$this->context->buildViolation($constraint->message)
->atPath($errorPath)
- ->setParameter('{{ value }}', $this->formatValue($invalidValue, static::OBJECT_TO_STRING | static::PRETTY_DATE))
+ ->setParameter('{{ value }}', $this->formatWithIdentifiers($em, $class, $invalidValue))
->setInvalidValue($invalidValue)
->setCode(UniqueEntity::NOT_UNIQUE_ERROR)
->addViolation();
}
+
+ private function formatWithIdentifiers(ObjectManager $em, ClassMetadata $class, $value)
+ {
+ if (!is_object($value) || $value instanceof \DateTimeInterface) {
+ return $this->formatValue($value, self::PRETTY_DATE);
+ }
+
+ // non unique value is a composite PK
+ if ($class->getName() !== $idClass = get_class($value)) {
+ $identifiers = $em->getClassMetadata($idClass)->getIdentifierValues($value);
+ } else {
+ $identifiers = $class->getIdentifierValues($value);
+ }
+
+ if (!$identifiers) {
+ return sprintf('object("%s")', $idClass);
+ }
+
+ array_walk($identifiers, function (&$id, $field) {
+ if (!is_object($id) || $id instanceof \DateTimeInterface) {
+ $idAsString = $this->formatValue($id, self::PRETTY_DATE);
+ } else {
+ $idAsString = sprintf('object("%s")', get_class($id));
+ }
+
+ $id = sprintf('%s => %s', $field, $idAsString);
+ });
+
+ return sprintf('object("%s") identified by (%s)', $idClass, implode(', ', $identifiers));
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE b/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
index 713171cb..5e9e8dfd 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -45,7 +45,7 @@ class ConsoleHandlerTest extends \PHPUnit_Framework_TestCase
*/
public function testVerbosityMapping($verbosity, $level, $isHandling, array $map = array())
{
- $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')->getMock();
$output
->expects($this->atLeastOnce())
->method('getVerbosity')
@@ -59,7 +59,7 @@ class ConsoleHandlerTest extends \PHPUnit_Framework_TestCase
// check that the handler actually outputs the record if it handles it
$levelName = Logger::getLevelName($level);
- $realOutput = $this->getMock('Symfony\Component\Console\Output\Output', array('doWrite'));
+ $realOutput = $this->getMockBuilder('Symfony\Component\Console\Output\Output')->setMethods(array('doWrite'))->getMock();
$realOutput->setVerbosity($verbosity);
$realOutput
->expects($isHandling ? $this->once() : $this->never())
@@ -103,7 +103,7 @@ class ConsoleHandlerTest extends \PHPUnit_Framework_TestCase
public function testVerbosityChanged()
{
- $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')->getMock();
$output
->expects($this->at(0))
->method('getVerbosity')
@@ -133,7 +133,7 @@ class ConsoleHandlerTest extends \PHPUnit_Framework_TestCase
public function testWritingAndFormatting()
{
- $output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')->getMock();
$output
->expects($this->any())
->method('getVerbosity')
@@ -188,12 +188,12 @@ class ConsoleHandlerTest extends \PHPUnit_Framework_TestCase
$logger->addInfo('After terminate message.');
});
- $event = new ConsoleCommandEvent(new Command('foo'), $this->getMock('Symfony\Component\Console\Input\InputInterface'), $output);
+ $event = new ConsoleCommandEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output);
$dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
$this->assertContains('Before command message.', $out = $output->fetch());
$this->assertContains('After command message.', $out);
- $event = new ConsoleTerminateEvent(new Command('foo'), $this->getMock('Symfony\Component\Console\Input\InputInterface'), $output, 0);
+ $event = new ConsoleTerminateEvent(new Command('foo'), $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock(), $output, 0);
$dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
$this->assertContains('Before terminate message.', $out = $output->fetch());
$this->assertContains('After terminate message.', $out);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
index ca85d8ab..831a26ad 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -141,7 +141,7 @@ class DeprecationErrorHandler
return "\x1B[{$color}m{$str}\x1B[0m";
};
} else {
- $colorize = function ($str) {return $str;};
+ $colorize = function ($str) { return $str; };
}
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
$mode = $getMode();
@@ -152,7 +152,7 @@ class DeprecationErrorHandler
restore_error_handler();
if (DeprecationErrorHandler::MODE_WEAK === $mode) {
- $colorize = function ($str) {return $str;};
+ $colorize = function ($str) { return $str; };
}
if ($currErrorHandler !== $deprecationHandler) {
echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE
index 39fa189d..207646a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
index 0d873732..843522a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -34,6 +34,9 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
*/
public function __construct(array $mockedNamespaces = array())
{
+ \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\DeprecationErrorHandler'] = 1;
+ \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1;
+
$warn = false;
foreach ($mockedNamespaces as $type => $namespaces) {
if (!is_array($namespaces)) {
@@ -174,11 +177,14 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
{
if ($this->expectedDeprecations) {
restore_error_handler();
- try {
- $prefix = "@expectedDeprecation:\n ";
- $test->assertStringMatchesFormat($prefix.implode("\n ", $this->expectedDeprecations), $prefix.implode("\n ", $this->gatheredDeprecations));
- } catch (\PHPUnit_Framework_AssertionFailedError $e) {
- $test->getTestResultObject()->addFailure($test, $e, $time);
+
+ if (!in_array($test->getStatus(), array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR), true)) {
+ try {
+ $prefix = "@expectedDeprecation:\n";
+ $test->assertStringMatchesFormat($prefix.'%A '.implode("\n%A ", $this->expectedDeprecations)."\n%A", $prefix.' '.implode("\n ", $this->gatheredDeprecations)."\n");
+ } catch (\PHPUnit_Framework_AssertionFailedError $e) {
+ $test->getTestResultObject()->addFailure($test, $e, $time);
+ }
}
$this->expectedDeprecations = $this->gatheredDeprecations = array();
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index a832b68b..331ff8a0 100755
--- a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -43,6 +43,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
@unlink("$PHPUNIT_VERSION.zip");
passthru("wget https://github.com/sebastianbergmann/phpunit/archive/$PHPUNIT_VERSION.zip");
}
+ if (!class_exists('ZipArchive')) {
+ throw new \Exception('simple-phpunit requires the "zip" PHP extension to be installed and enabled in order to uncompress the downloaded PHPUnit packages.');
+ }
$zip = new ZipArchive();
$zip->open("$PHPUNIT_VERSION.zip");
$zip->extractTo(getcwd());
@@ -53,7 +56,10 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
}
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");
- passthru("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", $exit);
+ $prevRoot = getenv('COMPOSER_ROOT_VERSION');
+ putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
+ $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
+ putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
if ($exit) {
exit($exit);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json
index 1cf3ef04..2d6a8667 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/composer.json
@@ -21,7 +21,8 @@
"php": ">=5.3.3"
},
"suggest": {
- "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
+ "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader",
+ "ext-zip": "Zip support is required when using bin/simple-phpunit"
},
"autoload": {
"files": [ "bootstrap.php" ],
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
index fe98c150..77e04571 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -122,9 +122,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
unset($this->valueHolder5157dd96e88c0->$name);
}
- /**
- *
- */
public function __clone()
{
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
@@ -132,9 +129,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
}
- /**
- *
- */
public function __sleep()
{
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
@@ -142,9 +136,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
return array('valueHolder5157dd96e88c0');
}
- /**
- *
- */
public function __wakeup()
{
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
index 12409e8e..6787b9ff 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
@@ -122,9 +122,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
unset($this->valueHolder5157dd96e88c0->$name);
}
- /**
- *
- */
public function __clone()
{
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
@@ -132,9 +129,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
}
- /**
- *
- */
public function __sleep()
{
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
@@ -142,9 +136,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
return array('valueHolder5157dd96e88c0');
}
- /**
- *
- */
public function __wakeup()
{
}
@@ -168,7 +159,7 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
/**
* {@inheritdoc}
*/
- public function initializeProxy() : bool
+ public function initializeProxy(): bool
{
return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());
}
@@ -176,7 +167,7 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
/**
* {@inheritdoc}
*/
- public function isProxyInitialized() : bool
+ public function isProxyInitialized(): bool
{
return null !== $this->valueHolder5157dd96e88c0;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
index 8b2402b0..12bef7b7 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Instantiator/RuntimeInstantiatorTest.php
@@ -37,7 +37,7 @@ class RuntimeInstantiatorTest extends \PHPUnit_Framework_TestCase
public function testInstantiateProxy()
{
$instance = new \stdClass();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$definition = new Definition('stdClass');
$instantiator = function () use ($instance) {
return $instance;
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md
index 685e1c9b..dee3db5a 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -5,8 +5,37 @@ CHANGELOG
-----
* added `AppVariable::getToken()`
- * Deprecated the possibility to inject the Form Twig Renderer into the form
- extension. Inject it on TwigRendererEngine instead.
+ * Deprecated the possibility to inject the Form `TwigRenderer` into the `FormExtension`.
+ * [BC BREAK] Registering the `FormExtension` without configuring a runtime loader for the `TwigRenderer`
+ doesn't work anymore.
+
+ Before:
+
+ ```php
+ use Symfony\Bridge\Twig\Extension\FormExtension;
+ use Symfony\Bridge\Twig\Form\TwigRenderer;
+ use Symfony\Bridge\Twig\Form\TwigRendererEngine;
+
+ // ...
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'));
+ $rendererEngine->setEnvironment($twig);
+ $twig->addExtension(new FormExtension(new TwigRenderer($rendererEngine, $csrfTokenManager)));
+ ```
+
+ After:
+
+ ```php
+ // ...
+ $rendererEngine = new TwigRendererEngine(array('form_div_layout.html.twig'), $twig);
+ // require Twig 1.30+
+ $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
+ TwigRenderer::class => function () use ($rendererEngine, $csrfTokenManager) {
+ return new TwigRenderer($rendererEngine, $csrfTokenManager);
+ },
+ )));
+ $twig->addExtension(new FormExtension());
+ ```
+ * Deprecated the `TwigRendererEngineInterface` interface.
2.7.0
-----
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php
index 44e23902..d871a682 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -140,7 +140,7 @@ EOF
}
if ($type === 'functions' || $type === 'filters') {
$cb = $entity->getCallable();
- if (is_null($cb)) {
+ if (null === $cb) {
return;
}
if (is_array($cb)) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
index f9333bf6..1284cf52 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -42,7 +42,7 @@ class Scope
/**
* Opens a new child scope.
*
- * @return Scope
+ * @return self
*/
public function enter()
{
@@ -52,7 +52,7 @@ class Scope
/**
* Closes current scope and returns parent one.
*
- * @return Scope|null
+ * @return self|null
*/
public function leave()
{
@@ -67,7 +67,7 @@ class Scope
* @param string $key
* @param mixed $value
*
- * @return Scope Current scope
+ * @return $this
*
* @throws \LogicException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
index c54ad28e..d4d0b135 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -45,7 +45,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
public function testGetSession()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->method('getSession')->willReturn($session = new Session());
$this->setRequestStack($request);
@@ -69,10 +69,10 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
public function testGetToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$this->appVariable->setTokenStorage($tokenStorage);
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$tokenStorage->method('getToken')->willReturn($token);
$this->assertEquals($token, $this->appVariable->getToken());
@@ -80,7 +80,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
public function testGetUser()
{
- $this->setTokenStorage($user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'));
+ $this->setTokenStorage($user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
$this->assertEquals($user, $this->appVariable->getUser());
}
@@ -94,7 +94,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
public function testGetTokenWithNoToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$this->appVariable->setTokenStorage($tokenStorage);
$this->assertNull($this->appVariable->getToken());
@@ -102,7 +102,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
public function testGetUserWithNoToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$this->appVariable->setTokenStorage($tokenStorage);
$this->assertNull($this->appVariable->getUser());
@@ -158,7 +158,7 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
protected function setRequestStack($request)
{
- $requestStackMock = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStackMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStackMock->method('getCurrentRequest')->willReturn($request);
$this->appVariable->setRequestStack($requestStackMock);
@@ -166,10 +166,10 @@ class AppVariableTest extends \PHPUnit_Framework_TestCase
protected function setTokenStorage($user)
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$this->appVariable->setTokenStorage($tokenStorage);
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$tokenStorage->method('getToken')->willReturn($token);
$token->method('getUser')->willReturn($user);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
index 92803be9..1024bbe0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -33,7 +33,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase
$dumped = null;
$exception = null;
- $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) {$dumped = $var;});
+ $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) { $dumped = $var; });
try {
$this->assertEquals($expectedOutput, $twig->render('template'));
@@ -64,7 +64,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase
public function testDump($context, $args, $expectedOutput, $debug = true)
{
$extension = new DumpExtension(new VarCloner());
- $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array(
+ $twig = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array(
'debug' => $debug,
'cache' => false,
'optimizations' => 0,
@@ -120,7 +120,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase
'</pre><script>Sfdump("%s")</script>'
);
$extension = new DumpExtension(new VarCloner(), $dumper);
- $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array(
+ $twig = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array(
'debug' => true,
'cache' => false,
'optimizations' => 0,
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
index 7ebaa4c2..614b59f5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -47,7 +47,7 @@ class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3Hori
'bootstrap_3_horizontal_layout.html.twig',
'custom_widgets.html.twig',
), $environment);
- $this->renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
+ $this->renderer = new TwigRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
$this->registerTwigRuntimeLoader($environment, $this->renderer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
index f7919a44..aceda815 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -43,7 +43,7 @@ class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
'bootstrap_3_layout.html.twig',
'custom_widgets.html.twig',
), $environment);
- $this->renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
+ $this->renderer = new TwigRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
$this->registerTwigRuntimeLoader($environment, $this->renderer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
index f9eb355d..34058749 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -47,7 +47,7 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
'form_div_layout.html.twig',
'custom_widgets.html.twig',
), $environment);
- $this->renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
+ $this->renderer = new TwigRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
$this->registerTwigRuntimeLoader($environment, $this->renderer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
index a2726af4..8d4396a5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -44,7 +44,7 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
'form_table_layout.html.twig',
'custom_widgets.html.twig',
), $environment);
- $this->renderer = new TwigRenderer($rendererEngine, $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface'));
+ $this->renderer = new TwigRenderer($rendererEngine, $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock());
$this->registerTwigRuntimeLoader($environment, $this->renderer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
index a583f661..dc88f172 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
@@ -52,7 +52,7 @@ class HttpKernelExtensionTest extends \PHPUnit_Framework_TestCase
protected function getFragmentHandler($return)
{
- $strategy = $this->getMock('Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface');
+ $strategy = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface')->getMock();
$strategy->expects($this->once())->method('getName')->will($this->returnValue('inline'));
$strategy->expects($this->once())->method('render')->will($return);
@@ -74,7 +74,7 @@ class HttpKernelExtensionTest extends \PHPUnit_Framework_TestCase
$twig = new \Twig_Environment($loader, array('debug' => true, 'cache' => false));
$twig->addExtension(new HttpKernelExtension());
- $loader = $this->getMock('Twig_RuntimeLoaderInterface');
+ $loader = $this->getMockBuilder('Twig_RuntimeLoaderInterface')->getMock();
$loader->expects($this->any())->method('load')->will($this->returnValueMap(array(
array('Symfony\Bridge\Twig\Extension\HttpKernelRuntime', new HttpKernelRuntime($renderer)),
)));
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
index 9733cd7b..9f06b50b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
@@ -20,8 +20,8 @@ class RoutingExtensionTest extends \PHPUnit_Framework_TestCase
*/
public function testEscaping($template, $mustBeEscaped)
{
- $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
- $twig->addExtension(new RoutingExtension($this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface')));
+ $twig = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
+ $twig->addExtension(new RoutingExtension($this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock()));
$nodes = $twig->parse($twig->tokenize(new \Twig_Source($template, '')));
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
index 12ae07f8..a6c397ff 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/RuntimeLoaderProvider.php
@@ -17,7 +17,7 @@ trait RuntimeLoaderProvider
{
protected function registerTwigRuntimeLoader(\Twig_Environment $environment, TwigRenderer $renderer)
{
- $loader = $this->getMock('Twig_RuntimeLoaderInterface');
+ $loader = $this->getMockBuilder('Twig_RuntimeLoaderInterface')->getMock();
$loader->expects($this->any())->method('load')->will($this->returnValueMap(array(
array('Symfony\Bridge\Twig\Form\TwigRenderer', $renderer),
)));
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
index daca220e..fe3a6a0d 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php
@@ -53,7 +53,7 @@ class StopwatchExtensionTest extends \PHPUnit_Framework_TestCase
protected function getStopwatch($events = array())
{
$events = is_array($events) ? $events : array($events);
- $stopwatch = $this->getMock('Symfony\Component\Stopwatch\Stopwatch');
+ $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
$i = -1;
foreach ($events as $eventName) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
index 5d669cde..8507dda9 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php
@@ -19,7 +19,7 @@ class DumpNodeTest extends \PHPUnit_Framework_TestCase
{
$node = new DumpNode('bar', null, 7);
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());
$compiler = new \Twig_Compiler($env);
$expected = <<<'EOTXT'
@@ -43,7 +43,7 @@ EOTXT;
{
$node = new DumpNode('bar', null, 7);
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());
$compiler = new \Twig_Compiler($env);
$expected = <<<'EOTXT'
@@ -70,7 +70,7 @@ EOTXT;
));
$node = new DumpNode('bar', $vars, 7);
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());
$compiler = new \Twig_Compiler($env);
$expected = <<<'EOTXT'
@@ -98,7 +98,7 @@ EOTXT;
));
$node = new DumpNode('bar', $vars, 7);
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());
$compiler = new \Twig_Compiler($env);
$expected = <<<'EOTXT'
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
index dff1d5f5..8e229946 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -41,7 +41,7 @@ class FormThemeTest extends \PHPUnit_Framework_TestCase
$node = new FormThemeNode($form, $resources, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
index 31ab934f..f7ffbece 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/SearchAndRenderBlockNodeTest.php
@@ -23,7 +23,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
@@ -46,7 +46,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_widget', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
@@ -66,7 +66,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
@@ -86,7 +86,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
// "label" => null must not be included in the output!
// Otherwise the default label is overwritten with null.
@@ -108,7 +108,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
// "label" => null must not be included in the output!
// Otherwise the default label is overwritten with null.
@@ -129,7 +129,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
@@ -153,7 +153,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
// "label" => null must not be included in the output!
// Otherwise the default label is overwritten with null.
@@ -182,7 +182,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
$this->assertEquals(
sprintf(
@@ -210,7 +210,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
// "label" => null must not be included in the output!
// Otherwise the default label is overwritten with null.
@@ -247,7 +247,7 @@ class SearchAndRenderBlockNodeTest extends \PHPUnit_Framework_TestCase
$node = new SearchAndRenderBlockNode('form_label', $arguments, 0);
- $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMock('Twig_LoaderInterface')));
+ $compiler = new \Twig_Compiler(new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock()));
// "label" => null must not be included in the output!
// Otherwise the default label is overwritten with null.
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
index 4c00cdab..ec729674 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -24,7 +24,7 @@ class TransNodeTest extends \PHPUnit_Framework_TestCase
$vars = new \Twig_Node_Expression_Name('foo', 0);
$node = new TransNode($body, null, null, $vars);
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('strict_variables' => true));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('strict_variables' => true));
$compiler = new \Twig_Compiler($env);
$this->assertEquals(
@@ -49,7 +49,7 @@ class TransNodeTest extends \PHPUnit_Framework_TestCase
protected function getVariableGetterWithStrictCheck($name)
{
if (\Twig_Environment::MAJOR_VERSION >= 2) {
- return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);
+ return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%s" does not exist.\', 0, $this->getSourceContext()); })())', $name, $name, $name, $name);
}
if (PHP_VERSION_ID >= 70000) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
index f9cf08bc..86dc2526 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationDefaultDomainNodeVisitorTest.php
@@ -22,7 +22,7 @@ class TranslationDefaultDomainNodeVisitorTest extends \PHPUnit_Framework_TestCas
/** @dataProvider getDefaultDomainAssignmentTestData */
public function testDefaultDomainAssignment(\Twig_Node $node)
{
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
$visitor = new TranslationDefaultDomainNodeVisitor();
// visit trans_default_domain tag
@@ -48,7 +48,7 @@ class TranslationDefaultDomainNodeVisitorTest extends \PHPUnit_Framework_TestCas
/** @dataProvider getDefaultDomainAssignmentTestData */
public function testNewModuleWithoutDefaultDomainTag(\Twig_Node $node)
{
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
$visitor = new TranslationDefaultDomainNodeVisitor();
// visit trans_default_domain tag
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
index 16736031..571b5bba 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TranslationNodeVisitorTest.php
@@ -18,7 +18,7 @@ class TranslationNodeVisitorTest extends \PHPUnit_Framework_TestCase
/** @dataProvider getMessagesExtractionTestData */
public function testMessagesExtraction(\Twig_Node $node, array $expectedMessages)
{
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
$visitor = new TranslationNodeVisitor();
$visitor->enable();
$visitor->enterNode($node, $env);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
index 6b6a92ab..6dea9fd6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -21,7 +21,7 @@ class FormThemeTokenParserTest extends \PHPUnit_Framework_TestCase
*/
public function testCompile($source, $expected)
{
- $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
+ $env = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock(), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
$env->addTokenParser(new FormThemeTokenParser());
$stream = $env->tokenize(new \Twig_Source($source, ''));
$parser = new \Twig_Parser($env);
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
index 23869da4..4362e913 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -22,14 +22,14 @@ class TwigExtractorTest extends \PHPUnit_Framework_TestCase
*/
public function testExtract($template, $messages)
{
- $loader = $this->getMock('Twig_LoaderInterface');
+ $loader = $this->getMockBuilder('Twig_LoaderInterface')->getMock();
$twig = new \Twig_Environment($loader, array(
'strict_variables' => true,
'debug' => true,
'cache' => false,
'autoescape' => false,
));
- $twig->addExtension(new TranslationExtension($this->getMock('Symfony\Component\Translation\TranslatorInterface')));
+ $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
$extractor = new TwigExtractor($twig);
$extractor->setPrefix('prefix');
@@ -77,8 +77,8 @@ class TwigExtractorTest extends \PHPUnit_Framework_TestCase
*/
public function testExtractSyntaxError($resources)
{
- $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'));
- $twig->addExtension(new TranslationExtension($this->getMock('Symfony\Component\Translation\TranslatorInterface')));
+ $twig = new \Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());
+ $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
$extractor = new TwigExtractor($twig);
@@ -120,7 +120,7 @@ class TwigExtractorTest extends \PHPUnit_Framework_TestCase
'cache' => false,
'autoescape' => false,
));
- $twig->addExtension(new TranslationExtension($this->getMock('Symfony\Component\Translation\TranslatorInterface')));
+ $twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
$extractor = new TwigExtractor($twig);
$catalogue = new MessageCatalogue('en');
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
index e7047c35..b3eebb55 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/Tests/TwigEngineTest.php
@@ -71,7 +71,7 @@ class TwigEngineTest extends \PHPUnit_Framework_TestCase
'index' => 'foo',
'error' => '{{ foo }',
)));
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
return new TwigEngine($twig, $parser);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json
index fd73a7ea..aa5b70fc 100644
--- a/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Bridge/Twig/composer.json
@@ -22,7 +22,7 @@
"require-dev": {
"symfony/asset": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
- "symfony/form": "~3.0.4",
+ "symfony/form": "~3.1.9|^3.2.2",
"symfony/http-kernel": "~3.2",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.8|~3.0",
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE b/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE
index 39fa189d..207646a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/DebugBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
index 2c0a4356..a6fb4ed0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
+use Doctrine\Common\Annotations\AnnotationException;
use Doctrine\Common\Annotations\CachedReader;
use Doctrine\Common\Annotations\Reader;
use Psr\Cache\CacheItemPoolInterface;
@@ -35,8 +36,8 @@ class AnnotationsCacheWarmer implements CacheWarmerInterface
/**
* @param Reader $annotationReader
- * @param string $phpArrayFile The PHP file where annotations are cached.
- * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached.
+ * @param string $phpArrayFile The PHP file where annotations are cached
+ * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered annotations are cached
*/
public function __construct(Reader $annotationReader, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
{
@@ -66,19 +67,27 @@ class AnnotationsCacheWarmer implements CacheWarmerInterface
$arrayPool = new ArrayAdapter(0, false);
$reader = new CachedReader($this->annotationReader, new DoctrineProvider($arrayPool));
- $throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
- spl_autoload_register($throwingAutoloader);
+ spl_autoload_register(array($adapter, 'throwOnRequiredClass'));
try {
foreach ($annotatedClasses as $class) {
try {
$this->readAllComponents($reader, $class);
} catch (\ReflectionException $e) {
// ignore failing reflection
+ } catch (AnnotationException $e) {
+ /*
+ * Ignore any AnnotationException to not break the cache warming process if an Annotation is badly
+ * configured or could not be found / read / etc.
+ *
+ * In particular cases, an Annotation in your code can be used and defined only for a specific
+ * environment but is always added to the annotations.map file by some Symfony default behaviors,
+ * and you always end up with a not found Annotation.
+ */
}
}
} finally {
- spl_autoload_unregister($throwingAutoloader);
+ spl_autoload_unregister(array($adapter, 'throwOnRequiredClass'));
}
$values = $arrayPool->getValues();
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
index 23e6142b..c017f512 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
+use Doctrine\Common\Annotations\AnnotationException;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\Adapter\AdapterInterface;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -36,9 +37,9 @@ class SerializerCacheWarmer implements CacheWarmerInterface
private $fallbackPool;
/**
- * @param LoaderInterface[] $loaders The serializer metadata loaders.
- * @param string $phpArrayFile The PHP file where metadata are cached.
- * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached.
+ * @param LoaderInterface[] $loaders The serializer metadata loaders
+ * @param string $phpArrayFile The PHP file where metadata are cached
+ * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
*/
public function __construct(array $loaders, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
{
@@ -64,10 +65,21 @@ class SerializerCacheWarmer implements CacheWarmerInterface
$metadataFactory = new CacheClassMetadataFactory(new ClassMetadataFactory(new LoaderChain($this->loaders)), $arrayPool);
- foreach ($this->extractSupportedLoaders($this->loaders) as $loader) {
- foreach ($loader->getMappedClasses() as $mappedClass) {
- $metadataFactory->getMetadataFor($mappedClass);
+ spl_autoload_register(array($adapter, 'throwOnRequiredClass'));
+ try {
+ foreach ($this->extractSupportedLoaders($this->loaders) as $loader) {
+ foreach ($loader->getMappedClasses() as $mappedClass) {
+ try {
+ $metadataFactory->getMetadataFor($mappedClass);
+ } catch (\ReflectionException $e) {
+ // ignore failing reflection
+ } catch (AnnotationException $e) {
+ // ignore failing annotations
+ }
+ }
}
+ } finally {
+ spl_autoload_unregister(array($adapter, 'throwOnRequiredClass'));
}
$values = $arrayPool->getValues();
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index d450cc1f..81291d77 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
+use Doctrine\Common\Annotations\AnnotationException;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\Adapter\AdapterInterface;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -38,8 +39,8 @@ class ValidatorCacheWarmer implements CacheWarmerInterface
/**
* @param ValidatorBuilderInterface $validatorBuilder
- * @param string $phpArrayFile The PHP file where metadata are cached.
- * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached.
+ * @param string $phpArrayFile The PHP file where metadata are cached
+ * @param CacheItemPoolInterface $fallbackPool The pool where runtime-discovered metadata are cached
*/
public function __construct(ValidatorBuilderInterface $validatorBuilder, $phpArrayFile, CacheItemPoolInterface $fallbackPool)
{
@@ -66,9 +67,7 @@ class ValidatorCacheWarmer implements CacheWarmerInterface
$loaders = $this->validatorBuilder->getLoaders();
$metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), new Psr6Cache($arrayPool));
- $throwingAutoloader = function ($class) { throw new \ReflectionException(sprintf('Class %s does not exist', $class)); };
- spl_autoload_register($throwingAutoloader);
-
+ spl_autoload_register(array($adapter, 'throwOnRequiredClass'));
try {
foreach ($this->extractSupportedLoaders($loaders) as $loader) {
foreach ($loader->getMappedClasses() as $mappedClass) {
@@ -78,15 +77,17 @@ class ValidatorCacheWarmer implements CacheWarmerInterface
}
} catch (\ReflectionException $e) {
// ignore failing reflection
+ } catch (AnnotationException $e) {
+ // ignore failing annotations
}
}
}
} finally {
- spl_autoload_unregister($throwingAutoloader);
+ spl_autoload_unregister(array($adapter, 'throwOnRequiredClass'));
}
$values = $arrayPool->getValues();
- $adapter->warmUp($values);
+ $adapter->warmUp(array_filter($values));
foreach ($values as $k => $v) {
$item = $this->fallbackPool->getItem($k);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
index 33073b0a..921dba0d 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -83,7 +83,7 @@ EOF
$configs = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($configs));
$processor = new Processor();
- $config = $processor->processConfiguration($configuration, $configs);
+ $config = $container->resolveEnvPlaceholders($container->getParameterBag()->resolveValue($processor->processConfiguration($configuration, $configs)));
if (null === $path = $input->getArgument('path')) {
$io->title(
@@ -105,7 +105,7 @@ EOF
$io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
- $io->writeln(Yaml::dump($container->getParameterBag()->resolveValue($config), 10));
+ $io->writeln(Yaml::dump($config, 10));
}
private function compileContainer()
@@ -130,7 +130,7 @@ EOF
*
* @return mixed
*/
- private function getConfigForPath(array $config = array(), $path, $alias)
+ private function getConfigForPath(array $config, $path, $alias)
{
$steps = explode('.', $path);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
index ccfa5dde..72584377 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
@@ -54,7 +54,9 @@ abstract class ServerCommand extends ContainerAwareCommand
return true;
}
- list($hostname, $port) = explode(':', $address);
+ $pos = strrpos($address, ':');
+ $hostname = substr($address, 0, $pos);
+ $port = substr($address, $pos + 1);
$fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index 99adb383..3471f7d0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -208,25 +208,17 @@ class JsonDescriptor extends Descriptor
'public' => $definition->isPublic(),
'synthetic' => $definition->isSynthetic(),
'lazy' => $definition->isLazy(),
+ 'shared' => $definition->isShared(),
+ 'abstract' => $definition->isAbstract(),
+ 'autowire' => $definition->isAutowired(),
+ 'autowiring_types' => array(),
+ 'file' => $definition->getFile(),
);
- if (method_exists($definition, 'isShared')) {
- $data['shared'] = $definition->isShared();
+ foreach ($definition->getAutowiringTypes() as $autowiringType) {
+ $data['autowiring_types'][] = $autowiringType;
}
- $data['abstract'] = $definition->isAbstract();
-
- if (method_exists($definition, 'isAutowired')) {
- $data['autowire'] = $definition->isAutowired();
-
- $data['autowiring_types'] = array();
- foreach ($definition->getAutowiringTypes() as $autowiringType) {
- $data['autowiring_types'][] = $autowiringType;
- }
- }
-
- $data['file'] = $definition->getFile();
-
if ($factory = $definition->getFactory()) {
if (is_array($factory)) {
if ($factory[0] instanceof Reference) {
@@ -252,11 +244,9 @@ class JsonDescriptor extends Descriptor
if (!$omitTags) {
$data['tags'] = array();
- if (count($definition->getTags())) {
- foreach ($definition->getTags() as $tagName => $tagData) {
- foreach ($tagData as $parameters) {
- $data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
- }
+ foreach ($definition->getTags() as $tagName => $tagData) {
+ foreach ($tagData as $parameters) {
+ $data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
}
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
index 5c91fa3b..43771d4f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -179,20 +179,13 @@ class MarkdownDescriptor extends Descriptor
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
+ ."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
+ ."\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no')
+ ."\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no')
;
- if (method_exists($definition, 'isShared')) {
- $output .= "\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no');
- }
-
- $output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no');
-
- if (method_exists($definition, 'isAutowired')) {
- $output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
-
- foreach ($definition->getAutowiringTypes() as $autowiringType) {
- $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
- }
+ foreach ($definition->getAutowiringTypes() as $autowiringType) {
+ $output .= "\n" . '- Autowiring Type: `' . $autowiringType . '`';
}
if ($definition->getFile()) {
@@ -230,7 +223,7 @@ class MarkdownDescriptor extends Descriptor
}
}
- $this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
+ $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
}
/**
@@ -241,7 +234,7 @@ class MarkdownDescriptor extends Descriptor
$output = '- Service: `'.$alias.'`'
."\n".'- Public: '.($alias->isPublic() ? 'yes' : 'no');
- $this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
+ $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
}
/**
@@ -356,7 +349,7 @@ class MarkdownDescriptor extends Descriptor
*/
private function formatRouterConfig(array $array)
{
- if (!count($array)) {
+ if (!$array) {
return 'NONE';
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 7d876eb7..93f11940 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -252,8 +252,7 @@ class TextDescriptor extends Descriptor
$tableRows[] = array('Service ID', isset($options['id']) ? $options['id'] : '-');
$tableRows[] = array('Class', $definition->getClass() ?: '-');
- $tags = $definition->getTags();
- if (count($tags)) {
+ if ($tags = $definition->getTags()) {
$tagInformation = '';
foreach ($tags as $tagName => $tagData) {
foreach ($tagData as $tagParameters) {
@@ -286,23 +285,12 @@ class TextDescriptor extends Descriptor
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
- if (method_exists($definition, 'isShared')) {
- $tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
- }
+ $tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
+ $tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
- if (method_exists($definition, 'isAutowired')) {
- $tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
-
- $autowiringTypes = $definition->getAutowiringTypes();
- if (count($autowiringTypes)) {
- $autowiringTypesInformation = implode(', ', $autowiringTypes);
- } else {
- $autowiringTypesInformation = '-';
- }
-
- $tableRows[] = array('Autowiring Types', $autowiringTypesInformation);
- }
+ $autowiringTypes = $definition->getAutowiringTypes();
+ $tableRows[] = array('Autowiring Types', $autowiringTypes ? implode(', ', $autowiringTypes) : '-');
if ($definition->getFile()) {
$tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
index 7d7d5f09..2c0b7d16 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -187,7 +187,7 @@ class XmlDescriptor extends Descriptor
$methodXML->appendChild(new \DOMText($method));
}
- if (count($route->getDefaults())) {
+ if ($route->getDefaults()) {
$routeXML->appendChild($defaultsXML = $dom->createElement('defaults'));
foreach ($route->getDefaults() as $attribute => $value) {
$defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
@@ -196,16 +196,18 @@ class XmlDescriptor extends Descriptor
}
}
- if (count($route->getRequirements())) {
+ $originRequirements = $requirements = $route->getRequirements();
+ unset($requirements['_scheme'], $requirements['_method']);
+ if ($requirements) {
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
- foreach ($route->getRequirements() as $attribute => $pattern) {
+ foreach ($originRequirements as $attribute => $pattern) {
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
$requirementXML->setAttribute('key', $attribute);
$requirementXML->appendChild(new \DOMText($pattern));
}
}
- if (count($route->getOptions())) {
+ if ($route->getOptions()) {
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
foreach ($route->getOptions() as $name => $value) {
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
@@ -349,15 +351,9 @@ class XmlDescriptor extends Descriptor
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
- if (method_exists($definition, 'isShared')) {
- $serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
- }
+ $serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
-
- if (method_exists($definition, 'isAutowired')) {
- $serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
- }
-
+ $serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
$serviceXML->setAttribute('file', $definition->getFile());
$calls = $definition->getMethodCalls();
@@ -370,9 +366,7 @@ class XmlDescriptor extends Descriptor
}
if (!$omitTags) {
- $tags = $definition->getTags();
-
- if (count($tags) > 0) {
+ if ($tags = $definition->getTags()) {
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
foreach ($tags as $tagName => $tagData) {
foreach ($tagData as $parameters) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
index d222bc7e..1d4c44c6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php
@@ -36,8 +36,13 @@ class TemplateController implements ContainerAwareInterface
*/
public function templateAction($template, $maxAge = null, $sharedAge = null, $private = null)
{
- /** @var $response \Symfony\Component\HttpFoundation\Response */
- $response = $this->container->get('templating')->renderResponse($template);
+ if ($this->container->has('templating')) {
+ $response = $this->container->get('templating')->renderResponse($template);
+ } elseif ($this->container->has('twig')) {
+ $response = new Response($this->container->get('twig')->render($template));
+ } else {
+ throw new \LogicException('You can not use the TemplateController if the Templating Component or the Twig Bundle are not available.');
+ }
if ($maxAge) {
$response->setMaxAge($maxAge);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php
index c859a6ba..90172275 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php
@@ -11,7 +11,6 @@
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
@@ -39,22 +38,5 @@ final class CachePoolClearerPass implements CompilerPassInterface
}
}
}
-
- if (!$container->has('cache.annotations')) {
- return;
- }
- $factory = array(AbstractAdapter::class, 'createSystemCache');
- $annotationsPool = $container->getDefinition('cache.annotations');
- if ($factory !== $annotationsPool->getFactory() || 4 !== count($annotationsPool->getArguments())) {
- return;
- }
- if ($container->has('monolog.logger.cache')) {
- $annotationsPool->addArgument(new Reference('monolog.logger.cache'));
- } elseif ($container->has('cache.system')) {
- $systemPool = $container->getDefinition('cache.system');
- if ($factory === $systemPool->getFactory() && 5 <= count($systemArgs = $systemPool->getArguments())) {
- $annotationsPool->addArgument($systemArgs[4]);
- }
- }
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
index df02d652..db1430eb 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php
@@ -36,7 +36,6 @@ class CachePoolPass implements CompilerPassInterface
}
$seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');
- $aliases = $container->getAliases();
$attributes = array(
'provider',
'namespace',
@@ -57,9 +56,9 @@ class CachePoolPass implements CompilerPassInterface
$tags[0]['namespace'] = $this->getNamespace($seed, $id);
}
if (isset($tags[0]['clearer'])) {
- $clearer = strtolower($tags[0]['clearer']);
- while (isset($aliases[$clearer])) {
- $clearer = (string) $aliases[$clearer];
+ $clearer = $tags[0]['clearer'];
+ while ($container->hasAlias($clearer)) {
+ $clearer = (string) $container->getAlias($clearer);
}
} else {
$clearer = null;
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index adb825b7..4a8fef38 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
+use Doctrine\Common\Annotations\Annotation;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -295,11 +296,33 @@ class Configuration implements ConfigurationInterface
->end()
->end()
->arrayNode('transitions')
- ->useAttributeAsKey('name')
+ ->beforeNormalization()
+ ->always()
+ ->then(function ($transitions) {
+ // It's an indexed array, we let the validation occurs
+ if (isset($transitions[0])) {
+ return $transitions;
+ }
+
+ foreach ($transitions as $name => $transition) {
+ if (array_key_exists('name', $transition)) {
+ continue;
+ }
+ $transition['name'] = $name;
+ $transitions[$name] = $transition;
+ }
+
+ return $transitions;
+ })
+ ->end()
->isRequired()
->requiresAtLeastOneElement()
->prototype('array')
->children()
+ ->scalarNode('name')
+ ->isRequired()
+ ->cannotBeEmpty()
+ ->end()
->arrayNode('from')
->beforeNormalization()
->ifString()
@@ -602,7 +625,7 @@ class Configuration implements ConfigurationInterface
->children()
->arrayNode('annotations')
->info('annotation configuration')
- ->canBeDisabled()
+ ->{class_exists(Annotation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
->children()
->scalarNode('cache')->defaultValue('php_array')->end()
->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 61a7d7a9..7429eed2 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -206,9 +206,6 @@ class FrameworkExtension extends Extension
'Symfony\\Component\\EventDispatcher\\Event',
'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
- 'Symfony\\Component\\HttpFoundation\\Response',
- 'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag',
-
'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
'Symfony\\Component\\HttpKernel\\Bundle\\Bundle',
@@ -408,13 +405,13 @@ class FrameworkExtension extends Extension
$type = $workflow['type'];
$transitions = array();
- foreach ($workflow['transitions'] as $transitionName => $transition) {
+ foreach ($workflow['transitions'] as $transition) {
if ($type === 'workflow') {
- $transitions[] = new Definition(Workflow\Transition::class, array($transitionName, $transition['from'], $transition['to']));
+ $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $transition['from'], $transition['to']));
} elseif ($type === 'state_machine') {
foreach ($transition['from'] as $from) {
foreach ($transition['to'] as $to) {
- $transitions[] = new Definition(Workflow\Transition::class, array($transitionName, $from, $to));
+ $transitions[] = new Definition(Workflow\Transition::class, array($transition['name'], $from, $to));
}
}
}
@@ -845,12 +842,11 @@ class FrameworkExtension extends Extension
$dirs[] = dirname(dirname($r->getFileName())).'/Resources/translations';
}
$rootDir = $container->getParameter('kernel.root_dir');
- foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
- $reflection = new \ReflectionClass($class);
- if (is_dir($dir = dirname($reflection->getFileName()).'/Resources/translations')) {
+ foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
+ if (is_dir($dir = $bundle['path'].'/Resources/translations')) {
$dirs[] = $dir;
}
- if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $bundle))) {
+ if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
$dirs[] = $dir;
}
}
@@ -913,6 +909,10 @@ class FrameworkExtension extends Extension
return;
}
+ if (!class_exists('Symfony\Component\Validator\Validation')) {
+ throw new LogicException('Validation support cannot be enabled as the Validator component is not installed.');
+ }
+
$loader->load('validator.xml');
$validatorBuilder = $container->getDefinition('validator.builder');
@@ -969,11 +969,8 @@ class FrameworkExtension extends Extension
$container->addResource(new FileResource($files[0][0]));
}
- $bundles = $container->getParameter('kernel.bundles');
- foreach ($bundles as $bundle) {
- $reflection = new \ReflectionClass($bundle);
- $dirname = dirname($reflection->getFileName());
-
+ foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
+ $dirname = $bundle['path'];
if (is_file($file = $dirname.'/Resources/config/validation.xml')) {
$files[0][] = $file;
$container->addResource(new FileResource($file));
@@ -1046,7 +1043,8 @@ class FrameworkExtension extends Extension
->replaceArgument(2, $config['debug'])
->addAutowiringType(Reader::class)
;
- $container->setAlias('annotation_reader', 'annotations.cached_reader');
+ } else {
+ $container->removeDefinition('annotations.cached_reader');
}
}
@@ -1146,10 +1144,8 @@ class FrameworkExtension extends Extension
$serializerLoaders[] = $annotationLoader;
}
- $bundles = $container->getParameter('kernel.bundles');
- foreach ($bundles as $bundle) {
- $reflection = new \ReflectionClass($bundle);
- $dirname = dirname($reflection->getFileName());
+ foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
+ $dirname = $bundle['path'];
if (is_file($file = $dirname.'/Resources/config/serialization.xml')) {
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index 4c20d146..853e1f22 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddValidatorInitializersPass;
@@ -79,6 +80,7 @@ class FrameworkBundle extends Bundle
$container->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_BEFORE_REMOVING);
$container->addCompilerPass(new TemplatingPass());
$container->addCompilerPass(new AddConstraintValidatorsPass(), PassConfig::TYPE_BEFORE_REMOVING);
+ $container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
$container->addCompilerPass(new AddValidatorInitializersPass());
$container->addCompilerPass(new AddConsoleCommandPass());
$container->addCompilerPass(new FormPass());
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
index 80cb00ad..461b4045 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/cache.xml
@@ -22,13 +22,8 @@
<tag name="cache.pool" />
</service>
- <service id="cache.annotations" class="Symfony\Component\Cache\Adapter\AdapterInterface" public="false">
- <factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
- <tag name="cache.pool" clearer="cache.default_clearer" />
- <argument /> <!-- namespace -->
- <argument>0</argument> <!-- default lifetime -->
- <argument /> <!-- version -->
- <argument>%kernel.cache_dir%/pools</argument>
+ <service id="cache.annotations" parent="cache.system" public="false">
+ <tag name="cache.pool" />
</service>
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
index 33a0a661..8f6a7c9e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
@@ -15,7 +15,7 @@
<!-- Extractor -->
<service id="property_info.reflection_extractor" class="Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor" public="false">
<tag name="property_info.list_extractor" priority="-1000" />
- <tag name="property_info.type_extractor" priority="-1000" />
+ <tag name="property_info.type_extractor" priority="-1002" />
<tag name="property_info.access_extractor" priority="-1000" />
</service>
</services>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php
index 2be960d0..56b3dd92 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_attributes.html.php
@@ -1,6 +1,6 @@
id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>" <?php if ($disabled): ?>disabled="disabled" <?php endif ?>
<?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($v, array('placeholder', 'title'), true)): ?>
+<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
<?php elseif ($v === true): ?>
<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php
index dc2e5ebe..c4dff7b6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_container_attributes.html.php
@@ -1,6 +1,6 @@
<?php if (!empty($id)): ?>id="<?php echo $view->escape($id) ?>" <?php endif ?>
<?php foreach ($attr as $k => $v): ?>
-<?php if (in_array($v, array('placeholder', 'title'), true)): ?>
+<?php if (in_array($k, array('placeholder', 'title'), true)): ?>
<?php printf('%s="%s" ', $view->escape($k), $view->escape(false !== $translation_domain ? $view['translator']->trans($v, array(), $translation_domain) : $v)) ?>
<?php elseif ($v === true): ?>
<?php printf('%s="%s" ', $view->escape($k), $view->escape($k)) ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
index bf6e795d..31fd9a36 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -24,6 +24,8 @@ class TemplateLocator implements FileLocatorInterface
protected $locator;
protected $cache;
+ private $cacheHits = array();
+
/**
* Constructor.
*
@@ -71,12 +73,15 @@ class TemplateLocator implements FileLocatorInterface
$key = $this->getCacheKey($template);
+ if (isset($this->cacheHits[$key])) {
+ return $this->cacheHits[$key];
+ }
if (isset($this->cache[$key])) {
- return $this->cache[$key];
+ return $this->cacheHits[$key] = realpath($this->cache[$key]) ?: $this->cache[$key];
}
try {
- return $this->cache[$key] = $this->locator->locate($template->getPath(), $currentPath);
+ return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);
} catch (\InvalidArgumentException $e) {
throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
index 0e3fe47c..23b4732a 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
@@ -51,6 +51,39 @@ class ValidatorCacheWarmerTest extends TestCase
$this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author', $values);
}
+ public function testWarmUpWithAnnotations()
+ {
+ $validatorBuilder = new ValidatorBuilder();
+ $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/categories.yml');
+ $validatorBuilder->enableAnnotationMapping();
+
+ $file = sys_get_temp_dir().'/cache-validator-with-annotations.php';
+ @unlink($file);
+
+ $fallbackPool = new ArrayAdapter();
+
+ $warmer = new ValidatorCacheWarmer($validatorBuilder, $file, $fallbackPool);
+ $warmer->warmUp(dirname($file));
+
+ $this->assertFileExists($file);
+
+ $values = require $file;
+
+ $this->assertInternalType('array', $values);
+ $this->assertCount(1, $values);
+ $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category', $values);
+
+ // Simple check to make sure that at least one constraint is actually cached, in this case the "id" property Type.
+ $this->assertContains('"int"', $values['Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category']);
+
+ $values = $fallbackPool->getValues();
+
+ $this->assertInternalType('array', $values);
+ $this->assertCount(2, $values);
+ $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Category', $values);
+ $this->assertArrayHasKey('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.SubCategory', $values);
+ }
+
public function testWarmUpWithoutLoader()
{
$validatorBuilder = new ValidatorBuilder();
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
index e42babd3..30b3242a 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
@@ -63,7 +63,7 @@ class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase
{
$routeCollection = new RouteCollection();
$routeCollection->add('foo', new Route('foo'));
- $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
$router
->expects($this->any())
->method('getRouteCollection')
@@ -74,7 +74,7 @@ class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
->method('has')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
index 3dc64a30..1caa5df9 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -62,7 +62,7 @@ class RouterMatchCommandTest extends \PHPUnit_Framework_TestCase
$routeCollection = new RouteCollection();
$routeCollection->add('foo', new Route('foo'));
$requestContext = new RequestContext();
- $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
$router
->expects($this->any())
->method('getRouteCollection')
@@ -78,7 +78,7 @@ class RouterMatchCommandTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
->method('has')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
index 27f61c43..60f81565 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -64,7 +64,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
public function testDebugCustomDirectory()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel->expects($this->once())
->method('getBundle')
->with($this->equalTo($this->translationDir))
@@ -82,7 +82,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
*/
public function testDebugInvalidDirectory()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel->expects($this->once())
->method('getBundle')
->with($this->equalTo('dir'))
@@ -130,7 +130,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
->method('getFallbackLocales')
->will($this->returnValue(array('en')));
- $extractor = $this->getMock('Symfony\Component\Translation\Extractor\ExtractorInterface');
+ $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
$extractor
->expects($this->any())
->method('extract')
@@ -140,7 +140,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
})
);
- $loader = $this->getMock('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader');
+ $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader')->getMock();
$loader
->expects($this->any())
->method('loadMessages')
@@ -151,7 +151,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
);
if (null === $kernel) {
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->any())
->method('getBundle')
@@ -166,7 +166,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
->method('getRootDir')
->will($this->returnValue($this->translationDir));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->any())
->method('get')
@@ -182,7 +182,7 @@ class TranslationDebugCommandTest extends \PHPUnit_Framework_TestCase
private function getBundle($path)
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
$bundle
->expects($this->any())
->method('getPath')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
index c876ee41..3dcbd03f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -100,7 +100,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
->method('getFallbackLocales')
->will($this->returnValue(array('en')));
- $extractor = $this->getMock('Symfony\Component\Translation\Extractor\ExtractorInterface');
+ $extractor = $this->getMockBuilder('Symfony\Component\Translation\Extractor\ExtractorInterface')->getMock();
$extractor
->expects($this->any())
->method('extract')
@@ -112,7 +112,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
})
);
- $loader = $this->getMock('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader');
+ $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader')->getMock();
$loader
->expects($this->any())
->method('loadMessages')
@@ -122,7 +122,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
})
);
- $writer = $this->getMock('Symfony\Component\Translation\Writer\TranslationWriter');
+ $writer = $this->getMockBuilder('Symfony\Component\Translation\Writer\TranslationWriter')->getMock();
$writer
->expects($this->any())
->method('getFormats')
@@ -131,7 +131,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
);
if (null === $kernel) {
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->any())
->method('getBundle')
@@ -146,7 +146,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
->method('getRootDir')
->will($this->returnValue($this->translationDir));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->any())
->method('get')
@@ -163,7 +163,7 @@ class TranslationUpdateCommandTest extends \PHPUnit_Framework_TestCase
private function getBundle($path)
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
$bundle
->expects($this->any())
->method('getPath')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
index a944da86..fc60fd3b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -22,7 +22,7 @@ class ApplicationTest extends TestCase
{
public function testBundleInterfaceImplementation()
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
$kernel = $this->getKernel(array($bundle), true);
@@ -117,10 +117,10 @@ class ApplicationTest extends TestCase
private function getKernel(array $bundles, $useDispatcher = false)
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
if ($useDispatcher) {
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher
->expects($this->atLeastOnce())
->method('dispatch')
@@ -145,7 +145,7 @@ class ApplicationTest extends TestCase
->will($this->returnValue(array()))
;
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->any())
->method('getBundles')
@@ -162,7 +162,7 @@ class ApplicationTest extends TestCase
private function createBundleMock(array $commands)
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
$bundle
->expects($this->once())
->method('registerCommands')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
index 894e7ae3..2fe27166 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -147,7 +147,7 @@ class ControllerNameParserTest extends TestCase
'FabpotFooBundle' => array($this->getBundle('TestBundle\Fabpot\FooBundle', 'FabpotFooBundle'), $this->getBundle('TestBundle\Sensio\FooBundle', 'SensioFooBundle')),
);
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->any())
->method('getBundle')
@@ -178,7 +178,7 @@ class ControllerNameParserTest extends TestCase
private function getBundle($namespace, $name)
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
$bundle->expects($this->any())->method('getName')->will($this->returnValue($name));
$bundle->expects($this->any())->method('getNamespace')->will($this->returnValue($namespace));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
index b511f90d..6c79a336 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
@@ -179,12 +179,12 @@ class ControllerResolverTest extends BaseControllerResolverTest
protected function createMockParser()
{
- return $this->getMock('Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser', array(), array(), '', false);
+ return $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser')->disableOriginalConstructor()->getMock();
}
protected function createMockContainer()
{
- return $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ return $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
index 2821e7fa..80908a9e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerTest.php
@@ -40,12 +40,12 @@ class ControllerTest extends TestCase
$requestStack = new RequestStack();
$requestStack->push($request);
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
return new Response($request->getRequestFormat().'--'.$request->getLocale());
}));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('get')->will($this->returnValue($requestStack));
$container->expects($this->at(1))->method('get')->will($this->returnValue($kernel));
@@ -91,7 +91,7 @@ class ControllerTest extends TestCase
*/
public function testGetUserWithEmptyContainer()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
->method('has')
@@ -111,13 +111,13 @@ class ControllerTest extends TestCase
*/
private function getContainerWithTokenStorage($token = null)
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage')->getMock();
$tokenStorage
->expects($this->once())
->method('getToken')
->will($this->returnValue($token));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
->method('has')
@@ -135,7 +135,7 @@ class ControllerTest extends TestCase
public function testJson()
{
- $container = $this->getMock(ContainerInterface::class);
+ $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
$container
->expects($this->once())
->method('has')
@@ -152,14 +152,14 @@ class ControllerTest extends TestCase
public function testJsonWithSerializer()
{
- $container = $this->getMock(ContainerInterface::class);
+ $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
$container
->expects($this->once())
->method('has')
->with('serializer')
->will($this->returnValue(true));
- $serializer = $this->getMock(SerializerInterface::class);
+ $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
$serializer
->expects($this->once())
->method('serialize')
@@ -182,14 +182,14 @@ class ControllerTest extends TestCase
public function testJsonWithSerializerContextOverride()
{
- $container = $this->getMock(ContainerInterface::class);
+ $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
$container
->expects($this->once())
->method('has')
->with('serializer')
->will($this->returnValue(true));
- $serializer = $this->getMock(SerializerInterface::class);
+ $serializer = $this->getMockBuilder(SerializerInterface::class)->getMock();
$serializer
->expects($this->once())
->method('serialize')
@@ -215,8 +215,8 @@ class ControllerTest extends TestCase
public function testFile()
{
/* @var ContainerInterface $container */
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$container->set('kernel', $kernel);
$controller = new TestController();
@@ -235,7 +235,7 @@ class ControllerTest extends TestCase
public function testFileAsInline()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$controller = new TestController();
$controller->setContainer($container);
@@ -253,7 +253,7 @@ class ControllerTest extends TestCase
public function testFileWithOwnFileName()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$controller = new TestController();
$controller->setContainer($container);
@@ -272,7 +272,7 @@ class ControllerTest extends TestCase
public function testFileWithOwnFileNameAsInline()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$controller = new TestController();
$controller->setContainer($container);
@@ -334,10 +334,10 @@ class ControllerTest extends TestCase
public function testIsGranted()
{
- $authorizationChecker = $this->getMock('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
+ $authorizationChecker = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface')->getMock();
$authorizationChecker->expects($this->once())->method('isGranted')->willReturn(true);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(true));
$container->expects($this->at(1))->method('get')->will($this->returnValue($authorizationChecker));
@@ -352,10 +352,10 @@ class ControllerTest extends TestCase
*/
public function testdenyAccessUnlessGranted()
{
- $authorizationChecker = $this->getMock('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface');
+ $authorizationChecker = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface')->getMock();
$authorizationChecker->expects($this->once())->method('isGranted')->willReturn(false);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(true));
$container->expects($this->at(1))->method('get')->will($this->returnValue($authorizationChecker));
@@ -370,7 +370,7 @@ class ControllerTest extends TestCase
$twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
$twig->expects($this->once())->method('render')->willReturn('bar');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(false));
$container->expects($this->at(1))->method('has')->will($this->returnValue(true));
$container->expects($this->at(2))->method('get')->will($this->returnValue($twig));
@@ -386,7 +386,7 @@ class ControllerTest extends TestCase
$twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
$twig->expects($this->once())->method('render')->willReturn('bar');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(false));
$container->expects($this->at(1))->method('has')->will($this->returnValue(true));
$container->expects($this->at(2))->method('get')->will($this->returnValue($twig));
@@ -401,7 +401,7 @@ class ControllerTest extends TestCase
{
$twig = $this->getMockBuilder('\Twig_Environment')->disableOriginalConstructor()->getMock();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(false));
$container->expects($this->at(1))->method('has')->will($this->returnValue(true));
$container->expects($this->at(2))->method('get')->will($this->returnValue($twig));
@@ -414,10 +414,10 @@ class ControllerTest extends TestCase
public function testRedirectToRoute()
{
- $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
$router->expects($this->once())->method('generate')->willReturn('/foo');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('get')->will($this->returnValue($router));
$controller = new TestController();
@@ -432,10 +432,10 @@ class ControllerTest extends TestCase
public function testAddFlash()
{
$flashBag = new FlashBag();
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\Session');
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
$session->expects($this->once())->method('getFlashBag')->willReturn($flashBag);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(true));
$container->expects($this->at(1))->method('get')->will($this->returnValue($session));
@@ -455,10 +455,10 @@ class ControllerTest extends TestCase
public function testIsCsrfTokenValid()
{
- $tokenManager = $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
+ $tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
$tokenManager->expects($this->once())->method('isTokenValid')->willReturn(true);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(true));
$container->expects($this->at(1))->method('get')->will($this->returnValue($tokenManager));
@@ -470,10 +470,10 @@ class ControllerTest extends TestCase
public function testGenerateUrl()
{
- $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
$router->expects($this->once())->method('generate')->willReturn('/foo');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('get')->will($this->returnValue($router));
$controller = new TestController();
@@ -494,10 +494,10 @@ class ControllerTest extends TestCase
public function testRenderViewTemplating()
{
- $templating = $this->getMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
+ $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
$templating->expects($this->once())->method('render')->willReturn('bar');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->willReturn(true);
$container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
@@ -509,10 +509,10 @@ class ControllerTest extends TestCase
public function testRenderTemplating()
{
- $templating = $this->getMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
+ $templating = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
$templating->expects($this->once())->method('renderResponse')->willReturn(new Response('bar'));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->willReturn(true);
$container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
@@ -524,9 +524,9 @@ class ControllerTest extends TestCase
public function testStreamTemplating()
{
- $templating = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $templating = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->willReturn(true);
$container->expects($this->at(1))->method('get')->will($this->returnValue($templating));
@@ -545,12 +545,12 @@ class ControllerTest extends TestCase
public function testCreateForm()
{
- $form = $this->getMock('Symfony\Component\Form\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\FormInterface')->getMock();
- $formFactory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $formFactory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$formFactory->expects($this->once())->method('create')->willReturn($form);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('get')->will($this->returnValue($formFactory));
$controller = new TestController();
@@ -561,12 +561,12 @@ class ControllerTest extends TestCase
public function testCreateFormBuilder()
{
- $formBuilder = $this->getMock('Symfony\Component\Form\FormBuilderInterface');
+ $formBuilder = $this->getMockBuilder('Symfony\Component\Form\FormBuilderInterface')->getMock();
- $formFactory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $formFactory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$formFactory->expects($this->once())->method('createBuilder')->willReturn($formBuilder);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('get')->will($this->returnValue($formFactory));
$controller = new TestController();
@@ -577,9 +577,9 @@ class ControllerTest extends TestCase
public function testGetDoctrine()
{
- $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $doctrine = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->at(0))->method('has')->will($this->returnValue(true));
$container->expects($this->at(1))->method('get')->will($this->returnValue($doctrine));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index eaca1893..14b6e442 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -66,14 +66,14 @@ class RedirectControllerTest extends TestCase
$request->attributes = new ParameterBag($attributes);
- $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+ $router = $this->getMockBuilder('Symfony\Component\Routing\RouterInterface')->getMock();
$router
->expects($this->once())
->method('generate')
->with($this->equalTo($route), $this->equalTo($expectedAttributes))
->will($this->returnValue($url));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
@@ -230,7 +230,7 @@ class RedirectControllerTest extends TestCase
private function createRequestObject($scheme, $host, $port, $baseUrl, $queryString = '')
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request
->expects($this->any())
->method('getScheme')
@@ -257,7 +257,7 @@ class RedirectControllerTest extends TestCase
private function createRedirectController($httpPort = null, $httpsPort = null)
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
if (null !== $httpPort) {
$container
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
index 204fdf09..73172d54 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
@@ -24,11 +24,8 @@ class AddCacheWarmerPassTest extends \PHPUnit_Framework_TestCase
'my_cache_warmer_service3' => array(0 => array()),
);
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('findTaggedServiceIds', 'getDefinition', 'hasDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'getDefinition', 'hasDefinition'))->getMock();
$container->expects($this->atLeastOnce())
->method('findTaggedServiceIds')
@@ -56,11 +53,8 @@ class AddCacheWarmerPassTest extends \PHPUnit_Framework_TestCase
public function testThatCompilerPassIsIgnoredIfThereIsNoCacheWarmerDefinition()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$container->expects($this->never())->method('findTaggedServiceIds');
$container->expects($this->never())->method('getDefinition');
@@ -76,11 +70,8 @@ class AddCacheWarmerPassTest extends \PHPUnit_Framework_TestCase
public function testThatCacheWarmersMightBeNotDefined()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$container->expects($this->atLeastOnce())
->method('findTaggedServiceIds')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
index 0629d1eb..88901dda 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
@@ -20,14 +20,11 @@ class AddConstraintValidatorsPassTest extends \PHPUnit_Framework_TestCase
'my_constraint_validator_service2' => array(),
);
- $validatorFactoryDefinition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('findTaggedServiceIds', 'getDefinition', 'hasDefinition')
- );
+ $validatorFactoryDefinition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'getDefinition', 'hasDefinition'))->getMock();
- $validatorDefinition1 = $this->getMock('Symfony\Component\DependencyInjection\Definition', array('getClass'));
- $validatorDefinition2 = $this->getMock('Symfony\Component\DependencyInjection\Definition', array('getClass'));
+ $validatorDefinition1 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->setMethods(array('getClass'))->getMock();
+ $validatorDefinition2 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->setMethods(array('getClass'))->getMock();
$validatorDefinition1->expects($this->atLeastOnce())
->method('getClass')
@@ -67,11 +64,8 @@ class AddConstraintValidatorsPassTest extends \PHPUnit_Framework_TestCase
public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$container->expects($this->never())->method('findTaggedServiceIds');
$container->expects($this->never())->method('getDefinition');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
index 48c753b6..19353d8b 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ConfigCachePassTest.php
@@ -24,11 +24,8 @@ class ConfigCachePassTest extends \PHPUnit_Framework_TestCase
'checker_3' => array(0 => array()),
);
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('findTaggedServiceIds', 'getDefinition', 'hasDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'getDefinition', 'hasDefinition'))->getMock();
$container->expects($this->atLeastOnce())
->method('findTaggedServiceIds')
@@ -52,10 +49,7 @@ class ConfigCachePassTest extends \PHPUnit_Framework_TestCase
public function testThatCheckersCanBeMissing()
{
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('findTaggedServiceIds')
- );
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds'))->getMock();
$container->expects($this->atLeastOnce())
->method('findTaggedServiceIds')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
index 77f894fa..5de27ba4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
@@ -17,9 +17,9 @@ class LoggingTranslatorPassTest extends \PHPUnit_Framework_TestCase
{
public function testProcess()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
- $parameterBag = $this->getMock('Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
+ $parameterBag = $this->getMockBuilder('Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface')->getMock();
$container->expects($this->exactly(2))
->method('hasAlias')
@@ -60,7 +60,7 @@ class LoggingTranslatorPassTest extends \PHPUnit_Framework_TestCase
public function testThatCompilerPassIsIgnoredIfThereIsNotLoggerDefinition()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
$container->expects($this->once())
->method('hasAlias')
->will($this->returnValue(false));
@@ -71,7 +71,7 @@ class LoggingTranslatorPassTest extends \PHPUnit_Framework_TestCase
public function testThatCompilerPassIsIgnoredIfThereIsNotTranslatorDefinition()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
$container->expects($this->at(0))
->method('hasAlias')
->will($this->returnValue(true));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
index f2af872e..9edb44eb 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -75,10 +75,7 @@ class ProfilerPassTest extends \PHPUnit_Framework_TestCase
private function createContainerMock($services)
{
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'getDefinition', 'findTaggedServiceIds', 'setParameter')
- );
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'getDefinition', 'findTaggedServiceIds', 'setParameter'))->getMock();
$container->expects($this->any())
->method('hasDefinition')
->with($this->equalTo('profiler'))
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
index fca0f346..c0030ba8 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
@@ -30,7 +30,7 @@ class PropertyInfoPassTest extends \PHPUnit_Framework_TestCase
new Reference('n3'),
);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds'))->getMock();
$container
->expects($this->any())
@@ -52,7 +52,7 @@ class PropertyInfoPassTest extends \PHPUnit_Framework_TestCase
public function testReturningEmptyArrayWhenNoService()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds'))->getMock();
$container
->expects($this->any())
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
index 27f1636e..16a724b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
@@ -23,7 +23,7 @@ class SerializerPassTest extends \PHPUnit_Framework_TestCase
{
public function testThrowExceptionWhenNoNormalizers()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('hasDefinition', 'findTaggedServiceIds'));
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds'))->getMock();
$container->expects($this->once())
->method('hasDefinition')
@@ -43,11 +43,8 @@ class SerializerPassTest extends \PHPUnit_Framework_TestCase
public function testThrowExceptionWhenNoEncoders()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$container->expects($this->once())
->method('hasDefinition')
@@ -85,7 +82,7 @@ class SerializerPassTest extends \PHPUnit_Framework_TestCase
new Reference('n3'),
);
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder', array('findTaggedServiceIds'));
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds'))->getMock();
$container->expects($this->any())
->method('findTaggedServiceIds')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
index 83f70514..dcdb0bc5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
@@ -18,7 +18,7 @@ class TranslatorPassTest extends \PHPUnit_Framework_TestCase
{
public function testValidCollector()
{
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
$definition->expects($this->at(0))
->method('addMethodCall')
->with('addLoader', array('xliff', new Reference('xliff')));
@@ -26,10 +26,7 @@ class TranslatorPassTest extends \PHPUnit_Framework_TestCase
->method('addMethodCall')
->with('addLoader', array('xlf', new Reference('xliff')));
- $container = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'getDefinition', 'findTaggedServiceIds', 'findDefinition')
- );
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'getDefinition', 'findTaggedServiceIds', 'findDefinition'))->getMock();
$container->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
@@ -41,7 +38,7 @@ class TranslatorPassTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array('xliff' => array(array('alias' => 'xliff', 'legacy-alias' => 'xlf')))));
$container->expects($this->once())
->method('findDefinition')
- ->will($this->returnValue($this->getMock('Symfony\Component\DependencyInjection\Definition')));
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock()));
$pass = new TranslatorPass();
$pass->process($container);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
index f354007b..02f5e6b6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -19,19 +19,17 @@ class UnusedTagsPassTest extends \PHPUnit_Framework_TestCase
{
$pass = new UnusedTagsPass();
- $formatter = $this->getMock('Symfony\Component\DependencyInjection\Compiler\LoggingFormatter');
+ $formatter = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\LoggingFormatter')->getMock();
$formatter
->expects($this->at(0))
->method('format')
->with($pass, 'Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?')
;
- $compiler = $this->getMock('Symfony\Component\DependencyInjection\Compiler\Compiler');
+ $compiler = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\Compiler')->getMock();
$compiler->expects($this->once())->method('getLoggingFormatter')->will($this->returnValue($formatter));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder',
- array('findTaggedServiceIds', 'getCompiler', 'findUnusedTags', 'findTags')
- );
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'getCompiler', 'findUnusedTags', 'findTags'))->getMock();
$container->expects($this->once())->method('getCompiler')->will($this->returnValue($compiler));
$container->expects($this->once())
->method('findTags')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 26792c6b..fec9b4be 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -190,6 +190,29 @@ abstract class FrameworkExtensionTest extends TestCase
$this->createContainerFromFile('workflow_with_arguments_and_service');
}
+ public function testWorkflowMultipleTransitionsWithSameName()
+ {
+ $container = $this->createContainerFromFile('workflow_with_multiple_transitions_with_same_name');
+
+ $this->assertTrue($container->hasDefinition('workflow.article', 'Workflow is registered as a service'));
+ $this->assertTrue($container->hasDefinition('workflow.article.definition', 'Workflow definition is registered as a service'));
+
+ $workflowDefinition = $container->getDefinition('workflow.article.definition');
+
+ $transitions = $workflowDefinition->getArgument(1);
+
+ $this->assertCount(5, $transitions);
+
+ $this->assertSame('request_review', $transitions[0]->getArgument(0));
+ $this->assertSame('journalist_approval', $transitions[1]->getArgument(0));
+ $this->assertSame('spellchecker_approval', $transitions[2]->getArgument(0));
+ $this->assertSame('publish', $transitions[3]->getArgument(0));
+ $this->assertSame('publish', $transitions[4]->getArgument(0));
+
+ $this->assertSame(array('approved_by_journalist', 'approved_by_spellchecker'), $transitions[3]->getArgument(1));
+ $this->assertSame(array('draft'), $transitions[4]->getArgument(1));
+ }
+
public function testRouter()
{
$container = $this->createContainerFromFile('full');
@@ -294,26 +317,26 @@ abstract class FrameworkExtensionTest extends TestCase
$packages = $container->getDefinition('assets.packages');
// default package
- $defaultPackage = $container->getDefinition($packages->getArgument(0));
+ $defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
$this->assertUrlPackage($container, $defaultPackage, array('http://cdn.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
// packages
$packages = $packages->getArgument(1);
$this->assertCount(5, $packages);
- $package = $container->getDefinition($packages['images_path']);
+ $package = $container->getDefinition((string) $packages['images_path']);
$this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
- $package = $container->getDefinition($packages['images']);
+ $package = $container->getDefinition((string) $packages['images']);
$this->assertUrlPackage($container, $package, array('http://images1.example.com', 'http://images2.example.com'), '1.0.0', '%%s?version=%%s');
- $package = $container->getDefinition($packages['foo']);
+ $package = $container->getDefinition((string) $packages['foo']);
$this->assertPathPackage($container, $package, '', '1.0.0', '%%s-%%s');
- $package = $container->getDefinition($packages['bar']);
+ $package = $container->getDefinition((string) $packages['bar']);
$this->assertUrlPackage($container, $package, array('https://bar2.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
- $package = $container->getDefinition($packages['bar_version_strategy']);
+ $package = $container->getDefinition((string) $packages['bar_version_strategy']);
$this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));
}
@@ -323,7 +346,7 @@ abstract class FrameworkExtensionTest extends TestCase
$packages = $container->getDefinition('assets.packages');
// default package
- $defaultPackage = $container->getDefinition($packages->getArgument(0));
+ $defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
$this->assertEquals('assets.custom_version_strategy', (string) $defaultPackage->getArgument(1));
}
@@ -417,12 +440,15 @@ abstract class FrameworkExtensionTest extends TestCase
$container = $this->createContainerFromFile('full');
$this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
- $this->assertSame('annotations.cached_reader', (string) $container->getAlias('annotation_reader'));
$this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));
}
public function testFileLinkFormat()
{
+ if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+ $this->markTestSkipped('A custom file_link_format is defined.');
+ }
+
$container = $this->createContainerFromFile('full');
$this->assertEquals('file%link%format', $container->getParameter('debug.file_link_format'));
@@ -449,7 +475,8 @@ abstract class FrameworkExtensionTest extends TestCase
require_once __DIR__.'/Fixtures/TestBundle/TestBundle.php';
$container = $this->createContainerFromFile('validation_annotations', array(
- 'kernel.bundles' => array('TestBundle' => 'Symfony\Bundle\FrameworkBundle\Tests\TestBundle'),
+ 'kernel.bundles' => array('TestBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\TestBundle'),
+ 'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/TestBundle')),
));
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
@@ -479,6 +506,33 @@ abstract class FrameworkExtensionTest extends TestCase
$this->assertStringEndsWith('TestBundle/Resources/config/validation.yml', $yamlMappings[0]);
}
+ public function testValidationPathsUsingCustomBundlePath()
+ {
+ require_once __DIR__.'/Fixtures/CustomPathBundle/src/CustomPathBundle.php';
+
+ $container = $this->createContainerFromFile('validation_annotations', array(
+ 'kernel.bundles' => array('CustomPathBundle' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\CustomPathBundle'),
+ 'kernel.bundles_metadata' => array('TestBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle\\Tests', 'parent' => null, 'path' => __DIR__.'/Fixtures/CustomPathBundle')),
+ ));
+
+ $calls = $container->getDefinition('validator.builder')->getMethodCalls();
+ $xmlMappings = $calls[3][1][0];
+ $this->assertCount(2, $xmlMappings);
+
+ try {
+ // Testing symfony/symfony
+ $this->assertStringEndsWith('Component'.DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
+ } catch (\Exception $e) {
+ // Testing symfony/framework-bundle with deps=high
+ $this->assertStringEndsWith('symfony'.DIRECTORY_SEPARATOR.'form/Resources/config/validation.xml', $xmlMappings[0]);
+ }
+ $this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.xml', $xmlMappings[1]);
+
+ $yamlMappings = $calls[4][1][0];
+ $this->assertCount(1, $yamlMappings);
+ $this->assertStringEndsWith('CustomPathBundle/Resources/config/validation.yml', $yamlMappings[0]);
+ }
+
public function testValidationNoStaticMethod()
{
$container = $this->createContainerFromFile('validation_no_static_method');
@@ -740,6 +794,7 @@ abstract class FrameworkExtensionTest extends TestCase
{
return new ContainerBuilder(new ParameterBag(array_merge(array(
'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'),
+ 'kernel.bundles_metadata' => array('FrameworkBundle' => array('namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..', 'parent' => null)),
'kernel.cache_dir' => __DIR__,
'kernel.debug' => false,
'kernel.environment' => 'test',
@@ -798,7 +853,7 @@ abstract class FrameworkExtensionTest extends TestCase
private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format)
{
- $versionStrategy = $container->getDefinition($reference);
+ $versionStrategy = $container->getDefinition((string) $reference);
if (null === $version) {
$this->assertEquals('assets.empty_version_strategy', (string) $reference);
} else {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
index 170dfa28..3039d03f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -7,14 +7,12 @@
"lazy": true,
"shared": true,
"abstract": true,
+ "autowire": false,
+ "autowiring_types": [],
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
- "tags": [
-
- ],
- "autowire": false,
- "autowiring_types": []
+ "tags": []
}
},
"aliases": {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
index 27995864..d21d1805 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
@@ -4,8 +4,7 @@ Public services
Definitions
-----------
-definition_1
-~~~~~~~~~~~~
+### definition_1
- Class: `Full\Qualified\Class1`
- Public: yes
@@ -21,14 +20,12 @@ definition_1
Aliases
-------
-alias_1
-~~~~~~~
+### alias_1
- Service: `service_1`
- Public: yes
-alias_2
-~~~~~~~
+### alias_2
- Service: `service_2`
- Public: no
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
index fe2b1839..d6f70eec 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -7,14 +7,12 @@
"lazy": true,
"shared": true,
"abstract": true,
+ "autowire": false,
+ "autowiring_types": [],
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
- "tags": [
-
- ],
- "autowire": false,
- "autowiring_types": []
+ "tags": []
},
"definition_2": {
"class": "Full\\Qualified\\Class2",
@@ -23,9 +21,14 @@
"lazy": false,
"shared": true,
"abstract": false,
+ "autowire": false,
+ "autowiring_types": [],
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
+ "calls": [
+ "setMailer"
+ ],
"tags": [
{
"name": "tag1",
@@ -42,16 +45,9 @@
},
{
"name": "tag2",
- "parameters": [
-
- ]
+ "parameters": []
}
- ],
- "calls": [
- "setMailer"
- ],
- "autowire": false,
- "autowiring_types": []
+ ]
}
},
"aliases": {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
index f1e22ddb..26ea2f00 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -4,8 +4,7 @@ Public and private services
Definitions
-----------
-definition_1
-~~~~~~~~~~~~
+### definition_1
- Class: `Full\Qualified\Class1`
- Public: yes
@@ -17,8 +16,7 @@ definition_1
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Method: `get`
-definition_2
-~~~~~~~~~~~~
+### definition_2
- Class: `Full\Qualified\Class2`
- Public: no
@@ -42,14 +40,12 @@ definition_2
Aliases
-------
-alias_1
-~~~~~~~
+### alias_1
- Service: `service_1`
- Public: yes
-alias_2
-~~~~~~~
+### alias_2
- Service: `service_2`
- Public: no
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
index a25a34b4..de1ae35e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -7,9 +7,14 @@
"lazy": false,
"shared": true,
"abstract": false,
+ "autowire": false,
+ "autowiring_types": [],
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
+ "calls": [
+ "setMailer"
+ ],
"tags": [
{
"name": "tag1",
@@ -26,22 +31,11 @@
},
{
"name": "tag2",
- "parameters": [
-
- ]
+ "parameters": []
}
- ],
- "calls": [
- "setMailer"
- ],
- "autowire": false,
- "autowiring_types": []
+ ]
}
},
- "aliases": [
-
- ],
- "services": [
-
- ]
+ "aliases": [],
+ "services": []
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
index 8a9636f7..e3dcc59f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
@@ -4,8 +4,7 @@ Public and private services with tag `tag1`
Definitions
-----------
-definition_2
-~~~~~~~~~~~~
+### definition_2
- Class: `Full\Qualified\Class2`
- Public: no
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
index 25138d78..d5f5596c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
@@ -7,14 +7,14 @@
"lazy": false,
"shared": true,
"abstract": false,
+ "autowire": false,
+ "autowiring_types": [],
"file": "\/path\/to\/file",
- "calls": [
- "setMailer"
- ],
"factory_service": "factory.service",
"factory_method": "get",
- "autowire": false,
- "autowiring_types": []
+ "calls": [
+ "setMailer"
+ ]
}
],
"tag2": [
@@ -25,14 +25,14 @@
"lazy": false,
"shared": true,
"abstract": false,
+ "autowire": false,
+ "autowiring_types": [],
"file": "\/path\/to\/file",
- "calls": [
- "setMailer"
- ],
"factory_service": "factory.service",
"factory_method": "get",
- "autowire": false,
- "autowiring_types": []
+ "calls": [
+ "setMailer"
+ ]
}
]
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
index 1731fc9f..a0e1bcd1 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
@@ -4,8 +4,7 @@ Container tags
tag1
----
-definition_2
-~~~~~~~~~~~~
+### definition_2
- Class: `Full\Qualified\Class2`
- Public: no
@@ -23,8 +22,7 @@ definition_2
tag2
----
-definition_2
-~~~~~~~~~~~~
+### definition_2
- Class: `Full\Qualified\Class2`
- Public: no
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
index d11d6e92..cbabdc81 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
@@ -5,12 +5,10 @@
"lazy": true,
"shared": true,
"abstract": true,
+ "autowire": false,
+ "autowiring_types": [],
"file": null,
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_method": "get",
- "tags": [
-
- ],
- "autowire": false,
- "autowiring_types": []
+ "tags": []
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
index 8a6611a3..2a291818 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
@@ -5,9 +5,14 @@
"lazy": false,
"shared": true,
"abstract": false,
+ "autowire": false,
+ "autowiring_types": [],
"file": "\/path\/to\/file",
"factory_service": "factory.service",
"factory_method": "get",
+ "calls": [
+ "setMailer"
+ ],
"tags": [
{
"name": "tag1",
@@ -24,14 +29,7 @@
},
{
"name": "tag2",
- "parameters": [
-
- ]
+ "parameters": []
}
- ],
- "calls": [
- "setMailer"
- ],
- "autowire": false,
- "autowiring_types": []
+ ]
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
index d34b3a77..58caf26d 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
@@ -6,9 +6,7 @@
"scheme": "http|https",
"method": "PUT|POST",
"class": "Symfony\\Component\\Routing\\Route",
- "defaults": [
-
- ],
+ "defaults": [],
"requirements": "NO CUSTOM",
"options": {
"compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
index 7170953f..350bffdb 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
@@ -27,9 +27,7 @@
"scheme": "http|https",
"method": "PUT|POST",
"class": "Symfony\\Component\\Routing\\Route",
- "defaults": [
-
- ],
+ "defaults": [],
"requirements": "NO CUSTOM",
"options": {
"compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
index c0ae6ec5..cb3c763f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
@@ -31,3 +31,19 @@ EOF
10,
array('%count%' => 10)
) ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-short-array', [], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-no-params-long-array', array(), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-short-array', ['foo' => 'bar'], 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('other-domain-test-params-long-array', array('foo' => 'bar'), 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-short-array-%count%', 10, ['%count%' => 10], 'not_messages'); ?>
+
+<?php echo $view['translator']->transChoice('other-domain-test-trans-choice-long-array-%count%', 10, array('%count%' => 10), 'not_messages'); ?>
+
+<?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', intval(4.5), [], 'not_messages'); ?>
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
index e7982cfa..d63658ba 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
@@ -13,6 +13,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\AnnotationReaderPass;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection\Config\CustomConfig;
class TestBundle extends Bundle
@@ -25,5 +26,7 @@ class TestBundle extends Bundle
$extension = $container->getExtension('test');
$extension->setCustomConfig(new CustomConfig());
+
+ $container->addCompilerPass(new AnnotationReaderPass());
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
index 0305d65f..5b40325e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -48,6 +48,16 @@ class ConfigDebugCommandTest extends WebTestCase
$this->assertContains('foo', $tester->getDisplay());
}
+ public function testParametersValuesAreResolved()
+ {
+ $tester = $this->createCommandTester();
+ $ret = $tester->execute(array('name' => 'framework'));
+
+ $this->assertSame(0, $ret, 'Returns 0 in case of success');
+ $this->assertContains("locale: '%env(LOCALE)%'", $tester->getDisplay());
+ $this->assertContains('secret: test', $tester->getDisplay());
+ }
+
public function testDumpUndefinedBundleOption()
{
$tester = $this->createCommandTester();
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
index 377d3e78..c1d12880 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/config.yml
@@ -1,2 +1,10 @@
imports:
- { resource: ../config/default.yml }
+
+framework:
+ secret: '%secret%'
+ default_locale: '%env(LOCALE)%'
+
+parameters:
+ env(LOCALE): en
+ secret: test
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
index 4727fc4b..9ac000d5 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php
@@ -228,7 +228,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
*/
private function getServiceContainer(RouteCollection $routes)
{
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader
->expects($this->any())
@@ -236,7 +236,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($routes))
;
- $sc = $this->getMock('Symfony\\Component\\DependencyInjection\\Container', array('get'));
+ $sc = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Container')->setMethods(array('get'))->getMock();
$sc
->expects($this->once())
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
index 4eaafddf..d18427dc 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/DelegatingEngineTest.php
@@ -85,7 +85,7 @@ class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
private function getEngineMock($template, $supports)
{
- $engine = $this->getMock('Symfony\Component\Templating\EngineInterface');
+ $engine = $this->getMockBuilder('Symfony\Component\Templating\EngineInterface')->getMock();
$engine->expects($this->once())
->method('supports')
@@ -97,7 +97,7 @@ class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
private function getFrameworkEngineMock($template, $supports)
{
- $engine = $this->getMock('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface');
+ $engine = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')->getMock();
$engine->expects($this->once())
->method('supports')
@@ -109,7 +109,7 @@ class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
private function getContainerMock($services)
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$i = 0;
foreach ($services as $id => $service) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
index 5c00c62e..99fd3831 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -33,7 +33,7 @@ class GlobalVariablesTest extends TestCase
public function testGetUserNoToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$this->container->set('security.token_storage', $tokenStorage);
$this->assertNull($this->globals->getUser());
}
@@ -43,8 +43,8 @@ class GlobalVariablesTest extends TestCase
*/
public function testGetUser($user, $expectedUser)
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$this->container->set('security.token_storage', $tokenStorage);
@@ -63,9 +63,9 @@ class GlobalVariablesTest extends TestCase
public function getUserProvider()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$std = new \stdClass();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
return array(
array($user, $user),
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
index 1a0ff5f5..3518267d 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/StopwatchHelperTest.php
@@ -17,7 +17,7 @@ class StopwatchHelperTest extends \PHPUnit_Framework_TestCase
{
public function testDevEnvironment()
{
- $stopwatch = $this->getMock('Symfony\Component\Stopwatch\Stopwatch');
+ $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
$stopwatch->expects($this->once())
->method('start')
->with('foo');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
index f680db94..96d75e3c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Loader/TemplateLocatorTest.php
@@ -38,6 +38,17 @@ class TemplateLocatorTest extends TestCase
$this->assertEquals('/path/to/template', $locator->locate($template));
}
+ public function testLocateATemplateFromCacheDir()
+ {
+ $template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
+
+ $fileLocator = $this->getFileLocator();
+
+ $locator = new TemplateLocator($fileLocator, __DIR__.'/../../Fixtures');
+
+ $this->assertEquals(realpath(__DIR__.'/../../Fixtures/Resources/views/this.is.a.template.format.engine'), $locator->locate($template));
+ }
+
public function testThrowsExceptionWhenTemplateNotFound()
{
$template = new TemplateReference('bundle', 'controller', 'name', 'format', 'engine');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
index 9c190872..3e162d16 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -22,7 +22,7 @@ class TemplateNameParserTest extends TestCase
protected function setUp()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->any())
->method('getBundle')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
index 9411c1cb..ef01f0e3 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
@@ -44,7 +44,7 @@ class TimedPhpEngineTest extends TestCase
*/
private function getContainer()
{
- return $this->getMock('Symfony\Component\DependencyInjection\Container');
+ return $this->getMockBuilder('Symfony\Component\DependencyInjection\Container')->getMock();
}
/**
@@ -52,8 +52,8 @@ class TimedPhpEngineTest extends TestCase
*/
private function getTemplateNameParser()
{
- $templateReference = $this->getMock('Symfony\Component\Templating\TemplateReferenceInterface');
- $templateNameParser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+ $templateReference = $this->getMockBuilder('Symfony\Component\Templating\TemplateReferenceInterface')->getMock();
+ $templateNameParser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$templateNameParser->expects($this->any())
->method('parse')
->will($this->returnValue($templateReference));
@@ -111,6 +111,6 @@ class TimedPhpEngineTest extends TestCase
*/
private function getStopwatch()
{
- return $this->getMock('Symfony\Component\Stopwatch\Stopwatch');
+ return $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
index 420d2f2d..e8c56ee4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
@@ -39,18 +39,31 @@ EOF;
nowdoc key with whitespace and nonescaped \$\n sequences
EOF;
// Assert
- $expectedCatalogue = array('messages' => array(
- 'single-quoted key' => 'prefixsingle-quoted key',
- 'double-quoted key' => 'prefixdouble-quoted key',
- 'heredoc key' => 'prefixheredoc key',
- 'nowdoc key' => 'prefixnowdoc key',
- "double-quoted key with whitespace and escaped \$\n\" sequences" => "prefixdouble-quoted key with whitespace and escaped \$\n\" sequences",
- 'single-quoted key with whitespace and nonescaped \$\n\' sequences' => 'prefixsingle-quoted key with whitespace and nonescaped \$\n\' sequences',
- 'single-quoted key with "quote mark at the end"' => 'prefixsingle-quoted key with "quote mark at the end"',
- $expectedHeredoc => 'prefix'.$expectedHeredoc,
- $expectedNowdoc => 'prefix'.$expectedNowdoc,
- '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
- ));
+ $expectedCatalogue = array(
+ 'messages' => array(
+ 'single-quoted key' => 'prefixsingle-quoted key',
+ 'double-quoted key' => 'prefixdouble-quoted key',
+ 'heredoc key' => 'prefixheredoc key',
+ 'nowdoc key' => 'prefixnowdoc key',
+ "double-quoted key with whitespace and escaped \$\n\" sequences" => "prefixdouble-quoted key with whitespace and escaped \$\n\" sequences",
+ 'single-quoted key with whitespace and nonescaped \$\n\' sequences' => 'prefixsingle-quoted key with whitespace and nonescaped \$\n\' sequences',
+ 'single-quoted key with "quote mark at the end"' => 'prefixsingle-quoted key with "quote mark at the end"',
+ $expectedHeredoc => 'prefix'.$expectedHeredoc,
+ $expectedNowdoc => 'prefix'.$expectedNowdoc,
+ '{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples' => 'prefix{0} There is no apples|{1} There is one apple|]1,Inf[ There are %count% apples',
+ ),
+ 'not_messages' => array(
+ 'other-domain-test-no-params-short-array' => 'prefixother-domain-test-no-params-short-array',
+ 'other-domain-test-no-params-long-array' => 'prefixother-domain-test-no-params-long-array',
+ 'other-domain-test-params-short-array' => 'prefixother-domain-test-params-short-array',
+ 'other-domain-test-params-long-array' => 'prefixother-domain-test-params-long-array',
+ 'other-domain-test-trans-choice-short-array-%count%' => 'prefixother-domain-test-trans-choice-short-array-%count%',
+ 'other-domain-test-trans-choice-long-array-%count%' => 'prefixother-domain-test-trans-choice-long-array-%count%',
+ 'typecast' => 'prefixtypecast',
+ 'msg1' => 'prefixmsg1',
+ 'msg2' => 'prefixmsg2',
+ ),
+ );
$actualCatalogue = $catalogue->all();
$this->assertEquals($expectedCatalogue, $actualCatalogue);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
index a2bcbcb9..1a215c38 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -76,7 +76,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
// do it another time as the cache is primed now
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$loader->expects($this->never())->method('load');
$translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir));
@@ -99,7 +99,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
*/
public function testTransWithCachingWithInvalidLocale()
{
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir), 'loader', '\Symfony\Bundle\FrameworkBundle\Tests\Translation\TranslatorWithInvalidLocale');
$translator->trans('foo');
@@ -122,7 +122,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
public function testGetDefaultLocale()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->once())
->method('getParameter')
@@ -150,7 +150,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
protected function getLoader()
{
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$loader
->expects($this->at(0))
->method('load')
@@ -208,7 +208,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
protected function getContainer($loader)
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container
->expects($this->any())
->method('get')
@@ -249,7 +249,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
$translator->setFallbackLocales(array('fr'));
$translator->warmup($this->tmpDir);
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$loader
->expects($this->never())
->method('load');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
index b61851bb..12ee6ac6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
@@ -21,7 +21,7 @@ class ConstraintValidatorFactoryTest extends \PHPUnit_Framework_TestCase
{
$class = get_class($this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator'));
- $constraint = $this->getMock('Symfony\\Component\\Validator\\Constraint');
+ $constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
$constraint
->expects($this->once())
->method('validatedBy')
@@ -46,14 +46,14 @@ class ConstraintValidatorFactoryTest extends \PHPUnit_Framework_TestCase
$validator = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator');
// mock ContainerBuilder b/c it implements TaggedContainerInterface
- $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerBuilder', array('get'));
+ $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerBuilder')->setMethods(array('get'))->getMock();
$container
->expects($this->once())
->method('get')
->with($service)
->will($this->returnValue($validator));
- $constraint = $this->getMock('Symfony\\Component\\Validator\\Constraint');
+ $constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
$constraint
->expects($this->once())
->method('validatedBy')
@@ -68,7 +68,7 @@ class ConstraintValidatorFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testGetInstanceInvalidValidatorClass()
{
- $constraint = $this->getMock('Symfony\\Component\\Validator\\Constraint');
+ $constraint = $this->getMockBuilder('Symfony\\Component\\Validator\\Constraint')->getMock();
$constraint
->expects($this->once())
->method('validatedBy')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
index cf7f3c57..97c94fdd 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
@@ -24,6 +24,8 @@ use Symfony\Component\Translation\Extractor\ExtractorInterface;
class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
{
const MESSAGE_TOKEN = 300;
+ const METHOD_ARGUMENTS_TOKEN = 1000;
+ const DOMAIN_TOKEN = 1001;
/**
* Prefix for new found message.
@@ -38,6 +40,28 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
* @var array
*/
protected $sequences = array(
+ array(
+ '->',
+ 'trans',
+ '(',
+ self::MESSAGE_TOKEN,
+ ',',
+ self::METHOD_ARGUMENTS_TOKEN,
+ ',',
+ self::DOMAIN_TOKEN,
+ ),
+ array(
+ '->',
+ 'transChoice',
+ '(',
+ self::MESSAGE_TOKEN,
+ ',',
+ self::METHOD_ARGUMENTS_TOKEN,
+ ',',
+ self::METHOD_ARGUMENTS_TOKEN,
+ ',',
+ self::DOMAIN_TOKEN,
+ ),
array(
'->',
'trans',
@@ -105,11 +129,32 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
}
}
+ private function skipMethodArgument(\Iterator $tokenIterator)
+ {
+ $openBraces = 0;
+
+ for (; $tokenIterator->valid(); $tokenIterator->next()) {
+ $t = $tokenIterator->current();
+
+ if ('[' === $t[0] || '(' === $t[0]) {
+ ++$openBraces;
+ }
+
+ if (']' === $t[0] || ')' === $t[0]) {
+ --$openBraces;
+ }
+
+ if ((0 === $openBraces && ',' === $t[0]) || (-1 === $openBraces && ')' === $t[0])) {
+ break;
+ }
+ }
+ }
+
/**
* Extracts the message from the iterator while the tokens
* match allowed message tokens.
*/
- private function getMessage(\Iterator $tokenIterator)
+ private function getValue(\Iterator $tokenIterator)
{
$message = '';
$docToken = '';
@@ -155,16 +200,26 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
for ($key = 0; $key < $tokenIterator->count(); ++$key) {
foreach ($this->sequences as $sequence) {
$message = '';
+ $domain = 'messages';
$tokenIterator->seek($key);
- foreach ($sequence as $item) {
+ foreach ($sequence as $sequenceKey => $item) {
$this->seekToNextRelevantToken($tokenIterator);
- if ($this->normalizeToken($tokenIterator->current()) == $item) {
+ if ($this->normalizeToken($tokenIterator->current()) === $item) {
$tokenIterator->next();
continue;
- } elseif (self::MESSAGE_TOKEN == $item) {
- $message = $this->getMessage($tokenIterator);
+ } elseif (self::MESSAGE_TOKEN === $item) {
+ $message = $this->getValue($tokenIterator);
+
+ if (count($sequence) === ($sequenceKey + 1)) {
+ break;
+ }
+ } elseif (self::METHOD_ARGUMENTS_TOKEN === $item) {
+ $this->skipMethodArgument($tokenIterator);
+ } elseif (self::DOMAIN_TOKEN === $item) {
+ $domain = $this->getValue($tokenIterator);
+
break;
} else {
break;
@@ -172,7 +227,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
}
if ($message) {
- $catalog->set($message, $this->prefix.$message);
+ $catalog->set($message, $this->prefix.$message, $domain);
break;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json
index 278fadaf..46e37440 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -17,17 +17,19 @@
],
"require": {
"php": ">=5.5.9",
- "symfony/cache": "~3.2",
+ "symfony/cache": "~3.2.2|~3.3",
"symfony/class-loader": "~3.2",
- "symfony/dependency-injection": "~3.2",
+ "symfony/dependency-injection": "~3.2.1|~3.3",
"symfony/config": "~2.8|~3.0",
"symfony/event-dispatcher": "~2.8|~3.0",
"symfony/http-foundation": "~3.1",
- "symfony/http-kernel": "~3.2",
+ "symfony/http-kernel": "~3.2.2|~3.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
- "symfony/routing": "~3.0",
+ "symfony/routing": "~3.1.10|~3.2.3",
+ "symfony/security-core": "~2.8|~3.0",
+ "symfony/security-csrf": "~2.8|~3.0",
"symfony/stopwatch": "~2.8|~3.0",
"doctrine/cache": "~1.0"
},
@@ -39,7 +41,7 @@
"symfony/dom-crawler": "~2.8|~3.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/security": "~2.8|~3.0",
- "symfony/form": "~2.8|~3.0",
+ "symfony/form": "~2.8.16|~3.1.9|^3.2.2",
"symfony/expression-language": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0",
"symfony/security-core": "~3.2",
@@ -49,10 +51,11 @@
"symfony/templating": "~2.8|~3.0",
"symfony/validator": "~3.2",
"symfony/yaml": "~3.2",
- "symfony/property-info": "~2.8|~3.0",
+ "symfony/property-info": "~3.1",
"doctrine/annotations": "~1.0",
"phpdocumentor/reflection-docblock": "^3.0",
- "twig/twig": "~1.26|~2.0"
+ "twig/twig": "~1.26|~2.0",
+ "sensio/framework-extra-bundle": "^3.0.2"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0",
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index b0aadc2f..c2bcb7d0 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -369,11 +369,11 @@ class MainConfiguration implements ConfigurationInterface
$providerNodeBuilder
->validate()
- ->ifTrue(function ($v) {return count($v) > 1;})
+ ->ifTrue(function ($v) { return count($v) > 1; })
->thenInvalid('You cannot set multiple provider types for the same provider')
->end()
->validate()
- ->ifTrue(function ($v) {return count($v) === 0;})
+ ->ifTrue(function ($v) { return count($v) === 0; })
->thenInvalid('You must set a provider definition for the provider.')
->end()
;
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index fc008a9f..f20f8c2e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -97,7 +97,8 @@ class RememberMeFactory implements SecurityFactoryInterface
if (count($userProviders) === 0) {
throw new \RuntimeException('You must configure at least one remember-me aware listener (such as form-login) for each firewall that has remember-me enabled.');
}
- $rememberMeServices->replaceArgument(0, $userProviders);
+
+ $rememberMeServices->replaceArgument(0, array_unique($userProviders));
// remember-me listener
$listenerId = 'security.authentication.listener.rememberme.'.$id;
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index faa28fc1..7b577436 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -403,7 +403,7 @@ class SecurityExtension extends Extension
$config->replaceArgument(8, isset($firewall['access_denied_handler']) ? $firewall['access_denied_handler'] : null);
$config->replaceArgument(9, isset($firewall['access_denied_url']) ? $firewall['access_denied_url'] : null);
- $container->setAlias(new Alias('security.user_checker.'.$id, false), $firewall['user_checker']);
+ $container->setAlias('security.user_checker.'.$id, new Alias($firewall['user_checker'], false));
foreach ($this->factories as $position) {
foreach ($position as $factory) {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
index 3830e924..073d0d86 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -257,7 +257,13 @@
: '<span class="label status-error same-width">DENIED</span>'
}}
</td>
- <td>{{ decision.attributes|length == 1 ? decision.attributes|first : profiler_dump(decision.attributes) }}</td>
+ <td>
+ {% if decision.attributes|length == 1 %}
+ {{ decision.attributes|first }}
+ {% else %}
+ {{ profiler_dump(decision.attributes) }}
+ {% endif %}
+ </td>
<td>{{ profiler_dump(decision.object) }}</td>
</tr>
{% endfor %}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
index bbce61a7..cbdb6e8f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -73,7 +73,7 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase
$arguments = $contextDef->getArguments();
$listeners[] = array_map(function ($ref) { return (string) $ref; }, $arguments['index_0']);
- $configDef = $container->getDefinition($arguments['index_2']);
+ $configDef = $container->getDefinition((string) $arguments['index_2']);
$configs[] = array_values($configDef->getArguments());
}
@@ -234,7 +234,7 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase
);
} elseif (3 === $i) {
$this->assertEquals('IS_AUTHENTICATED_ANONYMOUSLY', $attributes[0]);
- $expression = $container->getDefinition($attributes[1])->getArgument(0);
+ $expression = $container->getDefinition((string) $attributes[1])->getArgument(0);
$this->assertEquals("token.getUsername() matches '/^admin/'", $expression);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
index e0d626a8..430390bf 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/SecurityBundle/Tests/SecurityUserValueResolverTest.php
@@ -33,8 +33,8 @@ class SecurityUserValueResolverTest extends \PHPUnit_Framework_TestCase
public function testResolveNoUser()
{
- $mock = $this->getMock(UserInterface::class);
- $token = $this->getMock(TokenInterface::class);
+ $mock = $this->getMockBuilder(UserInterface::class)->getMock();
+ $token = $this->getMockBuilder(TokenInterface::class)->getMock();
$tokenStorage = new TokenStorage();
$tokenStorage->setToken($token);
@@ -55,8 +55,8 @@ class SecurityUserValueResolverTest extends \PHPUnit_Framework_TestCase
public function testResolve()
{
- $user = $this->getMock(UserInterface::class);
- $token = $this->getMock(TokenInterface::class);
+ $user = $this->getMockBuilder(UserInterface::class)->getMock();
+ $token = $this->getMockBuilder(TokenInterface::class)->getMock();
$token->expects($this->any())->method('getUser')->willReturn($user);
$tokenStorage = new TokenStorage();
$tokenStorage->setToken($token);
@@ -70,8 +70,8 @@ class SecurityUserValueResolverTest extends \PHPUnit_Framework_TestCase
public function testIntegration()
{
- $user = $this->getMock(UserInterface::class);
- $token = $this->getMock(TokenInterface::class);
+ $user = $this->getMockBuilder(UserInterface::class)->getMock();
+ $token = $this->getMockBuilder(TokenInterface::class)->getMock();
$token->expects($this->any())->method('getUser')->willReturn($user);
$tokenStorage = new TokenStorage();
$tokenStorage->setToken($token);
@@ -82,7 +82,7 @@ class SecurityUserValueResolverTest extends \PHPUnit_Framework_TestCase
public function testIntegrationNoUser()
{
- $token = $this->getMock(TokenInterface::class);
+ $token = $this->getMockBuilder(TokenInterface::class)->getMock();
$tokenStorage = new TokenStorage();
$tokenStorage->setToken($token);
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php
index 9fbfd659..b7ebb2a4 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php
@@ -27,8 +27,10 @@ class ExceptionListenerPass implements CompilerPassInterface
return;
}
- // register the exception controller only if Twig is enabled
- if ($container->hasParameter('templating.engines')) {
+ // register the exception controller only if Twig is enabled and required dependencies do exist
+ if (!class_exists('Symfony\Component\Debug\Exception\FlattenException') || !interface_exists('Symfony\Component\EventDispatcher\EventSubscriberInterface')) {
+ $container->removeDefinition('twig.exception_listener');
+ } elseif ($container->hasParameter('templating.engines')) {
$engines = $container->getParameter('templating.engines');
if (!in_array('twig', $engines)) {
$container->removeDefinition('twig.exception_listener');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 184acc72..1491b04a 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -27,10 +27,29 @@ class ExtensionPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
+ if (!class_exists('Symfony\Component\Asset\Packages')) {
+ $container->removeDefinition('twig.extension.assets');
+ }
+
+ if (!class_exists('Symfony\Component\ExpressionLanguage\Expression')) {
+ $container->removeDefinition('twig.extension.expression');
+ }
+
+ if (!interface_exists('Symfony\Component\Routing\Generator\UrlGeneratorInterface')) {
+ $container->removeDefinition('twig.extension.routing');
+ }
+ if (!interface_exists('Symfony\Component\Translation\TranslatorInterface')) {
+ $container->removeDefinition('twig.extension.trans');
+ }
+
+ if (!class_exists('Symfony\Component\Yaml\Yaml')) {
+ $container->removeDefinition('twig.extension.yaml');
+ }
+
if ($container->has('form.extension')) {
$container->getDefinition('twig.extension.form')->addTag('twig.extension');
$reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension');
- $container->getDefinition('twig.loader.filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
+ $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
}
if ($container->has('translator')) {
@@ -66,15 +85,15 @@ class ExtensionPass implements CompilerPassInterface
}
$composerRootDir = $this->getComposerRootDir($container->getParameter('kernel.root_dir'));
- $loader = $container->getDefinition('twig.loader.filesystem');
- $loader->replaceArgument(2, $composerRootDir);
-
- if (!$container->has('templating')) {
- $loader = $container->getDefinition('twig.loader.native_filesystem');
- $loader->replaceArgument(1, $composerRootDir);
- $loader->addTag('twig.loader');
- $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
-
+ $twigLoader = $container->getDefinition('twig.loader.native_filesystem');
+ if ($container->has('templating')) {
+ $loader = $container->getDefinition('twig.loader.filesystem');
+ $loader->setMethodCalls(array_merge($twigLoader->getMethodCalls(), $loader->getMethodCalls()));
+ $loader->replaceArgument(2, $composerRootDir);
+
+ $twigLoader->clearTag('twig.loader');
+ } else {
+ $twigLoader->replaceArgument(1, $composerRootDir);
$container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
index 6a4c1f26..7d0be74f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -13,6 +13,7 @@ namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
/**
* Registers Twig runtime services.
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index 5296ac54..77d10e84 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -37,6 +37,18 @@ class TwigExtension extends Extension
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('twig.xml');
+ if (class_exists('Symfony\Component\Form\Form')) {
+ $loader->load('form.xml');
+ }
+
+ if (interface_exists('Symfony\Component\Templating\EngineInterface')) {
+ $loader->load('templating.xml');
+ }
+
+ if (!interface_exists('Symfony\Component\Translation\TranslatorInterface')) {
+ $container->removeDefinition('twig.translation.extractor');
+ }
+
foreach ($configs as $key => $config) {
if (isset($config['globals'])) {
foreach ($config['globals'] as $name => $value) {
@@ -66,7 +78,7 @@ class TwigExtension extends Extension
$envConfiguratorDefinition->replaceArgument(4, $config['number_format']['decimal_point']);
$envConfiguratorDefinition->replaceArgument(5, $config['number_format']['thousands_separator']);
- $twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.filesystem');
+ $twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.native_filesystem');
// register user-configured paths
foreach ($config['paths'] as $path => $namespace) {
@@ -80,24 +92,23 @@ class TwigExtension extends Extension
$container->getDefinition('twig.cache_warmer')->replaceArgument(2, $config['paths']);
$container->getDefinition('twig.template_iterator')->replaceArgument(2, $config['paths']);
- // register bundles as Twig namespaces
- foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
- $dir = $container->getParameter('kernel.root_dir').'/Resources/'.$bundle.'/views';
- if (is_dir($dir)) {
- $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
+ $bundleHierarchy = $this->getBundleHierarchy($container);
+
+ foreach ($bundleHierarchy as $name => $bundle) {
+ $namespace = $this->normalizeBundleName($name);
+
+ foreach ($bundle['children'] as $child) {
+ foreach ($bundleHierarchy[$child]['paths'] as $path) {
+ $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
+ }
}
- $container->addResource(new FileExistenceResource($dir));
- $reflection = new \ReflectionClass($class);
- $dir = dirname($reflection->getFileName()).'/Resources/views';
- if (is_dir($dir)) {
- $this->addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle);
+ foreach ($bundle['paths'] as $path) {
+ $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($path, $namespace));
}
- $container->addResource(new FileExistenceResource($dir));
}
- $dir = $container->getParameter('kernel.root_dir').'/Resources/views';
- if (is_dir($dir)) {
+ if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/views')) {
$twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir));
}
$container->addResource(new FileExistenceResource($dir));
@@ -138,13 +149,65 @@ class TwigExtension extends Extension
));
}
- private function addTwigPath($twigFilesystemLoaderDefinition, $dir, $bundle)
+ private function getBundleHierarchy(ContainerBuilder $container)
+ {
+ $bundleHierarchy = array();
+
+ foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
+ if (!array_key_exists($name, $bundleHierarchy)) {
+ $bundleHierarchy[$name] = array(
+ 'paths' => array(),
+ 'parents' => array(),
+ 'children' => array(),
+ );
+ }
+
+ if (is_dir($dir = $container->getParameter('kernel.root_dir').'/Resources/'.$name.'/views')) {
+ $bundleHierarchy[$name]['paths'][] = $dir;
+ }
+ $container->addResource(new FileExistenceResource($dir));
+
+ if (is_dir($dir = $bundle['path'].'/Resources/views')) {
+ $bundleHierarchy[$name]['paths'][] = $dir;
+ }
+ $container->addResource(new FileExistenceResource($dir));
+
+ if (null === $bundle['parent']) {
+ continue;
+ }
+
+ $bundleHierarchy[$name]['parents'][] = $bundle['parent'];
+
+ if (!array_key_exists($bundle['parent'], $bundleHierarchy)) {
+ $bundleHierarchy[$bundle['parent']] = array(
+ 'paths' => array(),
+ 'parents' => array(),
+ 'children' => array(),
+ );
+ }
+
+ $bundleHierarchy[$bundle['parent']]['children'] = array_merge($bundleHierarchy[$name]['children'], array($name), $bundleHierarchy[$bundle['parent']]['children']);
+
+ foreach ($bundleHierarchy[$bundle['parent']]['parents'] as $parent) {
+ $bundleHierarchy[$name]['parents'][] = $parent;
+ $bundleHierarchy[$parent]['children'] = array_merge($bundleHierarchy[$name]['children'], array($name), $bundleHierarchy[$parent]['children']);
+ }
+
+ foreach ($bundleHierarchy[$name]['children'] as $child) {
+ $bundleHierarchy[$child]['parents'] = array_merge($bundleHierarchy[$child]['parents'], $bundleHierarchy[$name]['parents']);
+ }
+ }
+
+ return $bundleHierarchy;
+ }
+
+ private function normalizeBundleName($name)
{
- $name = $bundle;
if ('Bundle' === substr($name, -6)) {
$name = substr($name, 0, -6);
}
- $twigFilesystemLoaderDefinition->addMethodCall('addPath', array($dir, $name));
+
+ return $name;
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 29d2c439..800fc083 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -47,25 +47,11 @@
<service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
<argument type="collection" /> <!-- paths -->
<argument /> <!-- project's root dir -->
- </service>
-
- <service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
- <argument type="service" id="templating.locator" />
- <argument type="service" id="templating.name_parser" />
- <argument /> <!-- project's root dir -->
<tag name="twig.loader"/>
</service>
<service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>
- <service id="twig.loader" alias="twig.loader.filesystem" />
-
- <service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
- <argument type="service" id="twig" />
- <argument type="service" id="templating.name_parser" />
- <argument type="service" id="templating.locator" />
- </service>
-
<service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
<argument type="service" id="twig.profile" />
<argument type="service" id="debug.stopwatch" on-invalid="null" />
@@ -118,26 +104,8 @@
<argument type="service" id="router.request_context" on-invalid="ignore" />
</service>
- <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
- <argument type="collection">
- <argument type="service" id="service_container" />
- <argument>twig.form.renderer</argument>
- </argument>
- </service>
-
<service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
- <service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
- <argument>%twig.form.resources%</argument>
- <argument type="service" id="twig" />
- </service>
-
- <service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer">
- <argument type="service" id="twig.form.engine" />
- <argument type="service" id="security.csrf.token_manager" on-invalid="null" />
- <tag name="twig.runtime" />
- </service>
-
<service id="twig.translation.extractor" class="Symfony\Bridge\Twig\Translation\TwigExtractor">
<argument type="service" id="twig" />
<tag name="translation.extractor" alias="twig" />
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
index c8cdc305..417c83cd 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
@@ -27,7 +27,7 @@ class PreviewErrorControllerTest extends TestCase
$code = 123;
$logicalControllerName = 'foo:bar:baz';
- $kernel = $this->getMock('\Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('\Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel
->expects($this->once())
->method('handle')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
index 08e9d460..e8d9476d 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/TwigLoaderPassTest.php
@@ -31,10 +31,7 @@ class TwigLoaderPassTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->builder = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'setAlias', 'getDefinition')
- );
+ $this->builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'setAlias', 'getDefinition'))->getMock();
$this->chainLoader = new Definition('loader');
$this->pass = new TwigLoaderPass();
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index 2255444e..4073653c 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -153,7 +153,7 @@ class TwigExtensionTest extends TestCase
$this->loadFromFile($container, 'extra', $format);
$this->compileContainer($container);
- $def = $container->getDefinition('twig.loader.filesystem');
+ $def = $container->getDefinition('twig.loader.native_filesystem');
$paths = array();
foreach ($def->getMethodCalls() as $call) {
if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
@@ -167,8 +167,22 @@ class TwigExtensionTest extends TestCase
array('namespaced_path1', 'namespace1'),
array('namespaced_path2', 'namespace2'),
array('namespaced_path3', 'namespace3'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'Twig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'Twig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'Twig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'Twig'),
array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildTwigBundle/Resources/views', 'ChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
+ array(__DIR__.'/Fixtures/Bundle/ChildChildTwigBundle/Resources/views', 'ChildChildTwig'),
array(__DIR__.'/Fixtures/Resources/views'),
), $paths);
}
@@ -244,7 +258,40 @@ class TwigExtensionTest extends TestCase
'kernel.root_dir' => __DIR__.'/Fixtures',
'kernel.charset' => 'UTF-8',
'kernel.debug' => false,
- 'kernel.bundles' => array('TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle'),
+ 'kernel.bundles' => array(
+ 'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
+ 'ChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
+ 'ChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
+ 'ChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
+ 'ChildChildChildChildTwigBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
+ ),
+ 'kernel.bundles_metadata' => array(
+ 'ChildChildChildChildTwigBundle' => array(
+ 'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildChildTwigBundle\\ChildChildChildChildTwigBundle',
+ 'parent' => 'ChildChildChildTwigBundle',
+ 'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildChildTwigBundle',
+ ),
+ 'TwigBundle' => array(
+ 'namespace' => 'Symfony\\Bundle\\TwigBundle',
+ 'parent' => null,
+ 'path' => realpath(__DIR__.'/../..'),
+ ),
+ 'ChildTwigBundle' => array(
+ 'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildTwigBundle\\ChildTwigBundle',
+ 'parent' => 'TwigBundle',
+ 'path' => __DIR__.'/Fixtures/Bundle/ChildTwigBundle',
+ ),
+ 'ChildChildChildTwigBundle' => array(
+ 'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildChildTwigBundle\\ChildChildChildTwigBundle',
+ 'parent' => 'ChildChildTwigBundle',
+ 'path' => __DIR__.'/Fixtures/Bundle/ChildChildChildTwigBundle',
+ ),
+ 'ChildChildTwigBundle' => array(
+ 'namespace' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\ChildChildTwigBundle\\ChildChildTwigBundle',
+ 'parent' => 'ChildTwigBundle',
+ 'path' => __DIR__.'/Fixtures/Bundle/ChildChildTwigBundle',
+ ),
+ ),
)));
return $container;
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
index 26ae8306..58406683 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Filesystem\Filesystem;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\TwigBundle\TwigBundle;
-class NewCacheWamingTest extends \PHPUnit_Framework_TestCase
+class CacheWarmingTest extends \PHPUnit_Framework_TestCase
{
public function testCacheIsProperlyWarmedWhenTemplatingIsAvailable()
{
@@ -90,6 +90,7 @@ class CacheWarmingKernel extends Kernel
$loader->load(function ($container) {
$container->loadFromExtension('framework', array(
'secret' => '$ecret',
+ 'form' => array('enabled' => false),
));
});
@@ -99,6 +100,7 @@ class CacheWarmingKernel extends Kernel
'secret' => '$ecret',
'templating' => array('engines' => array('twig')),
'router' => array('resource' => '%kernel.root_dir%/Resources/config/empty_routing.yml'),
+ 'form' => array('enabled' => false),
));
});
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
index 068a1052..63933e49 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Functional/NoTemplatingEntryTest.php
@@ -62,6 +62,7 @@ class NoTemplatingEntryKernel extends Kernel
$loader->load(function ($container) {
$container->loadFromExtension('framework', array(
'secret' => '$ecret',
+ 'form' => array('enabled' => false),
));
});
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
index 64ba4903..a7abdecb 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@@ -19,8 +19,8 @@ class FilesystemLoaderTest extends TestCase
{
public function testGetSourceContext()
{
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locator
->expects($this->once())
->method('locate')
@@ -39,8 +39,8 @@ class FilesystemLoaderTest extends TestCase
public function testExists()
{
// should return true for templates that Twig does not find, but Symfony does
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locator
->expects($this->once())
->method('locate')
@@ -56,7 +56,7 @@ class FilesystemLoaderTest extends TestCase
*/
public function testTwigErrorIfLocatorThrowsInvalid()
{
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$parser
->expects($this->once())
->method('parse')
@@ -64,7 +64,7 @@ class FilesystemLoaderTest extends TestCase
->will($this->returnValue(new TemplateReference('', '', 'name', 'format', 'engine')))
;
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locator
->expects($this->once())
->method('locate')
@@ -80,7 +80,7 @@ class FilesystemLoaderTest extends TestCase
*/
public function testTwigErrorIfLocatorReturnsFalse()
{
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
$parser
->expects($this->once())
->method('parse')
@@ -88,7 +88,7 @@ class FilesystemLoaderTest extends TestCase
->will($this->returnValue(new TemplateReference('', '', 'name', 'format', 'engine')))
;
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locator
->expects($this->once())
->method('locate')
@@ -105,8 +105,8 @@ class FilesystemLoaderTest extends TestCase
*/
public function testTwigErrorIfTemplateDoesNotExist()
{
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$loader = new FilesystemLoader($locator, $parser);
$loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
@@ -118,8 +118,8 @@ class FilesystemLoaderTest extends TestCase
public function testTwigSoftErrorIfTemplateDoesNotExist()
{
- $parser = $this->getMock('Symfony\Component\Templating\TemplateNameParserInterface');
- $locator = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
+ $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$loader = new FilesystemLoader($locator, $parser);
$loader->addPath(__DIR__.'/../DependencyInjection/Fixtures/Resources/views');
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
index 13bb9ef9..636d5796 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
@@ -17,7 +17,7 @@ class TemplateIteratorTest extends TestCase
{
public function testGetIterator()
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
$bundle->expects($this->any())->method('getName')->will($this->returnValue('BarBundle'));
$bundle->expects($this->any())->method('getPath')->will($this->returnValue(__DIR__.'/Fixtures/templates/BarBundle'));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php
index 76daad58..503c55f6 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php
@@ -49,16 +49,12 @@ class TwigEngine extends BaseEngine implements EngineInterface
try {
return parent::render($name, $parameters);
} catch (\Twig_Error $e) {
- if ($name instanceof TemplateReference) {
+ if ($name instanceof TemplateReference && !method_exists($e, 'setSourceContext')) {
try {
// try to get the real name of the template where the error occurred
$name = $e->getTemplateName();
$path = (string) $this->locator->locate($this->parser->parse($name));
- if (method_exists($e, 'setSourceContext')) {
- $e->setSourceContext(new \Twig_Source('', $name, $path));
- } else {
- $e->setTemplateName($path);
- }
+ $e->setTemplateName($path);
} catch (\Exception $e2) {
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json
index ecb5ed59..8b51254f 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,9 +17,10 @@
],
"require": {
"php": ">=5.5.9",
+ "symfony/config": "~3.2",
"symfony/twig-bridge": "^3.2.1",
"symfony/http-foundation": "~2.8|~3.0",
- "symfony/http-kernel": "~2.8|~3.0",
+ "symfony/http-kernel": "~2.8.16|~3.1.9|^3.2.2",
"twig/twig": "~1.28|~2.0"
},
"require-dev": {
@@ -27,12 +28,12 @@
"symfony/stopwatch": "~2.8|~3.0",
"symfony/dependency-injection": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",
- "symfony/config": "~3.2",
"symfony/finder": "~2.8|~3.0",
+ "symfony/form": "~2.8|~3.0",
"symfony/routing": "~2.8|~3.0",
"symfony/templating": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0",
- "symfony/framework-bundle": "~3.2",
+ "symfony/framework-bundle": "^3.2.2",
"doctrine/annotations": "~1.0"
},
"autoload": {
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index 195f3f18..52168924 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -135,7 +135,8 @@ class ContentSecurityPolicyHandler
if (isset($headers[$header]['default-src'])) {
$headers[$header][$type] = $headers[$header]['default-src'];
} else {
- $headers[$header][$type] = array();
+ // If there is no script-src/style-src and no default-src, no additional rules required.
+ continue;
}
}
$ruleIsSet = true;
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
index 628e87de..38a08639 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -492,7 +492,9 @@
<td>
{% if error.trace %}
<span class="newline">Caused by:</span>
- {{ profiler_dump(error.trace, maxDepth=2) }}
+ {% for stacked in error.trace %}
+ {{ profiler_dump(stacked) }}
+ {% endfor %}
{% else %}
<em>Unknown.</em>
{% endif %}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
index 4386b8d0..d2db7b70 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -172,11 +172,10 @@
font-size: 11px;
padding: 4px 8px 4px 0;
}
-.sf-toolbar-block .sf-toolbar-info-piece span {
-
+.sf-toolbar-block:not(.sf-toolbar-block-dump) .sf-toolbar-info-piece span {
+ color: #F5F5F5;
}
.sf-toolbar-block .sf-toolbar-info-piece span {
- color: #F5F5F5;
font-size: 12px;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
index f10e3503..8d1e5b25 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php
@@ -23,7 +23,7 @@ class ProfilerControllerTest extends \PHPUnit_Framework_TestCase
*/
public function testEmptyToken($token)
{
- $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+ $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
$twig = $this->getMockBuilder('Twig_Environment')->disableOriginalConstructor()->getMock();
$profiler = $this
->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler')
@@ -151,10 +151,10 @@ class ProfilerControllerTest extends \PHPUnit_Framework_TestCase
private function createController($profiler, $twig, $withCSP)
{
- $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+ $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
if ($withCSP) {
- $nonceGenerator = $this->getMock('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator');
+ $nonceGenerator = $this->getMockBuilder('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator')->getMock();
return new ProfilerController($urlGenerator, $profiler, $twig, array(), 'normal', new ContentSecurityPolicyHandler($nonceGenerator));
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
index bfcfb80a..2a78b581 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Csp/ContentSecurityPolicyHandlerTest.php
@@ -118,6 +118,13 @@ class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
$this->createResponse($responseNonceHeaders),
array('Content-Security-Policy' => null, 'X-Content-Security-Policy' => null),
),
+ array(
+ $nonce,
+ array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
+ $this->createRequest(),
+ $this->createResponse(array('Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:')),
+ array('Content-Security-Policy' => 'frame-ancestors https: ; form-action: https:', 'X-Content-Security-Policy' => null),
+ ),
array(
$nonce,
array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
@@ -130,7 +137,7 @@ class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
$this->createRequest(),
$this->createResponse(array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'')),
- array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'X-Content-Security-Policy' => null),
+ array('Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'X-Content-Security-Policy' => null),
),
array(
$nonce,
@@ -144,21 +151,21 @@ class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
$this->createRequest(),
$this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'')),
- array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
+ array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\'', 'Content-Security-Policy' => null),
),
array(
$nonce,
array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
$this->createRequest(),
$this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\'')),
- array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
+ array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
),
array(
$nonce,
array('csp_script_nonce' => $nonce, 'csp_style_nonce' => $nonce),
$this->createRequest(),
$this->createResponse(array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\'')),
- array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'; style-src \'unsafe-inline\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
+ array('X-Content-Security-Policy' => 'script-src \'self\' \'unsafe-inline\' \'sha384-LALALALALAAL\' \'nonce-'.$nonce.'\'', 'Content-Security-Policy' => null),
),
array(
$nonce,
@@ -188,7 +195,7 @@ class ContentSecurityPolicyHandlerTest extends \PHPUnit_Framework_TestCase
private function mockNonceGenerator($value)
{
- $generator = $this->getMock('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator');
+ $generator = $this->getMockBuilder('Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator')->getMock();
$generator->expects($this->any())
->method('generate')
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
index 2a7d2d70..b5a9b53e 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -45,7 +45,7 @@ class WebProfilerExtensionTest extends TestCase
{
parent::setUp();
- $this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
+ $this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
$this->container = new ContainerBuilder();
$this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'));
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
index 169d12b0..12d247e1 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -247,11 +247,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
protected function getRequestMock($isXmlHttpRequest = false, $requestFormat = 'html', $hasSession = true)
{
- $request = $this->getMock(
- 'Symfony\Component\HttpFoundation\Request',
- array('getSession', 'isXmlHttpRequest', 'getRequestFormat'),
- array(), '', false
- );
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->setMethods(array('getSession', 'isXmlHttpRequest', 'getRequestFormat'))->disableOriginalConstructor()->getMock();
$request->expects($this->any())
->method('isXmlHttpRequest')
->will($this->returnValue($isXmlHttpRequest));
@@ -262,7 +258,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
$request->headers = new HeaderBag();
if ($hasSession) {
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\Session', array(), array(), '', false);
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
$request->expects($this->any())
->method('getSession')
->will($this->returnValue($session));
@@ -273,7 +269,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
protected function getTwigMock($render = 'WDT')
{
- $templating = $this->getMock('Twig_Environment', array(), array(), '', false);
+ $templating = $this->getMockBuilder('Twig_Environment')->disableOriginalConstructor()->getMock();
$templating->expects($this->any())
->method('render')
->will($this->returnValue($render));
@@ -283,11 +279,11 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
protected function getUrlGeneratorMock()
{
- return $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+ return $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
}
protected function getKernelMock()
{
- return $this->getMock('Symfony\Component\HttpKernel\Kernel', array(), array(), '', false);
+ return $this->getMockBuilder('Symfony\Component\HttpKernel\Kernel')->disableOriginalConstructor()->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
index c9b199ea..4ac2c7de 100644
--- a/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -136,9 +136,9 @@ class TemplateManagerTest extends TestCase
->will($this->returnValue('loadedTemplate'));
if (interface_exists('\Twig_SourceContextLoaderInterface')) {
- $loader = $this->getMock('\Twig_SourceContextLoaderInterface');
+ $loader = $this->getMockBuilder('\Twig_SourceContextLoaderInterface')->getMock();
} else {
- $loader = $this->getMock('\Twig_LoaderInterface');
+ $loader = $this->getMockBuilder('\Twig_LoaderInterface')->getMock();
}
$this->twigEnvironment->expects($this->any())->method('getLoader')->will($this->returnValue($loader));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Asset/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
index 07f75c9f..dea77a58 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/Context/RequestStackContextTest.php
@@ -17,7 +17,7 @@ class RequestStackContextTest extends \PHPUnit_Framework_TestCase
{
public function testGetBasePathEmpty()
{
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStackContext = new RequestStackContext($requestStack);
$this->assertEmpty($requestStackContext->getBasePath());
@@ -27,10 +27,10 @@ class RequestStackContextTest extends \PHPUnit_Framework_TestCase
{
$testBasePath = 'test-path';
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->method('getBasePath')
->willReturn($testBasePath);
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStack->method('getMasterRequest')
->willReturn($request);
@@ -41,7 +41,7 @@ class RequestStackContextTest extends \PHPUnit_Framework_TestCase
public function testIsSecureFalse()
{
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStackContext = new RequestStackContext($requestStack);
$this->assertFalse($requestStackContext->isSecure());
@@ -49,10 +49,10 @@ class RequestStackContextTest extends \PHPUnit_Framework_TestCase
public function testIsSecureTrue()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->method('isSecure')
->willReturn(true);
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStack->method('getMasterRequest')
->willReturn($request);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php
index 0a78a8b4..bb515f20 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PackagesTest.php
@@ -20,8 +20,8 @@ class PackagesTest extends \PHPUnit_Framework_TestCase
public function testGetterSetters()
{
$packages = new Packages();
- $packages->setDefaultPackage($default = $this->getMock('Symfony\Component\Asset\PackageInterface'));
- $packages->addPackage('a', $a = $this->getMock('Symfony\Component\Asset\PackageInterface'));
+ $packages->setDefaultPackage($default = $this->getMockBuilder('Symfony\Component\Asset\PackageInterface')->getMock());
+ $packages->addPackage('a', $a = $this->getMockBuilder('Symfony\Component\Asset\PackageInterface')->getMock());
$this->assertEquals($default, $packages->getPackage());
$this->assertEquals($a, $packages->getPackage('a'));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php
index ff5b0a05..1f0883ab 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/PathPackageTest.php
@@ -76,7 +76,7 @@ class PathPackageTest extends \PHPUnit_Framework_TestCase
private function getContext($basePath)
{
- $context = $this->getMock('Symfony\Component\Asset\Context\ContextInterface');
+ $context = $this->getMockBuilder('Symfony\Component\Asset\Context\ContextInterface')->getMock();
$context->expects($this->any())->method('getBasePath')->will($this->returnValue($basePath));
return $context;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
index 327876ae..588e9985 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Asset/Tests/UrlPackageTest.php
@@ -94,7 +94,7 @@ class UrlPackageTest extends \PHPUnit_Framework_TestCase
private function getContext($secure)
{
- $context = $this->getMock('Symfony\Component\Asset\Context\ContextInterface');
+ $context = $this->getMockBuilder('Symfony\Component\Asset\Context\ContextInterface')->getMock();
$context->expects($this->any())->method('isSecure')->will($this->returnValue($secure));
return $context;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php
index eeef805d..42f184d5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Cookie.php
@@ -121,7 +121,7 @@ class Cookie
* @param string $cookie A Set-Cookie header value
* @param string $url The base URL
*
- * @return Cookie A Cookie instance
+ * @return static
*
* @throws \InvalidArgumentException
*/
@@ -213,8 +213,6 @@ class Cookie
if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
return $date->format('U');
}
-
- throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
index 5a724333..4722de6d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -88,10 +88,11 @@ class CookieTest extends \PHPUnit_Framework_TestCase
Cookie::fromString('foo');
}
- public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()
+ public function testFromStringIgnoresInvalidExpiresDate()
{
- $this->setExpectedException('InvalidArgumentException');
- Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+ $cookie = Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+
+ $this->assertFalse($cookie->isExpired());
}
public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
index 85a0da80..274ebec1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
@@ -15,10 +15,23 @@ use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\CacheItem;
/**
- * Interface for adapters managing instances of Symfony's {@see CacheItem}.
+ * Interface for adapters managing instances of Symfony's CacheItem.
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
interface AdapterInterface extends CacheItemPoolInterface
{
+ /**
+ * {@inheritdoc}
+ *
+ * @return CacheItem
+ */
+ public function getItem($key);
+
+ /**
+ * {@inheritdoc}
+ *
+ * return \Traversable|CacheItem[]
+ */
+ public function getItems(array $keys = array());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index c731e47d..75124721 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -27,6 +27,7 @@ use Symfony\Component\Cache\Exception\InvalidArgumentException;
class ChainAdapter implements AdapterInterface
{
private $adapters = array();
+ private $adapterCount;
private $saveUp;
/**
@@ -50,6 +51,7 @@ class ChainAdapter implements AdapterInterface
$this->adapters[] = new ProxyAdapter($adapter);
}
}
+ $this->adapterCount = count($this->adapters);
$this->saveUp = \Closure::bind(
function ($adapter, $item) use ($maxLifetime) {
@@ -146,9 +148,10 @@ class ChainAdapter implements AdapterInterface
public function clear()
{
$cleared = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $cleared = $adapter->clear() && $cleared;
+ while ($i--) {
+ $cleared = $this->adapters[$i]->clear() && $cleared;
}
return $cleared;
@@ -160,9 +163,10 @@ class ChainAdapter implements AdapterInterface
public function deleteItem($key)
{
$deleted = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $deleted = $adapter->deleteItem($key) && $deleted;
+ while ($i--) {
+ $deleted = $this->adapters[$i]->deleteItem($key) && $deleted;
}
return $deleted;
@@ -174,9 +178,10 @@ class ChainAdapter implements AdapterInterface
public function deleteItems(array $keys)
{
$deleted = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $deleted = $adapter->deleteItems($keys) && $deleted;
+ while ($i--) {
+ $deleted = $this->adapters[$i]->deleteItems($keys) && $deleted;
}
return $deleted;
@@ -188,9 +193,10 @@ class ChainAdapter implements AdapterInterface
public function save(CacheItemInterface $item)
{
$saved = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $saved = $adapter->save($item) && $saved;
+ while ($i--) {
+ $saved = $this->adapters[$i]->save($item) && $saved;
}
return $saved;
@@ -202,9 +208,10 @@ class ChainAdapter implements AdapterInterface
public function saveDeferred(CacheItemInterface $item)
{
$saved = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $saved = $adapter->saveDeferred($item) && $saved;
+ while ($i--) {
+ $saved = $this->adapters[$i]->saveDeferred($item) && $saved;
}
return $saved;
@@ -216,9 +223,10 @@ class ChainAdapter implements AdapterInterface
public function commit()
{
$committed = true;
+ $i = $this->adapterCount;
- foreach ($this->adapters as $adapter) {
- $committed = $adapter->commit() && $committed;
+ while ($i--) {
+ $committed = $this->adapters[$i]->commit() && $committed;
}
return $committed;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
index 5be45195..1c62641c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapter.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Cache\Adapter;
+use Symfony\Component\Cache\Exception\CacheException;
+
/**
* @author Nicolas Grekas <p@tchwork.com>
*/
@@ -77,6 +79,10 @@ class FilesystemAdapter extends AbstractAdapter
$ok = $this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".serialize($value), $expiresAt) && $ok;
}
+ if (!$ok && !is_writable($this->directory)) {
+ throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+ }
+
return $ok;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
index 2f6e43e6..156fc5c1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/FilesystemAdapterTrait.php
@@ -40,9 +40,7 @@ trait FilesystemAdapterTrait
if (false === $dir = realpath($dir) ?: (file_exists($dir) ? $dir : false)) {
throw new InvalidArgumentException(sprintf('Cache directory does not exist (%s)', $directory));
}
- if (!is_writable($dir .= DIRECTORY_SEPARATOR)) {
- throw new InvalidArgumentException(sprintf('Cache directory is not writable (%s)', $directory));
- }
+ $dir .= DIRECTORY_SEPARATOR;
// On Windows the whole path is limited to 258 chars
if ('\\' === DIRECTORY_SEPARATOR && strlen($dir) > 234) {
throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
index 24245fcf..3fa3a405 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -108,9 +108,20 @@ class PdoAdapter extends AbstractAdapter
$conn = $this->getConnection();
if ($conn instanceof Connection) {
+ $types = array(
+ 'mysql' => 'binary',
+ 'sqlite' => 'text',
+ 'pgsql' => 'string',
+ 'oci' => 'string',
+ 'sqlsrv' => 'string',
+ );
+ if (!isset($types[$this->driver])) {
+ throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
+ }
+
$schema = new Schema();
$table = $schema->createTable($this->table);
- $table->addColumn($this->idCol, 'blob', array('length' => 255));
+ $table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
$table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
$table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
$table->addColumn($this->timeCol, 'integer', array('unsigned' => true, 'foo' => 'bar'));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 35fcad9a..c272ad0a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -163,14 +163,12 @@ EOF;
*/
public function getItem($key)
{
- if (null === $this->values) {
- $this->initialize();
- }
-
if (!is_string($key)) {
throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
}
-
+ if (null === $this->values) {
+ $this->initialize();
+ }
if (!isset($this->values[$key])) {
return $this->fallbackPool->getItem($key);
}
@@ -203,15 +201,14 @@ EOF;
*/
public function getItems(array $keys = array())
{
- if (null === $this->values) {
- $this->initialize();
- }
-
foreach ($keys as $key) {
if (!is_string($key)) {
throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
}
}
+ if (null === $this->values) {
+ $this->initialize();
+ }
return $this->generateItems($keys);
}
@@ -221,13 +218,12 @@ EOF;
*/
public function hasItem($key)
{
- if (null === $this->values) {
- $this->initialize();
- }
-
if (!is_string($key)) {
throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
}
+ if (null === $this->values) {
+ $this->initialize();
+ }
return isset($this->values[$key]) || $this->fallbackPool->hasItem($key);
}
@@ -249,13 +245,12 @@ EOF;
*/
public function deleteItem($key)
{
- if (null === $this->values) {
- $this->initialize();
- }
-
if (!is_string($key)) {
throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
}
+ if (null === $this->values) {
+ $this->initialize();
+ }
return !isset($this->values[$key]) && $this->fallbackPool->deleteItem($key);
}
@@ -265,10 +260,6 @@ EOF;
*/
public function deleteItems(array $keys)
{
- if (null === $this->values) {
- $this->initialize();
- }
-
$deleted = true;
$fallbackKeys = array();
@@ -283,6 +274,9 @@ EOF;
$fallbackKeys[] = $key;
}
}
+ if (null === $this->values) {
+ $this->initialize();
+ }
if ($fallbackKeys) {
$deleted = $this->fallbackPool->deleteItems($fallbackKeys) && $deleted;
@@ -328,7 +322,7 @@ EOF;
*/
private function initialize()
{
- $this->values = @(include $this->file) ?: array();
+ $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array();
}
/**
@@ -371,4 +365,42 @@ EOF;
}
}
}
+
+ /**
+ * @throws \ReflectionException When $class is not found and is required
+ *
+ * @internal
+ */
+ public static function throwOnRequiredClass($class)
+ {
+ $e = new \ReflectionException("Class $class does not exist");
+ $trace = $e->getTrace();
+ $autoloadFrame = array(
+ 'function' => 'spl_autoload_call',
+ 'args' => array($class),
+ );
+ $i = 1 + array_search($autoloadFrame, $trace, true);
+
+ if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
+ switch ($trace[$i]['function']) {
+ case 'get_class_methods':
+ case 'get_class_vars':
+ case 'get_parent_class':
+ case 'is_a':
+ case 'is_subclass_of':
+ case 'class_exists':
+ case 'class_implements':
+ case 'class_parents':
+ case 'trait_exists':
+ case 'defined':
+ case 'interface_exists':
+ case 'method_exists':
+ case 'property_exists':
+ case 'is_callable':
+ return;
+ }
+ }
+
+ throw $e;
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
index 8e09280c..befa38d8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -92,6 +92,7 @@ class PhpFilesAdapter extends AbstractAdapter
{
$ok = true;
$data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');
+ $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
foreach ($values as $key => $value) {
if (null === $value || is_object($value)) {
@@ -116,11 +117,15 @@ class PhpFilesAdapter extends AbstractAdapter
$file = $this->getFile($key, true);
$ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
- if ('cli' !== PHP_SAPI || ini_get('opcache.enable_cli')) {
+ if ($allowCompile) {
@opcache_compile_file($file);
}
}
+ if (!$ok && !is_writable($this->directory)) {
+ throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
+ }
+
return $ok;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
index fccfb926..7fd6921e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/RedisAdapter.php
@@ -26,7 +26,7 @@ class RedisAdapter extends AbstractAdapter
'class' => null,
'persistent' => 0,
'persistent_id' => null,
- 'timeout' => 0,
+ 'timeout' => 30,
'read_timeout' => 0,
'retry_interval' => 0,
);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 802c30fa..b8c4a080 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -26,6 +26,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface
private $deferred = array();
private $createCacheItem;
private $getTagsByKey;
+ private $invalidateTags;
private $tagsAdapter;
public function __construct(AdapterInterface $itemsAdapter, AdapterInterface $tagsAdapter = null)
@@ -33,17 +34,15 @@ class TagAwareAdapter implements TagAwareAdapterInterface
$this->itemsAdapter = $itemsAdapter;
$this->tagsAdapter = $tagsAdapter ?: $itemsAdapter;
$this->createCacheItem = \Closure::bind(
- function ($key, $value = null, CacheItem $protoItem = null) {
+ function ($key, $value, CacheItem $protoItem) {
$item = new CacheItem();
$item->key = $key;
$item->value = $value;
$item->isHit = false;
-
- if (null !== $protoItem) {
- $item->defaultLifetime = $protoItem->defaultLifetime;
- $item->innerItem = $protoItem->innerItem;
- $item->poolHash = $protoItem->poolHash;
- }
+ $item->defaultLifetime = $protoItem->defaultLifetime;
+ $item->expiry = $protoItem->expiry;
+ $item->innerItem = $protoItem->innerItem;
+ $item->poolHash = $protoItem->poolHash;
return $item;
},
@@ -62,6 +61,20 @@ class TagAwareAdapter implements TagAwareAdapterInterface
null,
CacheItem::class
);
+ $this->invalidateTags = \Closure::bind(
+ function (AdapterInterface $tagsAdapter, array $tags) {
+ foreach ($tagsAdapter->getItems($tags) as $v) {
+ $v->set(1 + (int) $v->get());
+ $v->defaultLifetime = 0;
+ $v->expiry = null;
+ $tagsAdapter->saveDeferred($v);
+ }
+
+ return $tagsAdapter->commit();
+ },
+ null,
+ CacheItem::class
+ );
}
/**
@@ -74,13 +87,9 @@ class TagAwareAdapter implements TagAwareAdapterInterface
$tags[$k] = $tag.static::TAGS_PREFIX;
}
}
+ $f = $this->invalidateTags;
- foreach ($this->tagsAdapter->getItems($tags) as $v) {
- $v->set(1 + (int) $v->get());
- $this->tagsAdapter->saveDeferred($v);
- }
-
- return $this->tagsAdapter->commit();
+ return $f($this->tagsAdapter, $tags);
}
/**
@@ -211,7 +220,8 @@ class TagAwareAdapter implements TagAwareAdapterInterface
$ok = true;
if ($this->deferred) {
- foreach ($this->deferred as $key => $item) {
+ $items = $this->deferred;
+ foreach ($items as $key => $item) {
if (!$this->itemsAdapter->saveDeferred($item)) {
unset($this->deferred[$key]);
$ok = false;
@@ -219,14 +229,14 @@ class TagAwareAdapter implements TagAwareAdapterInterface
}
$f = $this->getTagsByKey;
- $tagsByKey = $f($this->deferred);
+ $tagsByKey = $f($items);
$deletedTags = $this->deferred = array();
$tagVersions = $this->getTagVersions($tagsByKey);
$f = $this->createCacheItem;
foreach ($tagsByKey as $key => $tags) {
if ($tags) {
- $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags)));
+ $this->itemsAdapter->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
} else {
$deletedTags[] = static::TAGS_PREFIX.$key;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php
index f3d8b838..941d0bc6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/CacheItem.php
@@ -104,7 +104,7 @@ final class CacheItem implements CacheItemInterface
*
* @return static
*
- * @throws InvalidArgumentException When $tag is not valid.
+ * @throws InvalidArgumentException When $tag is not valid
*/
public function tag($tags)
{
@@ -121,7 +121,7 @@ final class CacheItem implements CacheItemInterface
if (!isset($tag[0])) {
throw new InvalidArgumentException('Cache tag length must be greater than zero');
}
- if (isset($tag[strcspn($tag, '{}()/\@:')])) {
+ if (false !== strpbrk($tag, '{}()/\@:')) {
throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));
}
$this->tags[$tag] = $tag;
@@ -135,7 +135,7 @@ final class CacheItem implements CacheItemInterface
*
* @param string $key The key to validate
*
- * @throws InvalidArgumentException When $key is not valid.
+ * @throws InvalidArgumentException When $key is not valid
*/
public static function validateKey($key)
{
@@ -145,7 +145,7 @@ final class CacheItem implements CacheItemInterface
if (!isset($key[0])) {
throw new InvalidArgumentException('Cache key length must be greater than zero');
}
- if (isset($key[strcspn($key, '{}()/\@:')])) {
+ if (false !== strpbrk($key, '{}()/\@:')) {
throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE
index 0564c5a9..ce39894f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Fabien Potencier
+Copyright (c) 2016-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
index 20b1fd7a..24586c0c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -97,4 +97,21 @@ class TagAwareAdapterTest extends AdapterTestCase
$this->assertTrue($pool->getItem('k')->isHit());
}
+
+ public function testTagItemExpiry()
+ {
+ $pool = $this->createCachePool(10);
+
+ $item = $pool->getItem('foo');
+ $item->tag(array('baz'));
+ $item->expiresAfter(100);
+
+ $pool->save($item);
+ $pool->invalidateTags(array('baz'));
+ $this->assertFalse($pool->getItem('foo')->isHit());
+
+ sleep(20);
+
+ $this->assertFalse($pool->getItem('foo')->isHit());
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
index 9f6e33ed..e45c3f8c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -299,7 +299,13 @@ REGEX;
*/
private static function writeCacheFile($file, $content)
{
- $tmpFile = tempnam(dirname($file), basename($file));
+ $dir = dirname($file);
+ if (!is_writable($dir)) {
+ throw new \RuntimeException(sprintf('Cache directory "%s" is not writable.', $dir));
+ }
+
+ $tmpFile = tempnam($dir, basename($file));
+
if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
@chmod($file, 0666 & ~umask());
diff --git a/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php
index 3c787059..846611e3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php
@@ -4,7 +4,7 @@
* foo
*/
-declare (strict_types = 1);
+declare(strict_types=1);
namespace Namespaced;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
index dc1c2fd8..a1fc1fab 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -86,7 +86,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
* If this function has been called and the node is not set during the finalization
* phase, it's default value will be derived from its children default values.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function addDefaultsIfNotSet()
{
@@ -102,7 +102,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* This method is applicable to prototype nodes only.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function addDefaultChildrenIfNoneSet($children = null)
{
@@ -116,7 +116,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* This method is applicable to prototype nodes only.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function requiresAtLeastOneElement()
{
@@ -130,7 +130,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* If used all keys have to be defined in the same configuration file.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function disallowNewKeysInSubsequentConfigs()
{
@@ -145,7 +145,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
* @param string $singular The key to remap
* @param string $plural The plural of the key for irregular plurals
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function fixXmlConfig($singular, $plural = null)
{
@@ -180,7 +180,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
* @param string $name The name of the key
* @param bool $removeKeyItem Whether or not the key item should be removed
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function useAttributeAsKey($name, $removeKeyItem = true)
{
@@ -195,7 +195,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* @param bool $allow
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function canBeUnset($allow = true)
{
@@ -217,7 +217,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
* enableableArrayNode: {enabled: false, ...} # The config is disabled
* enableableArrayNode: false # The config is disabled
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function canBeEnabled()
{
@@ -247,7 +247,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* By default, the section is enabled.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function canBeDisabled()
{
@@ -267,7 +267,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
/**
* Disables the deep merging of the node.
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function performNoDeepMerging()
{
@@ -287,7 +287,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* @param bool $remove Whether to remove the extra keys
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function ignoreExtraKeys($remove = true)
{
@@ -302,7 +302,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* @param bool $bool Whether to enable key normalization
*
- * @return ArrayNodeDefinition
+ * @return $this
*/
public function normalizeKeys($bool)
{
@@ -324,7 +324,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
*
* @param NodeDefinition $node A NodeDefinition instance
*
- * @return ArrayNodeDefinition This node
+ * @return $this
*/
public function append(NodeDefinition $node)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
index 5d3ff014..56047ad5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
@@ -25,7 +25,7 @@ class EnumNodeDefinition extends ScalarNodeDefinition
/**
* @param array $values
*
- * @return EnumNodeDefinition|$this
+ * @return $this
*/
public function values(array $values)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
index 94f6e207..150a2ec9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -40,7 +40,7 @@ class ExprBuilder
*
* @param \Closure $then
*
- * @return ExprBuilder
+ * @return $this
*/
public function always(\Closure $then = null)
{
@@ -60,7 +60,7 @@ class ExprBuilder
*
* @param \Closure $closure
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifTrue(\Closure $closure = null)
{
@@ -76,7 +76,7 @@ class ExprBuilder
/**
* Tests if the value is a string.
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifString()
{
@@ -88,7 +88,7 @@ class ExprBuilder
/**
* Tests if the value is null.
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifNull()
{
@@ -112,7 +112,7 @@ class ExprBuilder
/**
* Tests if the value is an array.
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifArray()
{
@@ -126,7 +126,7 @@ class ExprBuilder
*
* @param array $array
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifInArray(array $array)
{
@@ -140,7 +140,7 @@ class ExprBuilder
*
* @param array $array
*
- * @return ExprBuilder
+ * @return $this
*/
public function ifNotInArray(array $array)
{
@@ -154,7 +154,7 @@ class ExprBuilder
*
* @param \Closure $closure
*
- * @return ExprBuilder
+ * @return $this
*/
public function then(\Closure $closure)
{
@@ -166,7 +166,7 @@ class ExprBuilder
/**
* Sets a closure returning an empty array.
*
- * @return ExprBuilder
+ * @return $this
*/
public function thenEmptyArray()
{
@@ -182,7 +182,7 @@ class ExprBuilder
*
* @param string $message
*
- * @return ExprBuilder
+ * @return $this
*
* @throws \InvalidArgumentException
*/
@@ -196,7 +196,7 @@ class ExprBuilder
/**
* Sets a closure unsetting this key of the array at validation time.
*
- * @return ExprBuilder
+ * @return $this
*
* @throws UnsetKeyException
*/
@@ -210,7 +210,7 @@ class ExprBuilder
/**
* Returns the related node.
*
- * @return NodeDefinition
+ * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
*
* @throws \RuntimeException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
index f908a499..1d24953d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -37,7 +37,7 @@ class MergeBuilder
*
* @param bool $allow
*
- * @return MergeBuilder
+ * @return $this
*/
public function allowUnset($allow = true)
{
@@ -51,7 +51,7 @@ class MergeBuilder
*
* @param bool $deny Whether the overwriting is forbidden or not
*
- * @return MergeBuilder
+ * @return $this
*/
public function denyOverwrite($deny = true)
{
@@ -63,7 +63,7 @@ class MergeBuilder
/**
* Returns the related node.
*
- * @return NodeDefinition
+ * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
*/
public function end()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
index 2a063f1b..e780777a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -42,7 +42,7 @@ class NodeBuilder implements NodeParentInterface
*
* @param ParentNodeDefinitionInterface $parent The parent node
*
- * @return NodeBuilder This node builder
+ * @return $this
*/
public function setParent(ParentNodeDefinitionInterface $parent = null)
{
@@ -182,7 +182,7 @@ class NodeBuilder implements NodeParentInterface
*
* @param NodeDefinition $node
*
- * @return NodeBuilder This node builder
+ * @return $this
*/
public function append(NodeDefinition $node)
{
@@ -207,7 +207,7 @@ class NodeBuilder implements NodeParentInterface
* @param string $type The name of the type
* @param string $class The fully qualified name the node definition class
*
- * @return NodeBuilder This node builder
+ * @return $this
*/
public function setNodeClass($type, $class)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
index 4633dc7d..1b712a31 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -56,7 +56,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param NodeParentInterface $parent The parent
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function setParent(NodeParentInterface $parent)
{
@@ -70,7 +70,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param string $info The info text
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function info($info)
{
@@ -82,7 +82,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param string|array $example
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function example($example)
{
@@ -95,7 +95,7 @@ abstract class NodeDefinition implements NodeParentInterface
* @param string $key
* @param mixed $value
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function attribute($key, $value)
{
@@ -107,7 +107,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Returns the parent node.
*
- * @return NodeParentInterface|NodeBuilder|NodeDefinition|null The builder of the parent node
+ * @return NodeParentInterface|NodeBuilder|NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition|null The builder of the parent node
*/
public function end()
{
@@ -146,7 +146,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param mixed $value The default value
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function defaultValue($value)
{
@@ -159,7 +159,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Sets the node as required.
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function isRequired()
{
@@ -173,7 +173,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param mixed $value
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function treatNullLike($value)
{
@@ -187,7 +187,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param mixed $value
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function treatTrueLike($value)
{
@@ -201,7 +201,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param mixed $value
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function treatFalseLike($value)
{
@@ -213,7 +213,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Sets null as the default value.
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function defaultNull()
{
@@ -223,7 +223,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Sets true as the default value.
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function defaultTrue()
{
@@ -233,7 +233,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Sets false as the default value.
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function defaultFalse()
{
@@ -253,7 +253,7 @@ abstract class NodeDefinition implements NodeParentInterface
/**
* Denies the node value being empty.
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function cannotBeEmpty()
{
@@ -281,7 +281,7 @@ abstract class NodeDefinition implements NodeParentInterface
*
* @param bool $deny Whether the overwriting is forbidden or not
*
- * @return NodeDefinition|$this
+ * @return $this
*/
public function cannotBeOverwritten($deny = true)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
index 748c9f28..ae642a2d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
@@ -38,7 +38,7 @@ class NormalizationBuilder
* @param string $key The key to remap
* @param string $plural The plural of the key in case of irregular plural
*
- * @return NormalizationBuilder
+ * @return $this
*/
public function remap($key, $plural = null)
{
@@ -52,7 +52,7 @@ class NormalizationBuilder
*
* @param \Closure $closure
*
- * @return ExprBuilder|NormalizationBuilder
+ * @return ExprBuilder|$this
*/
public function before(\Closure $closure = null)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php
index 8451e75b..0d0207ca 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php
@@ -28,7 +28,7 @@ abstract class NumericNodeDefinition extends ScalarNodeDefinition
*
* @param mixed $max
*
- * @return NumericNodeDefinition
+ * @return $this
*
* @throws \InvalidArgumentException when the constraint is inconsistent
*/
@@ -47,7 +47,7 @@ abstract class NumericNodeDefinition extends ScalarNodeDefinition
*
* @param mixed $min
*
- * @return NumericNodeDefinition
+ * @return $this
*
* @throws \InvalidArgumentException when the constraint is inconsistent
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
index e8858238..12aa59a4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
@@ -36,7 +36,7 @@ class ValidationBuilder
*
* @param \Closure $closure
*
- * @return ExprBuilder|ValidationBuilder
+ * @return ExprBuilder|$this
*/
public function rule(\Closure $closure = null)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index ae1a7666..1c3c2188 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -29,6 +29,10 @@ class PrototypedArrayNode extends ArrayNode
protected $minNumberOfElements = 0;
protected $defaultValue = array();
protected $defaultChildren;
+ /**
+ * @var NodeInterface[] An array of the prototypes of the simplified value children
+ */
+ private $valuePrototypes = array();
/**
* Sets the minimum number of elements that a prototype based node must
@@ -194,9 +198,9 @@ class PrototypedArrayNode extends ArrayNode
}
foreach ($value as $k => $v) {
- $this->prototype->setName($k);
+ $prototype = $this->getPrototypeForChild($k);
try {
- $value[$k] = $this->prototype->finalize($v);
+ $value[$k] = $prototype->finalize($v);
} catch (UnsetKeyException $e) {
unset($value[$k]);
}
@@ -250,8 +254,18 @@ class PrototypedArrayNode extends ArrayNode
}
// if only "value" is left
- if (1 == count($v) && isset($v['value'])) {
+ if (array_keys($v) === array('value')) {
$v = $v['value'];
+ if ($this->prototype instanceof ArrayNode && ($children = $this->prototype->getChildren()) && array_key_exists('value', $children)) {
+ $valuePrototype = current($this->valuePrototypes) ?: clone $children['value'];
+ $valuePrototype->parent = $this;
+ $originalClosures = $this->prototype->normalizationClosures;
+ if (is_array($originalClosures)) {
+ $valuePrototypeClosures = $valuePrototype->normalizationClosures;
+ $valuePrototype->normalizationClosures = is_array($valuePrototypeClosures) ? array_merge($originalClosures, $valuePrototypeClosures) : $originalClosures;
+ }
+ $this->valuePrototypes[$k] = $valuePrototype;
+ }
}
}
@@ -264,11 +278,11 @@ class PrototypedArrayNode extends ArrayNode
}
}
- $this->prototype->setName($k);
+ $prototype = $this->getPrototypeForChild($k);
if (null !== $this->keyAttribute || $isAssoc) {
- $normalized[$k] = $this->prototype->normalize($v);
+ $normalized[$k] = $prototype->normalize($v);
} else {
- $normalized[] = $this->prototype->normalize($v);
+ $normalized[] = $prototype->normalize($v);
}
}
@@ -322,10 +336,54 @@ class PrototypedArrayNode extends ArrayNode
continue;
}
- $this->prototype->setName($k);
- $leftSide[$k] = $this->prototype->merge($leftSide[$k], $v);
+ $prototype = $this->getPrototypeForChild($k);
+ $leftSide[$k] = $prototype->merge($leftSide[$k], $v);
}
return $leftSide;
}
+
+ /**
+ * Returns a prototype for the child node that is associated to $key in the value array.
+ * For general child nodes, this will be $this->prototype.
+ * But if $this->removeKeyAttribute is true and there are only two keys in the child node:
+ * one is same as this->keyAttribute and the other is 'value', then the prototype will be different.
+ *
+ * For example, assume $this->keyAttribute is 'name' and the value array is as follows:
+ * array(
+ * array(
+ * 'name' => 'name001',
+ * 'value' => 'value001'
+ * )
+ * )
+ *
+ * Now, the key is 0 and the child node is:
+ * array(
+ * 'name' => 'name001',
+ * 'value' => 'value001'
+ * )
+ *
+ * When normalizing the value array, the 'name' element will removed from the child node
+ * and its value becomes the new key of the child node:
+ * array(
+ * 'name001' => array('value' => 'value001')
+ * )
+ *
+ * Now only 'value' element is left in the child node which can be further simplified into a string:
+ * array('name001' => 'value001')
+ *
+ * Now, the key becomes 'name001' and the child node becomes 'value001' and
+ * the prototype of child node 'name001' should be a ScalarNode instead of an ArrayNode instance.
+ *
+ * @param string $key The key of the child node
+ *
+ * @return mixed The prototype instance
+ */
+ private function getPrototypeForChild($key)
+ {
+ $prototype = isset($this->valuePrototypes[$key]) ? $this->valuePrototypes[$key] : $this->prototype;
+ $prototype->setName($key);
+
+ return $prototype;
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php
index de4e1273..a6f8d9c6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Loader/Loader.php
@@ -57,7 +57,7 @@ abstract class Loader implements LoaderInterface
* @param mixed $resource A resource
* @param string|null $type The resource type or null if unknown
*
- * @return LoaderInterface A LoaderInterface instance
+ * @return $this|LoaderInterface
*
* @throws FileLoaderLoadException If no loader is found
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
index ba7d600c..0e3a411b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -72,11 +72,6 @@ class ResourceCheckerConfigCache implements ConfigCacheInterface
return true; // shortcut - if we don't have any checkers we don't need to bother with the meta file at all
}
- $metadata = $this->getMetaFile();
- if (!is_file($metadata)) {
- return true;
- }
-
$metadata = $this->getMetaFile();
if (!is_file($metadata)) {
return false;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
index c343fcfd..77013a14 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Definition/PrototypedArrayNodeTest.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Config\Tests\Definition;
use Symfony\Component\Config\Definition\PrototypedArrayNode;
use Symfony\Component\Config\Definition\ArrayNode;
use Symfony\Component\Config\Definition\ScalarNode;
+use Symfony\Component\Config\Definition\VariableNode;
class PrototypedArrayNodeTest extends \PHPUnit_Framework_TestCase
{
@@ -177,4 +178,164 @@ class PrototypedArrayNodeTest extends \PHPUnit_Framework_TestCase
return $node;
}
+
+ /**
+ * Tests that when a key attribute is mapped, that key is removed from the array.
+ * And if only 'value' element is left in the array, it will replace its wrapper array.
+ *
+ * <things>
+ * <option id="option1" value="value1">
+ * </things>
+ *
+ * The above should finally be mapped to an array that looks like this
+ * (because "id" is the key attribute).
+ *
+ * array(
+ * 'things' => array(
+ * 'option1' => 'value1'
+ * )
+ * )
+ *
+ * It's also possible to mix 'value-only' and 'non-value-only' elements in the array.
+ *
+ * <things>
+ * <option id="option1" value="value1">
+ * <option id="option2" value="value2" foo="foo2">
+ * </things>
+ *
+ * The above should finally be mapped to an array as follows
+ *
+ * array(
+ * 'things' => array(
+ * 'option1' => 'value1',
+ * 'option2' => array(
+ * 'value' => 'value2',
+ * 'foo' => 'foo2'
+ * )
+ * )
+ * )
+ *
+ * The 'value' element can also be ArrayNode:
+ *
+ * <things>
+ * <option id="option1">
+ * <value>
+ * <foo>foo1</foo>
+ * <bar>bar1</bar>
+ * </value>
+ * </option>
+ * </things>
+ *
+ * The above should be finally be mapped to an array as follows
+ *
+ * array(
+ * 'things' => array(
+ * 'option1' => array(
+ * 'foo' => 'foo1',
+ * 'bar' => 'bar1'
+ * )
+ * )
+ * )
+ *
+ * If using VariableNode for value node, it's also possible to mix different types of value nodes:
+ *
+ * <things>
+ * <option id="option1">
+ * <value>
+ * <foo>foo1</foo>
+ * <bar>bar1</bar>
+ * </value>
+ * </option>
+ * <option id="option2" value="value2">
+ * </things>
+ *
+ * The above should be finally mapped to an array as follows
+ *
+ * array(
+ * 'things' => array(
+ * 'option1' => array(
+ * 'foo' => 'foo1',
+ * 'bar' => 'bar1'
+ * ),
+ * 'option2' => 'value2'
+ * )
+ * )
+ *
+ *
+ * @dataProvider getDataForKeyRemovedLeftValueOnly
+ */
+ public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, $children, $expected)
+ {
+ $node = new PrototypedArrayNode('root');
+ $node->setKeyAttribute('id', true);
+
+ // each item under the root is an array, with one scalar item
+ $prototype = new ArrayNode(null, $node);
+ $prototype->addChild(new ScalarNode('id'));
+ $prototype->addChild(new ScalarNode('foo'));
+ $prototype->addChild($value);
+ $node->setPrototype($prototype);
+
+ $normalized = $node->normalize($children);
+ $this->assertEquals($expected, $normalized);
+ }
+
+ public function getDataForKeyRemovedLeftValueOnly()
+ {
+ $scalarValue = new ScalarNode('value');
+
+ $arrayValue = new ArrayNode('value');
+ $arrayValue->addChild(new ScalarNode('foo'));
+ $arrayValue->addChild(new ScalarNode('bar'));
+
+ $variableValue = new VariableNode('value');
+
+ return array(
+ array(
+ $scalarValue,
+ array(
+ array('id' => 'option1', 'value' => 'value1'),
+ ),
+ array('option1' => 'value1'),
+ ),
+
+ array(
+ $scalarValue,
+ array(
+ array('id' => 'option1', 'value' => 'value1'),
+ array('id' => 'option2', 'value' => 'value2', 'foo' => 'foo2'),
+ ),
+ array(
+ 'option1' => 'value1',
+ 'option2' => array('value' => 'value2', 'foo' => 'foo2'),
+ ),
+ ),
+
+ array(
+ $arrayValue,
+ array(
+ array(
+ 'id' => 'option1',
+ 'value' => array('foo' => 'foo1', 'bar' => 'bar1'),
+ ),
+ ),
+ array(
+ 'option1' => array('foo' => 'foo1', 'bar' => 'bar1'),
+ ),
+ ),
+
+ array($variableValue,
+ array(
+ array(
+ 'id' => 'option1', 'value' => array('foo' => 'foo1', 'bar' => 'bar1'),
+ ),
+ array('id' => 'option2', 'value' => 'value2'),
+ ),
+ array(
+ 'option1' => array('foo' => 'foo1', 'bar' => 'bar1'),
+ 'option2' => 'value2',
+ ),
+ ),
+ );
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
index cdb09803..8f3039df 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/DelegatingLoaderTest.php
@@ -33,12 +33,12 @@ class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
public function testSupports()
{
- $loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader1->expects($this->once())->method('supports')->will($this->returnValue(true));
$loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
$this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
- $loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader1->expects($this->once())->method('supports')->will($this->returnValue(false));
$loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
$this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
@@ -46,7 +46,7 @@ class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
public function testLoad()
{
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader->expects($this->once())->method('supports')->will($this->returnValue(true));
$loader->expects($this->once())->method('load');
$resolver = new LoaderResolver(array($loader));
@@ -60,7 +60,7 @@ class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded()
{
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader->expects($this->once())->method('supports')->will($this->returnValue(false));
$resolver = new LoaderResolver(array($loader));
$loader = new DelegatingLoader($resolver);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
index 1e8e91ed..8f46051b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php
@@ -18,9 +18,9 @@ class FileLoaderTest extends \PHPUnit_Framework_TestCase
{
public function testImportWithFileLocatorDelegation()
{
- $locatorMock = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
- $locatorMockForAdditionalLoader = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+ $locatorMockForAdditionalLoader = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
array('path/to/file1'), // Default
array('path/to/file1', 'path/to/file2'), // First is imported
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
index 03db21be..1685f32e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderResolverTest.php
@@ -18,7 +18,7 @@ class LoaderResolverTest extends \PHPUnit_Framework_TestCase
public function testConstructor()
{
$resolver = new LoaderResolver(array(
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'),
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock(),
));
$this->assertEquals(array($loader), $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
@@ -26,11 +26,11 @@ class LoaderResolverTest extends \PHPUnit_Framework_TestCase
public function testResolve()
{
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$resolver = new LoaderResolver(array($loader));
$this->assertFalse($resolver->resolve('foo.foo'), '->resolve() returns false if no loader is able to load the resource');
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader->expects($this->once())->method('supports')->will($this->returnValue(true));
$resolver = new LoaderResolver(array($loader));
$this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
@@ -39,7 +39,7 @@ class LoaderResolverTest extends \PHPUnit_Framework_TestCase
public function testLoaders()
{
$resolver = new LoaderResolver();
- $resolver->addLoader($loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'));
+ $resolver->addLoader($loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock());
$this->assertEquals(array($loader), $resolver->getLoaders(), 'addLoader() adds a loader');
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
index e938a4b0..e9f79a8d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
@@ -17,7 +17,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
{
public function testGetSetResolver()
{
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$loader = new ProjectLoader1();
$loader->setResolver($resolver);
@@ -27,9 +27,9 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
public function testResolve()
{
- $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$resolver->expects($this->once())
->method('resolve')
->with('foo.xml')
@@ -47,7 +47,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
*/
public function testResolveWhenResolverCannotFindLoader()
{
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$resolver->expects($this->once())
->method('resolve')
->with('FOOBAR')
@@ -61,13 +61,13 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
public function testImport()
{
- $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$resolvedLoader->expects($this->once())
->method('load')
->with('foo')
->will($this->returnValue('yes'));
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$resolver->expects($this->once())
->method('resolve')
->with('foo')
@@ -81,13 +81,13 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
public function testImportWithType()
{
- $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$resolvedLoader->expects($this->once())
->method('load')
->with('foo', 'bar')
->will($this->returnValue('yes'));
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$resolver->expects($this->once())
->method('resolve')
->with('foo', 'bar')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
index c76c0dd0..6c12c28a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/ResourceCheckerConfigCacheTest.php
@@ -44,7 +44,7 @@ class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
public function testCacheIsNotFreshIfEmpty()
{
- $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface')
+ $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock()
->expects($this->never())->method('supports');
/* If there is nothing in the cache, it needs to be filled (and thus it's not fresh).
@@ -75,7 +75,7 @@ class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
public function testIsFreshWithchecker()
{
- $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface');
+ $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
$checker->expects($this->once())
->method('supports')
@@ -93,7 +93,7 @@ class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
public function testIsNotFreshWithchecker()
{
- $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface');
+ $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
$checker->expects($this->once())
->method('supports')
@@ -111,7 +111,7 @@ class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
public function testCacheIsNotFreshWhenUnserializeFails()
{
- $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface');
+ $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
$cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
$cache->write('foo', array(new FileResource(__FILE__)));
@@ -128,4 +128,16 @@ class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
$this->assertSame('FOOBAR', file_get_contents($cache->getPath()));
}
+
+ public function testCacheIsNotFreshIfNotExistsMetaFile()
+ {
+ $checker = $this->getMockBuilder('\Symfony\Component\Config\ResourceCheckerInterface')->getMock();
+ $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
+ $cache->write('foo', array(new FileResource(__FILE__)));
+
+ $metaFile = "{$this->cacheFile}.meta";
+ unlink($metaFile);
+
+ $this->assertFalse($cache->isFresh());
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
index cefd4f29..14aed808 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -47,7 +47,7 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
$this->assertContains('XSD file or callable', $e->getMessage());
}
- $mock = $this->getMock(__NAMESPACE__.'\Validator');
+ $mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
$mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
try {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php
index f2746c89..dcfc2e7a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Application.php
@@ -100,8 +100,6 @@ class Application
* @param OutputInterface $output An Output instance
*
* @return int 0 if everything went fine, or an error code
- *
- * @throws \Exception When doRun returns Exception
*/
public function run(InputInterface $input = null, OutputInterface $output = null)
{
@@ -415,7 +413,7 @@ class Application
*
* @return Command A Command object
*
- * @throws CommandNotFoundException When command name given does not exist
+ * @throws CommandNotFoundException When given command name does not exist
*/
public function get($name)
{
@@ -741,7 +739,7 @@ class Application
* @param int $width The width
* @param int $height The height
*
- * @return Application The current application
+ * @return $this
*
* @deprecated since version 3.2, to be removed in 4.0. Set the COLUMNS and LINES env vars instead.
*/
@@ -814,8 +812,6 @@ class Application
* @param OutputInterface $output An Output instance
*
* @return int 0 if everything went fine, or an error code
- *
- * @throws \Exception when the command being run threw an exception
*/
protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php
index ecb2da74..2aca302a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Command/Command.php
@@ -228,7 +228,14 @@ class Command
if (null !== $this->processTitle) {
if (function_exists('cli_set_process_title')) {
- cli_set_process_title($this->processTitle);
+ if (false === @cli_set_process_title($this->processTitle)) {
+ if ('Darwin' === PHP_OS) {
+ $output->writeln('<comment>Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.</comment>');
+ } else {
+ $error = error_get_last();
+ trigger_error($error['message'], E_USER_WARNING);
+ }
+ }
} elseif (function_exists('setproctitle')) {
setproctitle($this->processTitle);
} elseif (OutputInterface::VERBOSITY_VERY_VERBOSE === $output->getVerbosity()) {
@@ -266,7 +273,7 @@ class Command
*
* @param callable $code A callable(InputInterface $input, OutputInterface $output)
*
- * @return Command The current instance
+ * @return $this
*
* @throws InvalidArgumentException
*
@@ -277,7 +284,15 @@ class Command
if ($code instanceof \Closure) {
$r = new \ReflectionFunction($code);
if (null === $r->getClosureThis()) {
- $code = \Closure::bind($code, $this);
+ if (PHP_VERSION_ID < 70000) {
+ // Bug in PHP5: https://bugs.php.net/bug.php?id=64761
+ // This means that we cannot bind static closures and therefore we must
+ // ignore any errors here. There is no way to test if the closure is
+ // bindable.
+ $code = @\Closure::bind($code, $this);
+ } else {
+ $code = \Closure::bind($code, $this);
+ }
}
}
@@ -318,7 +333,7 @@ class Command
*
* @param array|InputDefinition $definition An array of argument and option instances or a definition instance
*
- * @return Command The current instance
+ * @return $this
*/
public function setDefinition($definition)
{
@@ -366,7 +381,7 @@ class Command
* @param string $description A description text
* @param mixed $default The default value (for InputArgument::OPTIONAL mode only)
*
- * @return Command The current instance
+ * @return $this
*/
public function addArgument($name, $mode = null, $description = '', $default = null)
{
@@ -384,7 +399,7 @@ class Command
* @param string $description A description text
* @param mixed $default The default value (must be null for InputOption::VALUE_NONE)
*
- * @return Command The current instance
+ * @return $this
*/
public function addOption($name, $shortcut = null, $mode = null, $description = '', $default = null)
{
@@ -403,7 +418,7 @@ class Command
*
* @param string $name The command name
*
- * @return Command The current instance
+ * @return $this
*
* @throws InvalidArgumentException When the name is invalid
*/
@@ -426,7 +441,7 @@ class Command
*
* @param string $title The process title
*
- * @return Command The current instance
+ * @return $this
*/
public function setProcessTitle($title)
{
@@ -470,7 +485,7 @@ class Command
*
* @param string $description The description for the command
*
- * @return Command The current instance
+ * @return $this
*/
public function setDescription($description)
{
@@ -494,7 +509,7 @@ class Command
*
* @param string $help The help for the command
*
- * @return Command The current instance
+ * @return $this
*/
public function setHelp($help)
{
@@ -540,7 +555,7 @@ class Command
*
* @param string[] $aliases An array of aliases for the command
*
- * @return Command The current instance
+ * @return $this
*
* @throws InvalidArgumentException When an alias is invalid
*/
@@ -592,7 +607,7 @@ class Command
*
* @param string $usage The usage, it'll be prefixed with the command name
*
- * @return Command The current instance
+ * @return $this
*/
public function addUsage($usage)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index 2eb9944d..c2d6243e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Console\Descriptor;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Helper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Input\InputOption;
@@ -94,7 +95,7 @@ class MarkdownDescriptor extends Descriptor
$this->write(
$command->getName()."\n"
- .str_repeat('-', strlen($command->getName()))."\n\n"
+ .str_repeat('-', Helper::strlen($command->getName()))."\n\n"
.'* Description: '.($command->getDescription() ?: '<none>')."\n"
.'* Usage:'."\n\n"
.array_reduce(array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
@@ -121,7 +122,7 @@ class MarkdownDescriptor extends Descriptor
$describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
$description = new ApplicationDescription($application, $describedNamespace);
- $this->write($application->getName()."\n".str_repeat('=', strlen($application->getName())));
+ $this->write($application->getName()."\n".str_repeat('=', Helper::strlen($application->getName())));
foreach ($description->getNamespaces() as $namespace) {
if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index fe4fa502..81710046 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -13,6 +13,8 @@ namespace Symfony\Component\Console\Descriptor;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\Helper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Input\InputOption;
@@ -37,7 +39,7 @@ class TextDescriptor extends Descriptor
$default = '';
}
- $totalWidth = isset($options['total_width']) ? $options['total_width'] : strlen($argument->getName());
+ $totalWidth = isset($options['total_width']) ? $options['total_width'] : Helper::strlen($argument->getName());
$spacingWidth = $totalWidth - strlen($argument->getName());
$this->writeText(sprintf(' <info>%s</info> %s%s%s',
@@ -75,7 +77,7 @@ class TextDescriptor extends Descriptor
sprintf('--%s%s', $option->getName(), $value)
);
- $spacingWidth = $totalWidth - strlen($synopsis);
+ $spacingWidth = $totalWidth - Helper::strlen($synopsis);
$this->writeText(sprintf(' <info>%s</info> %s%s%s%s',
$synopsis,
@@ -94,7 +96,7 @@ class TextDescriptor extends Descriptor
{
$totalWidth = $this->calculateTotalWidthForOptions($definition->getOptions());
foreach ($definition->getArguments() as $argument) {
- $totalWidth = max($totalWidth, strlen($argument->getName()));
+ $totalWidth = max($totalWidth, Helper::strlen($argument->getName()));
}
if ($definition->getArguments()) {
@@ -209,7 +211,7 @@ class TextDescriptor extends Descriptor
foreach ($namespace['commands'] as $name) {
if (isset($commands[$name])) {
$this->writeText("\n");
- $spacingWidth = $width - strlen($name);
+ $spacingWidth = $width - Helper::strlen($name);
$command = $commands[$name];
$commandAliases = $this->getCommandAliasesText($command);
$this->writeText(sprintf(' <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $commandAliases.$command->getDescription()), $options);
@@ -260,6 +262,16 @@ class TextDescriptor extends Descriptor
*/
private function formatDefaultValue($default)
{
+ if (is_string($default)) {
+ $default = OutputFormatter::escape($default);
+ } elseif (is_array($default)) {
+ foreach ($default as $key => $value) {
+ if (is_string($value)) {
+ $default[$key] = OutputFormatter::escape($value);
+ }
+ }
+ }
+
return str_replace('\\\\', '\\', json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
}
@@ -273,9 +285,9 @@ class TextDescriptor extends Descriptor
$widths = array();
foreach ($commands as $command) {
- $widths[] = strlen($command->getName());
+ $widths[] = Helper::strlen($command->getName());
foreach ($command->getAliases() as $alias) {
- $widths[] = strlen($alias);
+ $widths[] = Helper::strlen($alias);
}
}
@@ -292,10 +304,10 @@ class TextDescriptor extends Descriptor
$totalWidth = 0;
foreach ($options as $option) {
// "-" + shortcut + ", --" + name
- $nameLength = 1 + max(strlen($option->getShortcut()), 1) + 4 + strlen($option->getName());
+ $nameLength = 1 + max(Helper::strlen($option->getShortcut()), 1) + 4 + Helper::strlen($option->getName());
if ($option->acceptValue()) {
- $valueLength = 1 + strlen($option->getName()); // = + value
+ $valueLength = 1 + Helper::strlen($option->getName()); // = + value
$valueLength += $option->isValueOptional() ? 2 : 0; // [ + ]
$nameLength += $valueLength;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php
index b1a763d0..47c76189 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -35,6 +35,20 @@ class OutputFormatter implements OutputFormatterInterface
{
$text = preg_replace('/([^\\\\]?)</', '$1\\<', $text);
+ return self::escapeTrailingBackslash($text);
+ }
+
+ /**
+ * Escapes trailing "\" in given text.
+ *
+ * @param string $text Text to escape
+ *
+ * @return string Escaped text
+ *
+ * @internal
+ */
+ public static function escapeTrailingBackslash($text)
+ {
if ('\\' === substr($text, -1)) {
$len = strlen($text);
$text = rtrim($text, '\\');
@@ -194,7 +208,7 @@ class OutputFormatter implements OutputFormatterInterface
*
* @param string $string
*
- * @return OutputFormatterStyle|bool false if string is not format string
+ * @return OutputFormatterStyle|false false if string is not format string
*/
private function createStyleFromString($string)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
index e5d14ea3..0a531d29 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php
@@ -104,7 +104,7 @@ class OutputFormatterStyleStack
/**
* @param OutputFormatterStyleInterface $emptyStyle
*
- * @return OutputFormatterStyleStack
+ * @return $this
*/
public function setEmptyStyle(OutputFormatterStyleInterface $emptyStyle)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index a53b476b..300e6455 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -78,7 +78,7 @@ class DescriptorHelper extends Helper
* @param string $format
* @param DescriptorInterface $descriptor
*
- * @return DescriptorHelper
+ * @return $this
*/
public function register($format, DescriptorInterface $descriptor)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php
index 43f9a169..9c538d1a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Helper.php
@@ -35,7 +35,7 @@ abstract class Helper implements HelperInterface
/**
* Gets the helper set associated with this helper.
*
- * @return HelperSet A HelperSet instance
+ * @return HelperSet|null
*/
public function getHelperSet()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
index 88351d16..25e094a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
@@ -54,7 +54,7 @@ class SymfonyQuestionHelper extends QuestionHelper
*/
protected function writePrompt(OutputInterface $output, Question $question)
{
- $text = OutputFormatter::escape($question->getQuestion());
+ $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
$default = $question->getDefault();
switch (true) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php
index 1434562d..6f784ae7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/Table.php
@@ -107,7 +107,7 @@ class Table
*
* @param string $name The style name
*
- * @return TableStyle A TableStyle instance
+ * @return TableStyle
*/
public static function getStyleDefinition($name)
{
@@ -127,7 +127,7 @@ class Table
*
* @param TableStyle|string $name The style name or a TableStyle instance
*
- * @return Table
+ * @return $this
*/
public function setStyle($name)
{
@@ -152,7 +152,7 @@ class Table
* @param int $columnIndex Column index
* @param TableStyle|string $name The style name or a TableStyle instance
*
- * @return Table
+ * @return $this
*/
public function setColumnStyle($columnIndex, $name)
{
@@ -187,7 +187,7 @@ class Table
* @param int $columnIndex Column index
* @param int $width Minimum column width in characters
*
- * @return Table
+ * @return $this
*/
public function setColumnWidth($columnIndex, $width)
{
@@ -201,7 +201,7 @@ class Table
*
* @param array $widths
*
- * @return Table
+ * @return $this
*/
public function setColumnWidths(array $widths)
{
@@ -599,7 +599,7 @@ class Table
foreach ($row as $i => $cell) {
if ($cell instanceof TableCell) {
- $textLength = strlen($cell);
+ $textLength = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
if ($textLength > 0) {
$contentColumns = str_split($cell, ceil($textLength / $cell->getColspan()));
foreach ($contentColumns as $position => $content) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php
index 69442d42..a3064fc0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableCell.php
@@ -37,6 +37,10 @@ class TableCell
*/
public function __construct($value = '', array $options = array())
{
+ if (is_numeric($value) && !is_string($value)) {
+ $value = (string) $value;
+ }
+
$this->value = $value;
// check option names
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php
index d7e28ff2..2999c76f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Helper/TableStyle.php
@@ -37,7 +37,7 @@ class TableStyle
*
* @param string $paddingChar
*
- * @return TableStyle
+ * @return $this
*/
public function setPaddingChar($paddingChar)
{
@@ -65,7 +65,7 @@ class TableStyle
*
* @param string $horizontalBorderChar
*
- * @return TableStyle
+ * @return $this
*/
public function setHorizontalBorderChar($horizontalBorderChar)
{
@@ -89,7 +89,7 @@ class TableStyle
*
* @param string $verticalBorderChar
*
- * @return TableStyle
+ * @return $this
*/
public function setVerticalBorderChar($verticalBorderChar)
{
@@ -113,7 +113,7 @@ class TableStyle
*
* @param string $crossingChar
*
- * @return TableStyle
+ * @return $this
*/
public function setCrossingChar($crossingChar)
{
@@ -137,7 +137,7 @@ class TableStyle
*
* @param string $cellHeaderFormat
*
- * @return TableStyle
+ * @return $this
*/
public function setCellHeaderFormat($cellHeaderFormat)
{
@@ -161,7 +161,7 @@ class TableStyle
*
* @param string $cellRowFormat
*
- * @return TableStyle
+ * @return $this
*/
public function setCellRowFormat($cellRowFormat)
{
@@ -185,7 +185,7 @@ class TableStyle
*
* @param string $cellRowContentFormat
*
- * @return TableStyle
+ * @return $this
*/
public function setCellRowContentFormat($cellRowContentFormat)
{
@@ -209,7 +209,7 @@ class TableStyle
*
* @param string $borderFormat
*
- * @return TableStyle
+ * @return $this
*/
public function setBorderFormat($borderFormat)
{
@@ -233,7 +233,7 @@ class TableStyle
*
* @param int $padType STR_PAD_*
*
- * @return TableStyle
+ * @return $this
*/
public function setPadType($padType)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php
index 39c4a852..522a81bb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Question/ChoiceQuestion.php
@@ -58,7 +58,7 @@ class ChoiceQuestion extends Question
*
* @param bool $multiselect
*
- * @return ChoiceQuestion The current instance
+ * @return $this
*/
public function setMultiselect($multiselect)
{
@@ -93,7 +93,7 @@ class ChoiceQuestion extends Question
*
* @param string $prompt
*
- * @return ChoiceQuestion The current instance
+ * @return $this
*/
public function setPrompt($prompt)
{
@@ -109,7 +109,7 @@ class ChoiceQuestion extends Question
*
* @param string $errorMessage
*
- * @return ChoiceQuestion The current instance
+ * @return $this
*/
public function setErrorMessage($errorMessage)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php
index 7a69279f..6425cc54 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Question/Question.php
@@ -77,7 +77,7 @@ class Question
*
* @param bool $hidden
*
- * @return Question The current instance
+ * @return $this
*
* @throws LogicException In case the autocompleter is also used
*/
@@ -107,7 +107,7 @@ class Question
*
* @param bool $fallback
*
- * @return Question The current instance
+ * @return $this
*/
public function setHiddenFallback($fallback)
{
@@ -131,7 +131,7 @@ class Question
*
* @param null|array|\Traversable $values
*
- * @return Question The current instance
+ * @return $this
*
* @throws InvalidArgumentException
* @throws LogicException
@@ -162,7 +162,7 @@ class Question
*
* @param null|callable $validator
*
- * @return Question The current instance
+ * @return $this
*/
public function setValidator(callable $validator = null)
{
@@ -188,7 +188,7 @@ class Question
*
* @param null|int $attempts
*
- * @return Question The current instance
+ * @return $this
*
* @throws InvalidArgumentException In case the number of attempts is invalid.
*/
@@ -222,7 +222,7 @@ class Question
*
* @param callable $normalizer
*
- * @return Question The current instance
+ * @return $this
*/
public function setNormalizer(callable $normalizer)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php
index b18d7c9a..3c9617fb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -80,7 +80,7 @@ class SymfonyStyle extends OutputStyle
{
$this->autoPrependBlock();
$this->writeln(array(
- sprintf('<comment>%s</>', $message),
+ sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
sprintf('<comment>%s</>', str_repeat('=', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
));
$this->newLine();
@@ -93,7 +93,7 @@ class SymfonyStyle extends OutputStyle
{
$this->autoPrependBlock();
$this->writeln(array(
- sprintf('<comment>%s</>', $message),
+ sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
sprintf('<comment>%s</>', str_repeat('-', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
));
$this->newLine();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php
index ddef70d7..217e1f6e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Terminal.php
@@ -19,7 +19,7 @@ class Terminal
/**
* Gets the terminal width.
*
- * @return int|null
+ * @return int
*/
public function getWidth()
{
@@ -37,7 +37,7 @@ class Terminal
/**
* Gets the terminal height.
*
- * @return int|null
+ * @return int
*/
public function getHeight()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php
index 2c547a8f..080ace5c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -155,7 +155,7 @@ class CommandTester
{
$stream = fopen('php://memory', 'r+', false);
- fputs($stream, implode(PHP_EOL, $inputs));
+ fwrite($stream, implode(PHP_EOL, $inputs));
rewind($stream);
return $stream;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php
index b8f99f26..99fca051 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -454,7 +454,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
{
- $application = $this->getMock('Symfony\Component\Console\Application', array('getNamespaces'));
+ $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('getNamespaces'))->getMock();
$application->expects($this->once())
->method('getNamespaces')
->will($this->returnValue(array('foo:sublong', 'bar:sub')));
@@ -701,7 +701,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
{
$exception = new \Exception('', 4);
- $application = $this->getMock('Symfony\Component\Console\Application', array('doRun'));
+ $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
$application->setAutoExit(false);
$application->expects($this->once())
->method('doRun')
@@ -716,7 +716,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
{
$exception = new \Exception('', 0);
- $application = $this->getMock('Symfony\Component\Console\Application', array('doRun'));
+ $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('doRun'))->getMock();
$application->setAutoExit(false);
$application->expects($this->once())
->method('doRun')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index 3bab819f..135e6f3d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -54,6 +54,14 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$command = new \TestCommand();
$command->setApplication($application);
$this->assertEquals($application, $command->getApplication(), '->setApplication() sets the current application');
+ $this->assertEquals($application->getHelperSet(), $command->getHelperSet());
+ }
+
+ public function testSetApplicationNull()
+ {
+ $command = new \TestCommand();
+ $command->setApplication(null);
+ $this->assertNull($command->getHelperSet());
}
public function testSetGetDefinition()
@@ -84,6 +92,13 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($command->getDefinition()->hasOption('foo'), '->addOption() adds an option to the command');
}
+ public function testSetHidden()
+ {
+ $command = new \TestCommand();
+ $command->setHidden(true);
+ $this->assertTrue($command->isHidden());
+ }
+
public function testGetNamespaceGetNameSetName()
{
$command = new \TestCommand();
@@ -156,6 +171,13 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(array('name1'), $command->getAliases(), '->setAliases() sets the aliases');
}
+ public function testSetAliasesNull()
+ {
+ $command = new \TestCommand();
+ $this->setExpectedException('InvalidArgumentException');
+ $command->setAliases(null);
+ }
+
public function testGetSynopsis()
{
$command = new \TestCommand();
@@ -164,6 +186,15 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('namespace:name [--foo] [--] [<bar>]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');
}
+ public function testAddGetUsages()
+ {
+ $command = new \TestCommand();
+ $command->addUsage('foo1');
+ $command->addUsage('foo2');
+ $this->assertContains('namespace:name foo1', $command->getUsages());
+ $this->assertContains('namespace:name foo2', $command->getUsages());
+ }
+
public function testGetHelper()
{
$application = new Application();
@@ -273,10 +304,10 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$exitCode = $command->run(new StringInput(''), new NullOutput());
$this->assertSame(0, $exitCode, '->run() returns integer exit code (treats null as 0)');
- $command = $this->getMock('TestCommand', array('execute'));
+ $command = $this->getMockBuilder('TestCommand')->setMethods(array('execute'))->getMock();
$command->expects($this->once())
- ->method('execute')
- ->will($this->returnValue('2.3'));
+ ->method('execute')
+ ->will($this->returnValue('2.3'));
$exitCode = $command->run(new StringInput(''), new NullOutput());
$this->assertSame(2, $exitCode, '->run() returns integer exit code (casts numeric to int)');
}
@@ -297,6 +328,20 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$this->assertSame(0, $command->run(new StringInput(''), new NullOutput()));
}
+ public function testRunWithProcessTitle()
+ {
+ $command = new \TestCommand();
+ $command->setApplication(new Application());
+ $command->setProcessTitle('foo');
+ $this->assertSame(0, $command->run(new StringInput(''), new NullOutput()));
+ if (function_exists('cli_set_process_title')) {
+ if (null === @cli_get_process_title() && 'Darwin' === PHP_OS) {
+ $this->markTestSkipped('Running "cli_get_process_title" as an unprivileged user is not supported on MacOS.');
+ }
+ $this->assertEquals('foo', cli_get_process_title());
+ }
+ }
+
public function testSetCode()
{
$command = new \TestCommand();
@@ -334,6 +379,29 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
}
+ public function testSetCodeWithStaticClosure()
+ {
+ $command = new \TestCommand();
+ $command->setCode(self::createClosure());
+ $tester = new CommandTester($command);
+ $tester->execute(array());
+
+ if (PHP_VERSION_ID < 70000) {
+ // Cannot bind static closures in PHP 5
+ $this->assertEquals('interact called'.PHP_EOL.'not bound'.PHP_EOL, $tester->getDisplay());
+ } else {
+ // Can bind static closures in PHP 7
+ $this->assertEquals('interact called'.PHP_EOL.'bound'.PHP_EOL, $tester->getDisplay());
+ }
+ }
+
+ private static function createClosure()
+ {
+ return function (InputInterface $input, OutputInterface $output) {
+ $output->writeln(isset($this) ? 'bound' : 'not bound');
+ };
+ }
+
public function testSetCodeWithNonClosureCallable()
{
$command = new \TestCommand();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index c36c4a8e..74e95b75 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -86,7 +86,7 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
abstract protected function getFormat();
- private function getDescriptionTestData(array $objects)
+ protected function getDescriptionTestData(array $objects)
{
$data = array();
foreach ($objects as $name => $object) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
index c85e8a59..eb80f58b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -12,9 +12,27 @@
namespace Symfony\Component\Console\Tests\Descriptor;
use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
class MarkdownDescriptorTest extends AbstractDescriptorTest
{
+ public function getDescribeCommandTestData()
+ {
+ return $this->getDescriptionTestData(array_merge(
+ ObjectsProvider::getCommands(),
+ array('command_mbstring' => new DescriptorCommandMbString())
+ ));
+ }
+
+ public function getDescribeApplicationTestData()
+ {
+ return $this->getDescriptionTestData(array_merge(
+ ObjectsProvider::getApplications(),
+ array('application_mbstring' => new DescriptorApplicationMbString())
+ ));
+ }
+
protected function getDescriptor()
{
return new MarkdownDescriptor();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
index 45b3b2ff..8f825ecb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
@@ -31,6 +31,7 @@ class ObjectsProvider
'input_argument_2' => new InputArgument('argument_name', InputArgument::IS_ARRAY, 'argument description'),
'input_argument_3' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', 'default_value'),
'input_argument_4' => new InputArgument('argument_name', InputArgument::REQUIRED, "multiline\nargument description"),
+ 'input_argument_with_style' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', '<comment>style</>'),
);
}
@@ -43,6 +44,8 @@ class ObjectsProvider
'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', array()),
'input_option_5' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, "multiline\noption description"),
'input_option_6' => new InputOption('option_name', array('o', 'O'), InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
+ 'input_option_with_style' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description', '<comment>style</>'),
+ 'input_option_with_style_array' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'option description', array('<comment>Hello</comment>', '<info>world</info>')),
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
index 350b6795..364e29c0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
@@ -12,9 +12,27 @@
namespace Symfony\Component\Console\Tests\Descriptor;
use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplicationMbString;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommandMbString;
class TextDescriptorTest extends AbstractDescriptorTest
{
+ public function getDescribeCommandTestData()
+ {
+ return $this->getDescriptionTestData(array_merge(
+ ObjectsProvider::getCommands(),
+ array('command_mbstring' => new DescriptorCommandMbString())
+ ));
+ }
+
+ public function getDescribeApplicationTestData()
+ {
+ return $this->getDescriptionTestData(array_merge(
+ ObjectsProvider::getApplications(),
+ array('application_mbstring' => new DescriptorApplicationMbString())
+ ));
+ }
+
protected function getDescriptor()
{
return new TextDescriptor();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
index c370c001..3c9c7440 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/interactive_command_1.php
@@ -9,7 +9,7 @@ return function (InputInterface $input, OutputInterface $output) {
$output = new SymfonyStyle($input, $output);
$stream = fopen('php://memory', 'r+', false);
- fputs($stream, "Foo\nBar\nBaz");
+ fwrite($stream, "Foo\nBar\nBaz");
rewind($stream);
$input->setStream($stream);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php
index 62588386..13acc3ed 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/AbstractQuestionHelperTest.php
@@ -17,7 +17,7 @@ abstract class AbstractQuestionHelperTest extends \PHPUnit_Framework_TestCase
{
protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
{
- $mock = $this->getMock(StreamableInputInterface::class);
+ $mock = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
$mock->expects($this->any())
->method('isInteractive')
->will($this->returnValue($interactive));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
index 998249db..7c7f7197 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
@@ -110,7 +110,7 @@ class HelperSetTest extends \PHPUnit_Framework_TestCase
private function getGenericMockHelper($name, HelperSet $helperset = null)
{
- $mock_helper = $this->getMock('\Symfony\Component\Console\Helper\HelperInterface');
+ $mock_helper = $this->getMockBuilder('\Symfony\Component\Console\Helper\HelperInterface')->getMock();
$mock_helper->expects($this->any())
->method('getName')
->will($this->returnValue($name));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
index 1dcddf8b..b0d7f9c2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProcessHelperTest.php
@@ -16,6 +16,7 @@ use Symfony\Component\Console\Helper\HelperSet;
use Symfony\Component\Console\Output\StreamOutput;
use Symfony\Component\Console\Helper\ProcessHelper;
use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
class ProcessHelperTest extends \PHPUnit_Framework_TestCase
{
@@ -83,9 +84,9 @@ EOT;
EOT;
$errorMessage = 'An error occurred';
- if ('\\' === DIRECTORY_SEPARATOR) {
- $successOutputProcessDebug = str_replace("'", '"', $successOutputProcessDebug);
- }
+ $args = new ProcessBuilder(array('php', '-r', 'echo 42;'));
+ $args = $args->getProcess()->getCommandLine();
+ $successOutputProcessDebug = str_replace("'php' '-r' 'echo 42;'", $args, $successOutputProcessDebug);
return array(
array('', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null),
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
index 1f9f31a3..7757aed1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -353,7 +353,7 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
public function testRedrawFrequency()
{
- $bar = $this->getMock('Symfony\Component\Console\Helper\ProgressBar', array('display'), array($this->getOutputStream(), 6));
+ $bar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')->setMethods(array('display'))->setConstructorArgs(array($this->getOutputStream(), 6))->getMock();
$bar->expects($this->exactly(4))->method('display');
$bar->setRedrawFrequency(2);
@@ -366,7 +366,7 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
public function testRedrawFrequencyIsAtLeastOneIfZeroGiven()
{
- $bar = $this->getMock('Symfony\Component\Console\Helper\ProgressBar', array('display'), array($this->getOutputStream()));
+ $bar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')->setMethods(array('display'))->setConstructorArgs(array($this->getOutputStream()))->getMock();
$bar->expects($this->exactly(2))->method('display');
$bar->setRedrawFrequency(0);
@@ -376,7 +376,7 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
public function testRedrawFrequencyIsAtLeastOneIfSmallerOneGiven()
{
- $bar = $this->getMock('Symfony\Component\Console\Helper\ProgressBar', array('display'), array($this->getOutputStream()));
+ $bar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')->setMethods(array('display'))->setConstructorArgs(array($this->getOutputStream()))->getMock();
$bar->expects($this->exactly(2))->method('display');
$bar->setRedrawFrequency(0.9);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 8c753cc7..700bfe24 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -380,7 +380,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
' [<info>żółw </info>] bar',
' [<info>łabądź</info>] baz',
);
- $output = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
$output->method('getFormatter')->willReturn(new OutputFormatter());
$dialog = new QuestionHelper();
@@ -730,7 +730,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
' [<info>żółw </info>] bar',
' [<info>łabądź</info>] baz',
);
- $output = $this->getMock('\Symfony\Component\Console\Output\OutputInterface');
+ $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
$output->method('getFormatter')->willReturn(new OutputFormatter());
$dialog = new QuestionHelper();
@@ -788,7 +788,7 @@ class QuestionHelperTest extends AbstractQuestionHelperTest
protected function createInputInterfaceMock($interactive = true)
{
- $mock = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
$mock->expects($this->any())
->method('isInteractive')
->will($this->returnValue($interactive));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
index 4298dd2d..ce946e5b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -92,13 +92,22 @@ class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
$this->assertOutputContains('Can I have a backslash? [\]', $output);
}
- public function testAskEscapeLabel()
+ public function testAskEscapeAndFormatLabel()
+ {
+ $helper = new SymfonyQuestionHelper();
+ $input = $this->createStreamableInputInterfaceMock($this->getInputStream('Foo\\Bar'));
+ $helper->ask($input, $output = $this->createOutputInterface(), new Question('Do you want to use Foo\\Bar <comment>or</comment> Foo\\Baz\\?', 'Foo\\Baz'));
+
+ $this->assertOutputContains('Do you want to use Foo\\Bar or Foo\\Baz\\? [Foo\\Baz]:', $output);
+ }
+
+ public function testLabelTrailingBackslash()
{
$helper = new SymfonyQuestionHelper();
$input = $this->createStreamableInputInterfaceMock($this->getInputStream('sure'));
- $helper->ask($input, $output = $this->createOutputInterface(), new Question('Do you want a \?'));
+ $helper->ask($input, $output = $this->createOutputInterface(), new Question('Question with a trailing \\'));
- $this->assertOutputContains('Do you want a \?', $output);
+ $this->assertOutputContains('Question with a trailing \\', $output);
}
/**
@@ -130,7 +139,7 @@ class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
protected function createInputInterfaceMock($interactive = true)
{
- $mock = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
$mock->expects($this->any())
->method('isInteractive')
->will($this->returnValue($interactive));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php
index 1ea7b11f..f70d84b5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -35,9 +35,9 @@ class TableTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider testRenderProvider
*/
- public function testRender($headers, $rows, $style, $expected)
+ public function testRender($headers, $rows, $style, $expected, $decorated = false)
{
- $table = new Table($output = $this->getOutputStream());
+ $table = new Table($output = $this->getOutputStream($decorated));
$table
->setHeaders($headers)
->setRows($rows)
@@ -51,9 +51,9 @@ class TableTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider testRenderProvider
*/
- public function testRenderAddRows($headers, $rows, $style, $expected)
+ public function testRenderAddRows($headers, $rows, $style, $expected, $decorated = false)
{
- $table = new Table($output = $this->getOutputStream());
+ $table = new Table($output = $this->getOutputStream($decorated));
$table
->setHeaders($headers)
->addRows($rows)
@@ -67,9 +67,9 @@ class TableTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider testRenderProvider
*/
- public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected)
+ public function testRenderAddRowsOneByOne($headers, $rows, $style, $expected, $decorated = false)
{
- $table = new Table($output = $this->getOutputStream());
+ $table = new Table($output = $this->getOutputStream($decorated));
$table
->setHeaders($headers)
->setStyle($style)
@@ -485,6 +485,35 @@ TABLE
TABLE
),
+ 'Coslpan and table cells with comment style' => array(
+ array(
+ new TableCell('<comment>Long Title</comment>', array('colspan' => 3)),
+ ),
+ array(
+ array(
+ new TableCell('9971-5-0210-0', array('colspan' => 3)),
+ ),
+ new TableSeparator(),
+ array(
+ 'Dante Alighieri',
+ 'J. R. R. Tolkien',
+ 'J. R. R',
+ ),
+ ),
+ 'default',
+ <<<TABLE
++-----------------+------------------+---------+
+|\033[32m \033[39m\033[33mLong Title\033[39m\033[32m \033[39m|
++-----------------+------------------+---------+
+| 9971-5-0210-0 |
++-----------------+------------------+---------+
+| Dante Alighieri | J. R. R. Tolkien | J. R. R |
++-----------------+------------------+---------+
+
+TABLE
+ ,
+ true,
+ ),
);
}
@@ -506,6 +535,42 @@ TABLE
| 1234 |
+------+
+TABLE;
+
+ $this->assertEquals($expected, $this->getOutputContent($output));
+ }
+
+ public function testTableCellWithNumericIntValue()
+ {
+ $table = new Table($output = $this->getOutputStream());
+
+ $table->setRows(array(array(new TableCell(12345))));
+ $table->render();
+
+ $expected =
+<<<'TABLE'
++-------+
+| 12345 |
++-------+
+
+TABLE;
+
+ $this->assertEquals($expected, $this->getOutputContent($output));
+ }
+
+ public function testTableCellWithNumericFloatValue()
+ {
+ $table = new Table($output = $this->getOutputStream());
+
+ $table->setRows(array(array(new TableCell(12345.01))));
+ $table->render();
+
+ $expected =
+<<<'TABLE'
++----------+
+| 12345.01 |
++----------+
+
TABLE;
$this->assertEquals($expected, $this->getOutputContent($output));
@@ -713,9 +778,9 @@ TABLE;
Table::getStyleDefinition('absent');
}
- protected function getOutputStream()
+ protected function getOutputStream($decorated = false)
{
- return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, false);
+ return new StreamOutput($this->stream, StreamOutput::VERBOSITY_NORMAL, $decorated);
}
protected function getOutputContent(StreamOutput $output)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php
index 1afbbb6e..b3808c07 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/ConsoleOutputTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Tests\Output;
+use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Output\ConsoleOutput;
use Symfony\Component\Console\Output\Output;
@@ -22,4 +23,19 @@ class ConsoleOutputTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity(), '__construct() takes the verbosity as its first argument');
$this->assertSame($output->getFormatter(), $output->getErrorOutput()->getFormatter(), '__construct() takes a formatter or null as the third argument');
}
+
+ public function testSetFormatter()
+ {
+ $output = new ConsoleOutput();
+ $outputFormatter = new OutputFormatter();
+ $output->setFormatter($outputFormatter);
+ $this->assertSame($outputFormatter, $output->getFormatter());
+ }
+
+ public function testSetVerbosity()
+ {
+ $output = new ConsoleOutput();
+ $output->setVerbosity(Output::VERBOSITY_VERBOSE);
+ $this->assertSame(Output::VERBOSITY_VERBOSE, $output->getVerbosity());
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php
index b20ae4e8..f09573f0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Output/NullOutputTest.php
@@ -11,7 +11,9 @@
namespace Symfony\Component\Console\Tests\Output;
+use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\Output;
use Symfony\Component\Console\Output\OutputInterface;
class NullOutputTest extends \PHPUnit_Framework_TestCase
@@ -36,4 +38,50 @@ class NullOutputTest extends \PHPUnit_Framework_TestCase
$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
$this->assertSame(OutputInterface::VERBOSITY_QUIET, $output->getVerbosity(), '->getVerbosity() always returns VERBOSITY_QUIET for NullOutput');
}
+
+ public function testSetFormatter()
+ {
+ $output = new NullOutput();
+ $outputFormatter = new OutputFormatter();
+ $output->setFormatter($outputFormatter);
+ $this->assertNotSame($outputFormatter, $output->getFormatter());
+ }
+
+ public function testSetVerbosity()
+ {
+ $output = new NullOutput();
+ $output->setVerbosity(Output::VERBOSITY_NORMAL);
+ $this->assertEquals(Output::VERBOSITY_QUIET, $output->getVerbosity());
+ }
+
+ public function testSetDecorated()
+ {
+ $output = new NullOutput();
+ $output->setDecorated(true);
+ $this->assertFalse($output->isDecorated());
+ }
+
+ public function testIsQuiet()
+ {
+ $output = new NullOutput();
+ $this->assertTrue($output->isQuiet());
+ }
+
+ public function testIsVerbose()
+ {
+ $output = new NullOutput();
+ $this->assertFalse($output->isVerbose());
+ }
+
+ public function testIsVeryVerbose()
+ {
+ $output = new NullOutput();
+ $this->assertFalse($output->isVeryVerbose());
+ }
+
+ public function testIsDebug()
+ {
+ $output = new NullOutput();
+ $this->assertFalse($output->isDebug());
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
index 3338f4b0..92d9d92c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php
@@ -31,6 +31,7 @@ class SymfonyStyleTest extends PHPUnit_Framework_TestCase
protected function tearDown()
{
+ putenv('COLUMNS');
$this->command = null;
$this->tester = null;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
index 418bc301..cb3158a5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php
@@ -27,7 +27,7 @@ class SyntaxErrorException extends ParseException
* @param string $expectedValue
* @param Token $foundToken
*
- * @return SyntaxErrorException
+ * @return self
*/
public static function unexpectedToken($expectedValue, Token $foundToken)
{
@@ -38,7 +38,7 @@ class SyntaxErrorException extends ParseException
* @param string $pseudoElement
* @param string $unexpectedLocation
*
- * @return SyntaxErrorException
+ * @return self
*/
public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
{
@@ -48,7 +48,7 @@ class SyntaxErrorException extends ParseException
/**
* @param int $position
*
- * @return SyntaxErrorException
+ * @return self
*/
public static function unclosedString($position)
{
@@ -56,7 +56,7 @@ class SyntaxErrorException extends ParseException
}
/**
- * @return SyntaxErrorException
+ * @return self
*/
public static function nestedNot()
{
@@ -64,7 +64,7 @@ class SyntaxErrorException extends ParseException
}
/**
- * @return SyntaxErrorException
+ * @return self
*/
public static function stringAsFunctionArgument()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php
index a24b4fdf..d09eaca7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Node/Specificity.php
@@ -61,7 +61,7 @@ class Specificity
/**
* @param Specificity $specificity
*
- * @return Specificity
+ * @return self
*/
public function plus(Specificity $specificity)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php
index b1f912f9..aeba0f86 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -61,7 +61,7 @@ class TokenStream
*
* @param Token $token
*
- * @return TokenStream
+ * @return $this
*/
public function push(Token $token)
{
@@ -73,7 +73,7 @@ class TokenStream
/**
* Freezes stream.
*
- * @return TokenStream
+ * @return $this
*/
public function freeze()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
index 9d7f8fa3..09e6469e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php
@@ -50,7 +50,7 @@ class NodeExtension extends AbstractExtension
* @param int $flag
* @param bool $on
*
- * @return NodeExtension
+ * @return $this
*/
public function setFlag($flag, $on)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php
index 2cc2b110..2b01fc8e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -146,7 +146,7 @@ class Translator implements TranslatorInterface
*
* @param Extension\ExtensionInterface $extension
*
- * @return Translator
+ * @return $this
*/
public function registerExtension(Extension\ExtensionInterface $extension)
{
@@ -182,7 +182,7 @@ class Translator implements TranslatorInterface
*
* @param ParserInterface $shortcut
*
- * @return Translator
+ * @return $this
*/
public function registerParserShortcut(ParserInterface $shortcut)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
index 420ef3d8..38ca2955 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/CssSelector/XPath/XPathExpr.php
@@ -66,7 +66,7 @@ class XPathExpr
/**
* @param $condition
*
- * @return XPathExpr
+ * @return $this
*/
public function addCondition($condition)
{
@@ -84,7 +84,7 @@ class XPathExpr
}
/**
- * @return XPathExpr
+ * @return $this
*/
public function addNameTest()
{
@@ -97,7 +97,7 @@ class XPathExpr
}
/**
- * @return XPathExpr
+ * @return $this
*/
public function addStarPrefix()
{
@@ -112,7 +112,7 @@ class XPathExpr
* @param string $combiner
* @param XPathExpr $expr
*
- * @return XPathExpr
+ * @return $this
*/
public function join($combiner, XPathExpr $expr)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php
index 5728b5d0..6805ef15 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/ErrorHandler.php
@@ -225,7 +225,7 @@ class ErrorHandler
if ($flush) {
foreach ($this->bootstrappingLogger->cleanLogs() as $log) {
- $type = $log[2]['exception']->getSeverity();
+ $type = $log[2]['exception'] instanceof \ErrorException ? $log[2]['exception']->getSeverity() : E_ERROR;
if (!isset($flush[$type])) {
$this->bootstrappingLogger->log($log[0], $log[1], $log[2]);
} elseif ($this->loggers[$type][0]) {
@@ -352,12 +352,10 @@ class ErrorHandler
/**
* Handles errors by filtering then logging them according to the configured bit fields.
*
- * @param int $type One of the E_* constants
+ * @param int $type One of the E_* constants
* @param string $message
* @param string $file
* @param int $line
- * @param array $context
- * @param array $backtrace
*
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
*
@@ -365,7 +363,7 @@ class ErrorHandler
*
* @internal
*/
- public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
+ public function handleError($type, $message, $file, $line)
{
// Level is the current error reporting level to manage silent error.
// Strong errors are not authorized to be silenced.
@@ -377,9 +375,20 @@ class ErrorHandler
if (!$type || (!$log && !$throw)) {
return $type && $log;
}
+ $scope = $this->scopedErrors & $type;
- if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
- unset($context['GLOBALS']);
+ if (4 < $numArgs = func_num_args()) {
+ $context = $scope ? (func_get_arg(4) ?: array()) : array();
+ $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
+ } else {
+ $context = array();
+ $backtrace = null;
+ }
+
+ if (isset($context['GLOBALS']) && $scope) {
+ $e = $context; // Whatever the signature of the method,
+ unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
+ $context = $e;
}
if (null !== $backtrace && $type & E_ERROR) {
@@ -399,7 +408,7 @@ class ErrorHandler
} elseif (!$throw && !($type & $level)) {
$errorAsException = new SilencedErrorContext($type, $file, $line);
} else {
- if ($this->scopedErrors & $type) {
+ if ($scope) {
$errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
} else {
$errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
@@ -529,7 +538,11 @@ class ErrorHandler
}
}
if ($this->loggedErrors & $type) {
- $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
+ try {
+ $this->loggers[$type][0]->log($this->loggers[$type][1], $message, array('exception' => $exception));
+ } catch (\Exception $handlerException) {
+ } catch (\Throwable $handlerException) {
+ }
}
if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
foreach ($this->getFatalErrorHandlers() as $handler) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php
index 51baeb9b..286a71ec 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/Exception/FlattenException.php
@@ -237,7 +237,7 @@ class FlattenException
$result[$key] = array('null', null);
} elseif (is_bool($value)) {
$result[$key] = array('boolean', $value);
- } elseif (is_integer($value)) {
+ } elseif (is_int($value)) {
$result[$key] = array('integer', $value);
} elseif (is_float($value)) {
$result[$key] = array('float', $value);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php
index a6b9d09a..2fdd8456 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -50,7 +50,7 @@ class ExceptionHandler
* @param string|null $charset The charset used by exception messages
* @param string|null $fileLinkFormat The IDE link template
*
- * @return ExceptionHandler The registered exception handler
+ * @return static
*/
public static function register($debug = true, $charset = null, $fileLinkFormat = null)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
index c48d0d3f..32ba9a09 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -173,7 +173,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
);
if ($prefix) {
- $candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
+ $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
}
// We cannot use the autoloader here as most of them use require; but if the class
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
index f734d6bb..6fa62b6f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -36,8 +36,13 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
$message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
+ if (!class_exists($className) || null === $methods = get_class_methods($className)) {
+ // failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
+ return new UndefinedMethodException($message, $exception);
+ }
+
$candidates = array();
- foreach (get_class_methods($className) as $definedMethodName) {
+ foreach ($methods as $definedMethodName) {
$lev = levenshtein($methodName, $definedMethodName);
if ($lev <= strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
$candidates[] = $definedMethodName;
@@ -52,6 +57,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
} else {
$candidates = '"'.$last;
}
+
$message .= "\nDid you mean to call ".$candidates;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
index 75951483..3a5da7f4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
@@ -121,7 +121,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
try {
$handler = ErrorHandler::register();
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$handler->setDefaultLogger($logger, E_NOTICE);
$handler->setDefaultLogger($logger, array(E_USER_NOTICE => LogLevel::CRITICAL));
@@ -195,7 +195,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
restore_error_handler();
restore_exception_handler();
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$warnArgCheck = function ($logLevel, $message, $context) {
$this->assertEquals('info', $logLevel);
@@ -220,7 +220,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
restore_error_handler();
restore_exception_handler();
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logArgCheck = function ($level, $message, $context) {
$this->assertEquals('Notice: Undefined variable: undefVar', $message);
@@ -284,7 +284,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
$this->assertSame('User Deprecated: Foo deprecation', $exception->getMessage());
};
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger
->expects($this->once())
->method('log')
@@ -303,7 +303,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
$exception = new \Exception('foo');
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logArgCheck = function ($level, $message, $context) {
$this->assertSame('Uncaught Exception: foo', $message);
@@ -343,7 +343,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
$handler = ErrorHandler::register();
$handler->screamAt(E_USER_WARNING);
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger
->expects($this->exactly(2))
@@ -409,7 +409,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
$bootLogger->log(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
- $mockLogger = $this->getMock('Psr\Log\LoggerInterface');
+ $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$mockLogger->expects($this->once())
->method('log')
->with(LogLevel::WARNING, 'Foo message', array('exception' => $exception));
@@ -417,6 +417,25 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
$handler->setLoggers(array(E_DEPRECATED => array($mockLogger, LogLevel::WARNING)));
}
+ public function testSettingLoggerWhenExceptionIsBuffered()
+ {
+ $bootLogger = new BufferingLogger();
+ $handler = new ErrorHandler($bootLogger);
+
+ $exception = new \Exception('Foo message');
+
+ $mockLogger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ $mockLogger->expects($this->once())
+ ->method('log')
+ ->with(LogLevel::CRITICAL, 'Uncaught Exception: Foo message', array('exception' => $exception));
+
+ $handler->setExceptionHandler(function () use ($handler, $mockLogger) {
+ $handler->setDefaultLogger($mockLogger);
+ });
+
+ $handler->handleException($exception);
+ }
+
public function testHandleFatalError()
{
try {
@@ -429,7 +448,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
'line' => 123,
);
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logArgCheck = function ($level, $message, $context) {
$this->assertEquals('Fatal Parse Error: foo', $message);
@@ -480,7 +499,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
try {
$handler = ErrorHandler::register();
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger
->expects($this->once())
->method('log')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
index 1703da6e..6e410572 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/ExceptionHandlerTest.php
@@ -100,7 +100,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
{
$exception = new \Exception('foo');
- $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('sendPhpResponse'));
+ $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
$handler
->expects($this->exactly(2))
->method('sendPhpResponse');
@@ -118,7 +118,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
{
$exception = new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__);
- $handler = $this->getMock('Symfony\Component\Debug\ExceptionHandler', array('sendPhpResponse'));
+ $handler = $this->getMockBuilder('Symfony\Component\Debug\ExceptionHandler')->setMethods(array('sendPhpResponse'))->getMock();
$handler
->expects($this->once())
->method('sendPhpResponse');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index de7b21c6..22cbc303 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -61,6 +61,15 @@ class UndefinedMethodFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
),
"Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
),
+ array(
+ array(
+ 'type' => 1,
+ 'message' => 'Call to undefined method class@anonymous::test()',
+ 'file' => '/home/possum/work/symfony/test.php',
+ 'line' => 11,
+ ),
+ 'Attempted to call an undefined method named "test" of class "class@anonymous".',
+ ),
);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index d1b1fd29..fcb98638 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -114,8 +114,10 @@ class AutowirePass implements CompilerPassInterface
throw new RuntimeException(sprintf('Unable to autowire argument index %d ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));
}
- // specifically pass the default value
- $arguments[$index] = $parameter->getDefaultValue();
+ if (!array_key_exists($index, $arguments)) {
+ // specifically pass the default value
+ $arguments[$index] = $parameter->getDefaultValue();
+ }
continue;
}
@@ -345,10 +347,11 @@ class AutowirePass implements CompilerPassInterface
$class = false;
}
+ $isVariadic = method_exists($parameter, 'isVariadic') && $parameter->isVariadic();
$methodArgumentsMetadata[] = array(
'class' => $class,
'isOptional' => $parameter->isOptional(),
- 'defaultValue' => $parameter->isOptional() ? $parameter->getDefaultValue() : null,
+ 'defaultValue' => ($parameter->isOptional() && !$isVariadic) ? $parameter->getDefaultValue() : null,
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
index 156bcc0c..f39a89af 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -60,7 +60,6 @@ class CheckCircularReferencesPass implements CompilerPassInterface
$id = $node->getId();
if (empty($this->checkedNodes[$id])) {
-
// don't check circular dependencies for lazy services
if (!$node->getValue() || !$node->getValue()->isLazy()) {
$searchKey = array_search($id, $this->currentPath);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
index 66ddd03c..e4e64db4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
@@ -58,7 +58,7 @@ class FactoryReturnTypePass implements CompilerPassInterface
if ($factory[0] instanceof Reference) {
$previous[$id] = true;
$factoryDefinition = $container->findDefinition((string) $factory[0]);
- $this->updateDefinition($container, (string) $factory[0], $factoryDefinition, $previous);
+ $this->updateDefinition($container, strtolower($factory[0]), $factoryDefinition, $previous);
$class = $factoryDefinition->getClass();
} else {
$class = $factory[0];
@@ -73,12 +73,12 @@ class FactoryReturnTypePass implements CompilerPassInterface
$returnType = $m->getReturnType();
if (null !== $returnType && !$returnType->isBuiltin()) {
- $returnType = (string) $returnType;
+ $returnType = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType->__toString();
if (null !== $class) {
$declaringClass = $m->getDeclaringClass()->getName();
- if ('self' === $returnType) {
+ if ('self' === strtolower($returnType)) {
$returnType = $declaringClass;
- } elseif ('parent' === $returnType) {
+ } elseif ('parent' === strtolower($returnType)) {
$returnType = get_parent_class($declaringClass) ?: null;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
index 123bec99..83f6014c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -24,6 +24,13 @@ trait PriorityTaggedServiceTrait
/**
* Finds all services with the given tag name and order them by their priority.
*
+ * The order of additions must be respected for services having the same priority,
+ * and knowing that the \SplPriorityQueue class does not respect the FIFO method,
+ * we should not use this class.
+ *
+ * @see https://bugs.php.net/bug.php?id=53710
+ * @see https://bugs.php.net/bug.php?id=60926
+ *
* @param string $tagName
* @param ContainerBuilder $container
*
@@ -31,17 +38,20 @@ trait PriorityTaggedServiceTrait
*/
private function findAndSortTaggedServices($tagName, ContainerBuilder $container)
{
- $services = $container->findTaggedServiceIds($tagName);
-
- $queue = new \SplPriorityQueue();
+ $services = array();
- foreach ($services as $serviceId => $tags) {
+ foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $tags) {
foreach ($tags as $attributes) {
$priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
- $queue->insert(new Reference($serviceId), $priority);
+ $services[$priority][] = new Reference($serviceId);
}
}
- return iterator_to_array($queue, false);
+ if ($services) {
+ krsort($services);
+ $services = call_user_func_array('array_merge', $services);
+ }
+
+ return $services;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
index dc9a1a00..e7306ab5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraph.php
@@ -45,7 +45,7 @@ class ServiceReferenceGraph
*
* @param string $id The id to retrieve
*
- * @return ServiceReferenceGraphNode The node matching the supplied identifier
+ * @return ServiceReferenceGraphNode
*
* @throws InvalidArgumentException if no node matches the supplied identifier
*/
@@ -61,7 +61,7 @@ class ServiceReferenceGraph
/**
* Returns all nodes.
*
- * @return ServiceReferenceGraphNode[] An array of all ServiceReferenceGraphNode objects
+ * @return ServiceReferenceGraphNode[]
*/
public function getNodes()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 45c6f2cf..9b72d4b3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -91,12 +91,12 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
private $usedTags = array();
/**
- * @var string[][] A map of env var names to their placeholders
+ * @var string[][] a map of env var names to their placeholders
*/
private $envPlaceholders = array();
/**
- * @var int[] A map of env vars to their resolution counter.
+ * @var int[] a map of env vars to their resolution counter
*/
private $envCounters = array();
@@ -206,7 +206,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*
* @param ResourceInterface $resource A resource instance
*
- * @return ContainerBuilder The current instance
+ * @return $this
*/
public function addResource(ResourceInterface $resource)
{
@@ -224,7 +224,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*
* @param ResourceInterface[] $resources An array of resources
*
- * @return ContainerBuilder The current instance
+ * @return $this
*/
public function setResources(array $resources)
{
@@ -242,7 +242,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*
* @param object $object An object instance
*
- * @return ContainerBuilder The current instance
+ * @return $this
*/
public function addObjectResource($object)
{
@@ -258,7 +258,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*
* @param \ReflectionClass $class
*
- * @return ContainerBuilder The current instance
+ * @return $this
*/
public function addClassResource(\ReflectionClass $class)
{
@@ -281,7 +281,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* @param string $extension The extension alias or namespace
* @param array $values An array of values that customizes the extension
*
- * @return ContainerBuilder The current instance
+ * @return $this
*
* @throws BadMethodCallException When this ContainerBuilder is frozen
* @throws \LogicException if the container is frozen
@@ -306,7 +306,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* @param string $type The type of compiler pass
* @param int $priority Used to sort the passes
*
- * @return ContainerBuilder The current instance
+ * @return $this
*/
public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, $priority = 0*/)
{
@@ -424,7 +424,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
}
if (!isset($this->definitions[$id]) && isset($this->aliasDefinitions[$id])) {
- return $this->get($this->aliasDefinitions[$id], $invalidBehavior);
+ return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);
}
try {
@@ -1140,14 +1140,14 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
/**
* Shares a given service in the container.
*
- * @param Definition $definition
- * @param mixed $service
- * @param string $id
+ * @param Definition $definition
+ * @param mixed $service
+ * @param string|null $id
*/
private function shareService(Definition $definition, $service, $id)
{
- if ($definition->isShared()) {
- $this->services[$lowerId = strtolower($id)] = $service;
+ if (null !== $id && $definition->isShared()) {
+ $this->services[strtolower($id)] = $service;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php
index 5f40ae41..d8e95432 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Definition.php
@@ -56,7 +56,7 @@ class Definition
*
* @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
*
- * @return Definition The current instance
+ * @return $this
*/
public function setFactory($factory)
{
@@ -86,7 +86,7 @@ class Definition
* @param null|string $renamedId The new decorated service id
* @param int $priority The priority of decoration
*
- * @return Definition The current instance
+ * @return $this
*
* @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
*/
@@ -106,7 +106,7 @@ class Definition
}
/**
- * Gets the service that decorates this service.
+ * Gets the service that this service is decorating.
*
* @return null|array An array composed of the decorated service id, the new id for it and the priority of decoration, null if no service is decorated
*/
@@ -120,7 +120,7 @@ class Definition
*
* @param string $class The service class
*
- * @return Definition The current instance
+ * @return $this
*/
public function setClass($class)
{
@@ -144,7 +144,7 @@ class Definition
*
* @param array $arguments An array of arguments
*
- * @return Definition The current instance
+ * @return $this
*/
public function setArguments(array $arguments)
{
@@ -177,7 +177,7 @@ class Definition
*
* @param mixed $argument An argument
*
- * @return Definition The current instance
+ * @return $this
*/
public function addArgument($argument)
{
@@ -192,12 +192,16 @@ class Definition
* @param int $index
* @param mixed $argument
*
- * @return Definition The current instance
+ * @return $this
*
* @throws OutOfBoundsException When the replaced argument does not exist
*/
public function replaceArgument($index, $argument)
{
+ if (0 === count($this->arguments)) {
+ throw new OutOfBoundsException('Cannot replace arguments if none have been configured yet.');
+ }
+
if ($index < 0 || $index > count($this->arguments) - 1) {
throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));
}
@@ -240,7 +244,7 @@ class Definition
*
* @param array $calls An array of method calls
*
- * @return Definition The current instance
+ * @return $this
*/
public function setMethodCalls(array $calls = array())
{
@@ -258,7 +262,7 @@ class Definition
* @param string $method The method name to call
* @param array $arguments An array of arguments to pass to the method call
*
- * @return Definition The current instance
+ * @return $this
*
* @throws InvalidArgumentException on empty $method param
*/
@@ -277,7 +281,7 @@ class Definition
*
* @param string $method The method name to remove
*
- * @return Definition The current instance
+ * @return $this
*/
public function removeMethodCall($method)
{
@@ -324,7 +328,7 @@ class Definition
*
* @param array $tags
*
- * @return Definition the current instance
+ * @return $this
*/
public function setTags(array $tags)
{
@@ -361,7 +365,7 @@ class Definition
* @param string $name The tag name
* @param array $attributes An array of attributes
*
- * @return Definition The current instance
+ * @return $this
*/
public function addTag($name, array $attributes = array())
{
@@ -387,7 +391,7 @@ class Definition
*
* @param string $name The tag name
*
- * @return Definition
+ * @return $this
*/
public function clearTag($name)
{
@@ -399,7 +403,7 @@ class Definition
/**
* Clears the tags for this definition.
*
- * @return Definition The current instance
+ * @return $this
*/
public function clearTags()
{
@@ -413,7 +417,7 @@ class Definition
*
* @param string $file A full pathname to include
*
- * @return Definition The current instance
+ * @return $this
*/
public function setFile($file)
{
@@ -437,7 +441,7 @@ class Definition
*
* @param bool $shared Whether the service must be shared or not
*
- * @return Definition The current instance
+ * @return $this
*/
public function setShared($shared)
{
@@ -461,7 +465,7 @@ class Definition
*
* @param bool $boolean
*
- * @return Definition The current instance
+ * @return $this
*/
public function setPublic($boolean)
{
@@ -485,7 +489,7 @@ class Definition
*
* @param bool $lazy
*
- * @return Definition The current instance
+ * @return $this
*/
public function setLazy($lazy)
{
@@ -510,7 +514,7 @@ class Definition
*
* @param bool $boolean
*
- * @return Definition the current instance
+ * @return $this
*/
public function setSynthetic($boolean)
{
@@ -536,7 +540,7 @@ class Definition
*
* @param bool $boolean
*
- * @return Definition the current instance
+ * @return $this
*/
public function setAbstract($boolean)
{
@@ -563,7 +567,7 @@ class Definition
* @param bool $status
* @param string $template Template message to use if the definition is deprecated
*
- * @return Definition the current instance
+ * @return $this
*
* @throws InvalidArgumentException When the message template is invalid.
*/
@@ -614,7 +618,7 @@ class Definition
*
* @param string|array $configurator A PHP callable
*
- * @return Definition The current instance
+ * @return $this
*/
public function setConfigurator($configurator)
{
@@ -642,7 +646,7 @@ class Definition
*
* @param string[] $types
*
- * @return Definition The current instance
+ * @return $this
*/
public function setAutowiringTypes(array $types)
{
@@ -670,7 +674,7 @@ class Definition
*
* @param bool $autowired
*
- * @return Definition The current instance
+ * @return $this
*/
public function setAutowired($autowired)
{
@@ -694,7 +698,7 @@ class Definition
*
* @param string $type
*
- * @return Definition The current instance
+ * @return $this
*/
public function addAutowiringType($type)
{
@@ -708,7 +712,7 @@ class Definition
*
* @param string $type
*
- * @return Definition The current instance
+ * @return $this
*/
public function removeAutowiringType($type)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
index f17657a3..1243695d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -182,7 +182,7 @@ class DefinitionDecorator extends Definition
* @param int $index
* @param mixed $value
*
- * @return DefinitionDecorator the current instance
+ * @return $this
*
* @throws InvalidArgumentException when $index isn't an integer
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index d28682c7..6a10371a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -168,7 +168,7 @@ class YamlDumper extends Dumper
return sprintf(" %s: '@%s'\n", $alias, $id);
}
- return sprintf(" %s:\n alias: %s\n public: false", $alias, $id);
+ return sprintf(" %s:\n alias: %s\n public: false\n", $alias, $id);
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index 06cc506e..a8f00986 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -110,7 +110,7 @@ class YamlFileLoader extends FileLoader
* @param array $content
* @param string $file
*/
- private function parseImports($content, $file)
+ private function parseImports(array $content, $file)
{
if (!isset($content['imports'])) {
return;
@@ -137,7 +137,7 @@ class YamlFileLoader extends FileLoader
* @param array $content
* @param string $file
*/
- private function parseDefinitions($content, $file)
+ private function parseDefinitions(array $content, $file)
{
if (!isset($content['services'])) {
return;
@@ -155,9 +155,9 @@ class YamlFileLoader extends FileLoader
/**
* Parses a definition.
*
- * @param string $id
- * @param array $service
- * @param string $file
+ * @param string $id
+ * @param array|string $service
+ * @param string $file
*
* @throws InvalidArgumentException When tags are invalid
*/
@@ -486,7 +486,7 @@ class YamlFileLoader extends FileLoader
*
* @param array $content
*/
- private function loadFromExtensions($content)
+ private function loadFromExtensions(array $content)
{
foreach ($content as $namespace => $values) {
if (in_array($namespace, array('imports', 'parameters', 'services'))) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 182e09e8..674cc08e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -148,7 +148,7 @@
<xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="key" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="on-invalid" type="xsd:string" />
+ <xsd:attribute name="on-invalid" type="invalid_sequence" />
<xsd:attribute name="strict" type="boolean" />
</xsd:complexType>
@@ -161,7 +161,7 @@
<xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="key" type="xsd:string" />
<xsd:attribute name="index" type="xsd:integer" />
- <xsd:attribute name="on-invalid" type="xsd:string" />
+ <xsd:attribute name="on-invalid" type="invalid_sequence" />
<xsd:attribute name="strict" type="boolean" />
</xsd:complexType>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index a8b1be35..212b93d9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\DependencyInjection\Tests\Compiler;
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
@@ -35,6 +36,23 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('foo', (string) $container->getDefinition('bar')->getArgument(0));
}
+ /**
+ * @requires PHP 5.6
+ */
+ public function testProcessVariadic()
+ {
+ $container = new ContainerBuilder();
+ $container->register('foo', Foo::class);
+ $definition = $container->register('fooVariadic', FooVariadic::class);
+ $definition->setAutowired(true);
+
+ $pass = new AutowirePass();
+ $pass->process($container);
+
+ $this->assertCount(1, $container->getDefinition('fooVariadic')->getArguments());
+ $this->assertEquals('foo', (string) $container->getDefinition('fooVariadic')->getArgument(0));
+ }
+
public function testProcessAutowireParent()
{
$container = new ContainerBuilder();
@@ -213,13 +231,13 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
$this->assertCount(1, $container->getDefinition('coop_tilleuls')->getArguments());
$this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas', $container->getDefinition('coop_tilleuls')->getArgument(0));
- $dunglasDefinition = $container->getDefinition('autowired.symfony\component\dependencyinjection\tests\compiler\dunglas');
+ $dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
$this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
$this->assertFalse($dunglasDefinition->isPublic());
$this->assertCount(1, $dunglasDefinition->getArguments());
$this->assertEquals('autowired.symfony\component\dependencyinjection\tests\compiler\lille', $dunglasDefinition->getArgument(0));
- $lilleDefinition = $container->getDefinition('autowired.symfony\component\dependencyinjection\tests\compiler\lille');
+ $lilleDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille');
$this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
}
@@ -476,6 +494,22 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($container->hasDefinition('bar'));
}
+
+ public function testEmptyStringIsKept()
+ {
+ $container = new ContainerBuilder();
+
+ $container->register('a', __NAMESPACE__.'\A');
+ $container->register('lille', __NAMESPACE__.'\Lille');
+ $container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+ ->setAutowired(true)
+ ->setArguments(array('', ''));
+
+ $pass = new AutowirePass();
+ $pass->process($container);
+
+ $this->assertEquals(array(new Reference('a'), '', new Reference('lille')), $container->getDefinition('foo')->getArguments());
+ }
}
class Foo
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
index b786db95..33060dcd 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/ExtensionCompilerPassTest.php
@@ -23,7 +23,7 @@ class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+ $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
$this->pass = new ExtensionCompilerPass();
}
@@ -46,10 +46,10 @@ class ExtensionCompilerPassTest extends \PHPUnit_Framework_TestCase
private function createExtensionMock($hasInlineCompile)
{
- return $this->getMock('Symfony\Component\DependencyInjection\\'.(
+ return $this->getMockBuilder('Symfony\Component\DependencyInjection\\'.(
$hasInlineCompile
? 'Compiler\CompilerPassInterface'
: 'Extension\ExtensionInterface'
- ));
+ ))->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
index aed8cdfe..8d957d47 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
@@ -21,7 +21,7 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
{
$tmpProviders = array();
- $extension = $this->getMock('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface');
+ $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
$extension->expects($this->any())
->method('getXsdValidationBasePath')
->will($this->returnValue(false));
@@ -37,7 +37,7 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
$tmpProviders = $container->getExpressionLanguageProviders();
}));
- $provider = $this->getMock('Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface');
+ $provider = $this->getMockBuilder('Symfony\\Component\\ExpressionLanguage\\ExpressionFunctionProviderInterface')->getMock();
$container = new ContainerBuilder(new ParameterBag());
$container->registerExtension($extension);
$container->prependExtensionConfig('foo', array('bar' => true));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
index 90659f20..2768a5c0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
@@ -23,10 +23,10 @@ class PassConfigTest extends \PHPUnit_Framework_TestCase
{
$config = new PassConfig();
- $pass1 = $this->getMock(CompilerPassInterface::class);
+ $pass1 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
$config->addPass($pass1, PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
- $pass2 = $this->getMock(CompilerPassInterface::class);
+ $pass2 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
$config->addPass($pass2, PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);
$this->assertSame(array($pass2, $pass1), $config->getBeforeOptimizationPasses());
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
index 41507205..386c2598 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php
@@ -33,6 +33,12 @@ class PriorityTaggedServiceTraitTest extends \PHPUnit_Framework_TestCase
'my_service11' => array('my_custom_tag' => array('priority' => -1001)),
'my_service12' => array('my_custom_tag' => array('priority' => -1002)),
'my_service13' => array('my_custom_tag' => array('priority' => -1003)),
+ 'my_service14' => array('my_custom_tag' => array('priority' => -1000)),
+ 'my_service15' => array('my_custom_tag' => array('priority' => 1)),
+ 'my_service16' => array('my_custom_tag' => array('priority' => -1)),
+ 'my_service17' => array('my_custom_tag' => array('priority' => 200)),
+ 'my_service18' => array('my_custom_tag' => array('priority' => 100)),
+ 'my_service19' => array('my_custom_tag' => array()),
);
$container = new ContainerBuilder();
@@ -47,15 +53,21 @@ class PriorityTaggedServiceTraitTest extends \PHPUnit_Framework_TestCase
$expected = array(
new Reference('my_service2'),
+ new Reference('my_service17'),
new Reference('my_service1'),
+ new Reference('my_service18'),
new Reference('my_service8'),
+ new Reference('my_service15'),
new Reference('my_service4'),
+ new Reference('my_service19'),
new Reference('my_service5'),
+ new Reference('my_service16'),
new Reference('my_service9'),
new Reference('my_service7'),
new Reference('my_service6'),
new Reference('my_service3'),
new Reference('my_service10'),
+ new Reference('my_service14'),
new Reference('my_service11'),
new Reference('my_service12'),
new Reference('my_service13'),
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 9ba5a36c..1e08fd30 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -284,8 +284,8 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
$builder = new ContainerBuilder();
$builder->setResourceTracking(false);
$defaultPasses = $builder->getCompiler()->getPassConfig()->getPasses();
- $builder->addCompilerPass($pass1 = $this->getMock('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface'), PassConfig::TYPE_BEFORE_OPTIMIZATION, -5);
- $builder->addCompilerPass($pass2 = $this->getMock('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface'), PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
+ $builder->addCompilerPass($pass1 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface')->getMock(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -5);
+ $builder->addCompilerPass($pass2 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface')->getMock(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
$passes = $builder->getCompiler()->getPassConfig()->getPasses();
$this->assertCount(count($passes) - 2, $defaultPasses);
@@ -648,7 +648,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
public function testRegisteredButNotLoadedExtension()
{
- $extension = $this->getMock('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface');
+ $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
$extension->expects($this->once())->method('getAlias')->will($this->returnValue('project'));
$extension->expects($this->never())->method('load');
@@ -660,7 +660,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
public function testRegisteredAndLoadedExtension()
{
- $extension = $this->getMock('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface');
+ $extension = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\Extension\\ExtensionInterface')->getMock();
$extension->expects($this->exactly(2))->method('getAlias')->will($this->returnValue('project'));
$extension->expects($this->once())->method('load')->with(array(array('foo' => 'bar')));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index 31e9e97c..20c171c7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -144,7 +144,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
{
$sc = new Container();
$sc->set('foo', $foo = new \stdClass());
- $this->assertEquals($foo, $sc->get('foo'), '->set() sets a service');
+ $this->assertSame($foo, $sc->get('foo'), '->set() sets a service');
}
public function testSetWithNullResetTheService()
@@ -166,14 +166,14 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
{
$sc = new ProjectServiceContainer();
$sc->set('foo', $foo = new \stdClass());
- $this->assertEquals($foo, $sc->get('foo'), '->get() returns the service for the given id');
- $this->assertEquals($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
- $this->assertEquals($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
- $this->assertEquals($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
- $this->assertEquals($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
+ $this->assertSame($foo, $sc->get('foo'), '->get() returns the service for the given id');
+ $this->assertSame($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
+ $this->assertSame($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
+ $this->assertSame($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
+ $this->assertSame($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
$sc->set('bar', $bar = new \stdClass());
- $this->assertEquals($bar, $sc->get('bar'), '->get() prefers to return a service defined with set() than one defined with a getXXXMethod()');
+ $this->assertSame($bar, $sc->get('bar'), '->get() prefers to return a service defined with set() than one defined with a getXXXMethod()');
try {
$sc->get('');
@@ -196,15 +196,15 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
$sc = new LegacyProjectServiceContainer();
$sc->set('foo', $foo = new \stdClass());
- $this->assertEquals($foo, $sc->get('foo'), '->get() returns the service for the given id');
- $this->assertEquals($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
- $this->assertEquals($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
- $this->assertEquals($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
- $this->assertEquals($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
- $this->assertEquals($sc->__foo_baz, $sc->get('foo\\baz'), '->get() returns the service if a get*Method() is defined');
+ $this->assertSame($foo, $sc->get('foo'), '->get() returns the service for the given id');
+ $this->assertSame($foo, $sc->get('Foo'), '->get() returns the service for the given id, and converts id to lowercase');
+ $this->assertSame($sc->__bar, $sc->get('bar'), '->get() returns the service for the given id');
+ $this->assertSame($sc->__foo_bar, $sc->get('foo_bar'), '->get() returns the service if a get*Method() is defined');
+ $this->assertSame($sc->__foo_baz, $sc->get('foo.baz'), '->get() returns the service if a get*Method() is defined');
+ $this->assertSame($sc->__foo_baz, $sc->get('foo\\baz'), '->get() returns the service if a get*Method() is defined');
$sc->set('bar', $bar = new \stdClass());
- $this->assertEquals($bar, $sc->get('bar'), '->get() prefers to return a service defined with set() than one defined with a getXXXMethod()');
+ $this->assertSame($bar, $sc->get('bar'), '->get() prefers to return a service defined with set() than one defined with a getXXXMethod()');
try {
$sc->get('');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 6a85f804..9b89b339 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -257,6 +257,7 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
/**
* @expectedException \OutOfBoundsException
+ * @expectedExceptionMessage The index "1" is not in the range [0, 0].
*/
public function testReplaceArgumentShouldCheckBounds()
{
@@ -266,6 +267,16 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
$def->replaceArgument(1, 'bar');
}
+ /**
+ * @expectedException \OutOfBoundsException
+ * @expectedExceptionMessage Cannot replace arguments if none have been configured yet.
+ */
+ public function testReplaceArgumentWithoutExistingArgumentsShouldCheckBounds()
+ {
+ $def = new Definition('stdClass');
+ $def->replaceArgument(0, 'bar');
+ }
+
public function testSetGetProperties()
{
$def = new Definition('stdClass');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 57469b9b..14c27feb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -252,7 +252,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
$container->set('bar', $bar = new \stdClass());
$container->setParameter('foo_bar', 'foo_bar');
- $this->assertEquals($bar, $container->get('bar'), '->set() overrides an already defined service');
+ $this->assertSame($bar, $container->get('bar'), '->set() overrides an already defined service');
}
public function testOverrideServiceWhenUsingADumpedContainerAndServiceIsUsedFromAnotherOne()
@@ -287,7 +287,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
$container = include self::$fixturesPath.'/containers/container24.php';
$dumper = new PhpDumper($container);
- $this->assertEquals(file_get_contents(self::$fixturesPath.'/php/services24.php'), $dumper->dump());
+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services24.php', $dumper->dump());
}
public function testEnvParameter()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
index dbd7b88f..20ed7e31 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -25,6 +25,8 @@ services:
class: Request
synthetic: true
lazy: true
+ another_third_alias_for_foo:
+ alias: foo
decorator_service:
decorates: decorated
decorator_service_with_name:
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
index 6dcf25d2..a3524c3d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/RealServiceInstantiatorTest.php
@@ -25,7 +25,7 @@ class RealServiceInstantiatorTest extends \PHPUnit_Framework_TestCase
{
$instantiator = new RealServiceInstantiator();
$instance = new \stdClass();
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$callback = function () use ($instance) {
return $instance;
};
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php
index 33a15900..d6dbe1e7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Crawler.php
@@ -192,7 +192,7 @@ class Crawler implements \Countable, \IteratorAggregate
$dom = new \DOMDocument('1.0', $charset);
$dom->validateOnParse = true;
- set_error_handler(function () {throw new \Exception();});
+ set_error_handler(function () { throw new \Exception(); });
try {
// Convert charset to HTML-entities to work around bugs in DOMDocument::loadHTML()
@@ -337,7 +337,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param int $position The position
*
- * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist
+ * @return self
*/
public function eq($position)
{
@@ -380,7 +380,7 @@ class Crawler implements \Countable, \IteratorAggregate
* @param int $offset
* @param int $length
*
- * @return Crawler A Crawler instance with the sliced nodes
+ * @return self
*/
public function slice($offset = 0, $length = null)
{
@@ -394,7 +394,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param \Closure $closure An anonymous function
*
- * @return Crawler A Crawler instance with the selected nodes
+ * @return self
*/
public function reduce(\Closure $closure)
{
@@ -411,7 +411,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the first node of the current selection.
*
- * @return Crawler A Crawler instance with the first selected node
+ * @return self
*/
public function first()
{
@@ -421,7 +421,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the last node of the current selection.
*
- * @return Crawler A Crawler instance with the last selected node
+ * @return self
*/
public function last()
{
@@ -431,7 +431,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the siblings nodes of the current selection.
*
- * @return Crawler A Crawler instance with the sibling nodes
+ * @return self
*
* @throws \InvalidArgumentException When current node is empty
*/
@@ -447,7 +447,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the next siblings nodes of the current selection.
*
- * @return Crawler A Crawler instance with the next sibling nodes
+ * @return self
*
* @throws \InvalidArgumentException When current node is empty
*/
@@ -463,7 +463,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the previous sibling nodes of the current selection.
*
- * @return Crawler A Crawler instance with the previous sibling nodes
+ * @return self
*
* @throws \InvalidArgumentException
*/
@@ -479,7 +479,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the parents nodes of the current selection.
*
- * @return Crawler A Crawler instance with the parents nodes of the current selection
+ * @return self
*
* @throws \InvalidArgumentException When current node is empty
*/
@@ -504,7 +504,7 @@ class Crawler implements \Countable, \IteratorAggregate
/**
* Returns the children nodes of the current selection.
*
- * @return Crawler A Crawler instance with the children nodes
+ * @return self
*
* @throws \InvalidArgumentException When current node is empty
*/
@@ -667,7 +667,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $xpath An XPath expression
*
- * @return Crawler A new instance of Crawler with the filtered list of nodes
+ * @return self
*/
public function filterXPath($xpath)
{
@@ -688,7 +688,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $selector A CSS selector
*
- * @return Crawler A new instance of Crawler with the filtered list of nodes
+ * @return self
*
* @throws \RuntimeException if the CssSelector Component is not available
*/
@@ -709,7 +709,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $value The link text
*
- * @return Crawler A new instance of Crawler with the filtered list of nodes
+ * @return self
*/
public function selectLink($value)
{
@@ -724,7 +724,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $value The image alt
*
- * @return Crawler A new instance of Crawler with the filtered list of nodes
+ * @return self A new instance of Crawler with the filtered list of nodes
*/
public function selectImage($value)
{
@@ -738,7 +738,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $value The button text
*
- * @return Crawler A new instance of Crawler with the filtered list of nodes
+ * @return self
*/
public function selectButton($value)
{
@@ -940,7 +940,7 @@ class Crawler implements \Countable, \IteratorAggregate
*
* @param string $xpath
*
- * @return Crawler
+ * @return self
*/
private function filterRelativeXPath($xpath)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php
index 0390e3fc..bad1b349 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Form.php
@@ -69,7 +69,7 @@ class Form extends Link implements \ArrayAccess
*
* @param array $values An array of field values
*
- * @return Form
+ * @return $this
*/
public function setValues(array $values)
{
@@ -279,7 +279,7 @@ class Form extends Link implements \ArrayAccess
/**
* Gets all fields.
*
- * @return FormField[] An array of fields
+ * @return FormField[]
*/
public function all()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
index 7dd3d3e7..9168dd36 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -151,7 +151,7 @@ class FormFieldRegistry
* @param string $base The fully qualified name of the base field
* @param array $values The values of the fields
*
- * @return FormFieldRegistry
+ * @return static
*/
private static function create($base, array $values)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
index 90c06066..0d655a32 100755
--- a/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -30,14 +30,14 @@ class CrawlerTest extends \PHPUnit_Framework_TestCase
public function testGetUri()
{
$uri = 'http://symfony.com';
- $crawler = new Crawler(null, $uri);
+ $crawler = new Crawler(null, $uri);
$this->assertEquals($uri, $crawler->getUri());
}
public function testGetBaseHref()
{
$baseHref = 'http://symfony.com';
- $crawler = new Crawler(null, null, $baseHref);
+ $crawler = new Crawler(null, null, $baseHref);
$this->assertEquals($baseHref, $crawler->getBaseHref());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php
index 2b9f40e2..e8e4cc05 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -80,7 +80,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
* @param string $key Argument name
* @param mixed $value Value
*
- * @return GenericEvent
+ * @return $this
*/
public function setArgument($key, $value)
{
@@ -104,7 +104,7 @@ class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
*
* @param array $args Arguments
*
- * @return GenericEvent
+ * @return $this
*/
public function setArguments(array $args = array())
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
index 04b1ec14..2a0da9ca 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
@@ -29,7 +29,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
{
$event = new Event();
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$service
->expects($this->once())
@@ -50,7 +50,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
{
$event = new Event();
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\SubscriberService');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\SubscriberService')->getMock();
$service
->expects($this->once())
@@ -85,7 +85,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
{
$event = new Event();
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$service
->expects($this->once())
@@ -107,7 +107,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
{
$event = new Event();
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$container = new Container();
$container->set('service.listener', $service);
@@ -130,7 +130,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
public function testGetListenersOnLazyLoad()
{
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$container = new Container();
$container->set('service.listener', $service);
@@ -147,7 +147,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
public function testRemoveAfterDispatch()
{
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$container = new Container();
$container->set('service.listener', $service);
@@ -162,7 +162,7 @@ class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
public function testRemoveBeforeDispatch()
{
- $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+ $service = $this->getMockBuilder('Symfony\Component\EventDispatcher\Tests\Service')->getMock();
$container = new Container();
$container->set('service.listener', $service);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index eed3ec46..15e00dbc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -126,7 +126,7 @@ class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
public function testLogger()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$dispatcher = new EventDispatcher();
$tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
@@ -141,7 +141,7 @@ class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
public function testLoggerWithStoppedEvent()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$dispatcher = new EventDispatcher();
$tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index 0fdd6372..cb04f74b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -29,7 +29,7 @@ class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
'my_event_subscriber' => array(0 => array()),
);
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
$definition->expects($this->atLeastOnce())
->method('isPublic')
->will($this->returnValue(true));
@@ -37,10 +37,7 @@ class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
->method('getClass')
->will($this->returnValue('stdClass'));
- $builder = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
@@ -64,7 +61,7 @@ class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
'my_event_subscriber' => array(0 => array()),
);
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
$definition->expects($this->atLeastOnce())
->method('isPublic')
->will($this->returnValue(true));
@@ -72,10 +69,7 @@ class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
->method('getClass')
->will($this->returnValue('Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService'));
- $builder = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'findDefinition')
- );
+ $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'findDefinition'))->getMock();
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
index 80a7e43b..0f886803 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -31,7 +31,7 @@ class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->innerDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $this->innerDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
}
@@ -80,7 +80,7 @@ class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
*/
public function testAddSubscriberDisallowed()
{
- $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
+ $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->addSubscriber($subscriber);
}
@@ -98,7 +98,7 @@ class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
*/
public function testRemoveSubscriberDisallowed()
{
- $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
+ $subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->removeSubscriber($subscriber);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php
index d9f29696..f32ec36d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -53,7 +53,7 @@ class Compiler
*
* @param Node\Node $node The node to compile
*
- * @return Compiler The current compiler instance
+ * @return $this
*/
public function compile(Node\Node $node)
{
@@ -80,7 +80,7 @@ class Compiler
*
* @param string $string The string
*
- * @return Compiler The current compiler instance
+ * @return $this
*/
public function raw($string)
{
@@ -94,7 +94,7 @@ class Compiler
*
* @param string $value The string
*
- * @return Compiler The current compiler instance
+ * @return $this
*/
public function string($value)
{
@@ -108,7 +108,7 @@ class Compiler
*
* @param mixed $value The value to convert
*
- * @return Compiler The current compiler instance
+ * @return $this
*/
public function repr($value)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index dd2165bd..82b27454 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -19,8 +19,8 @@ class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
{
public function testCachedParse()
{
- $cacheMock = $this->getMock('Psr\Cache\CacheItemPoolInterface');
- $cacheItemMock = $this->getMock('Psr\Cache\CacheItemInterface');
+ $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
+ $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$savedParsedExpression = null;
$expressionLanguage = new ExpressionLanguage($cacheMock);
@@ -66,9 +66,9 @@ class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
*/
public function testCachedParseWithDeprecatedParserCacheInterface()
{
- $cacheMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
- $cacheItemMock = $this->getMock('Psr\Cache\CacheItemInterface');
+ $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$savedParsedExpression = null;
$expressionLanguage = new ExpressionLanguage($cacheMock);
@@ -98,7 +98,7 @@ class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
*/
public function testWrongCacheImplementation()
{
- $cacheMock = $this->getMock('Psr\Cache\CacheItemSpoolInterface');
+ $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();
$expressionLanguage = new ExpressionLanguage($cacheMock);
}
@@ -172,8 +172,8 @@ class ExpressionLanguageTest extends \PHPUnit_Framework_TestCase
public function testCachingWithDifferentNamesOrder()
{
- $cacheMock = $this->getMock('Psr\Cache\CacheItemPoolInterface');
- $cacheItemMock = $this->getMock('Psr\Cache\CacheItemInterface');
+ $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
+ $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$expressionLanguage = new ExpressionLanguage($cacheMock);
$savedParsedExpressions = array();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
index 5c15c328..a02b9a4e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
@@ -22,7 +22,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
{
public function testGetItem()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$key = 'key';
$value = 'value';
@@ -43,8 +43,8 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testSave()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
- $cacheItemMock = $this->getMock('Psr\Cache\CacheItemInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
+ $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$key = 'key';
$value = new ParsedExpression('1 + 1', new Node(array(), array()));
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
@@ -72,7 +72,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testGetItems()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
@@ -81,7 +81,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testHasItem()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$key = 'key';
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
@@ -91,7 +91,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testClear()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
@@ -100,7 +100,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testDeleteItem()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$key = 'key';
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
@@ -110,7 +110,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testDeleteItems()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$keys = array('key');
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
@@ -120,9 +120,9 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testSaveDeferred()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
- $cacheItemMock = $this->getMock('Psr\Cache\CacheItemInterface');
+ $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$this->setExpectedException(\BadMethodCallException::class);
$parserCacheAdapter->saveDeferred($cacheItemMock);
@@ -130,7 +130,7 @@ class ParserCacheAdapterTest extends \PHPUnit_Framework_TestCase
public function testCommit()
{
- $poolMock = $this->getMock('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface');
+ $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php b/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php
index b24caa07..51795944 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Filesystem/Filesystem.php
@@ -632,7 +632,9 @@ class Filesystem
if (!is_dir($dir)) {
$this->mkdir($dir);
- } elseif (!is_writable($dir)) {
+ }
+
+ if (!is_writable($dir)) {
throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Filesystem/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php b/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
index 62f4f549..add3fa25 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Finder/Finder.php
@@ -72,7 +72,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Creates a new Finder.
*
- * @return Finder A new Finder instance
+ * @return static
*/
public static function create()
{
@@ -82,7 +82,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Restricts the matching to directories only.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*/
public function directories()
{
@@ -94,7 +94,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Restricts the matching to files only.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*/
public function files()
{
@@ -113,7 +113,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string|int $level The depth level expression
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see DepthRangeFilterIterator
* @see NumberComparator
@@ -137,7 +137,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $date A date range string
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see strtotime
* @see DateRangeFilterIterator
@@ -161,7 +161,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (a regexp, a glob, or a string)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilenameFilterIterator
*/
@@ -177,7 +177,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (a regexp, a glob, or a string)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilenameFilterIterator
*/
@@ -198,7 +198,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (string or regexp)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilecontentFilterIterator
*/
@@ -219,7 +219,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (string or regexp)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilecontentFilterIterator
*/
@@ -242,7 +242,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (a regexp or a string)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilenameFilterIterator
*/
@@ -265,7 +265,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string $pattern A pattern (a regexp or a string)
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see FilenameFilterIterator
*/
@@ -285,7 +285,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string|int $size A size range string or an integer
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SizeRangeFilterIterator
* @see NumberComparator
@@ -302,7 +302,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string|array $dirs A directory path or an array of directories
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see ExcludeDirectoryFilterIterator
*/
@@ -318,7 +318,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see ExcludeDirectoryFilterIterator
*/
@@ -338,7 +338,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param bool $ignoreVCS Whether to exclude VCS files or not
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see ExcludeDirectoryFilterIterator
*/
@@ -378,7 +378,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param \Closure $closure An anonymous function
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -394,7 +394,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -410,7 +410,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -428,7 +428,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -448,7 +448,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -466,7 +466,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see SortableIterator
*/
@@ -485,7 +485,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param \Closure $closure An anonymous function
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @see CustomFilterIterator
*/
@@ -499,7 +499,7 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Forces the following of symlinks.
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*/
public function followLinks()
{
@@ -515,7 +515,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param bool $ignore
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*/
public function ignoreUnreadableDirs($ignore = true)
{
@@ -529,7 +529,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param string|array $dirs A directory path or an array of directories
*
- * @return Finder|SplFileInfo[] The current Finder instance
+ * @return $this
*
* @throws \InvalidArgumentException if one of the directories does not exist
*/
@@ -590,7 +590,7 @@ class Finder implements \IteratorAggregate, \Countable
*
* @param mixed $iterator
*
- * @return Finder|SplFileInfo[] The finder
+ * @return $this
*
* @throws \InvalidArgumentException When the given argument is not iterable.
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Finder/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php
index 6ceaed27..efc14c06 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Button.php
@@ -369,7 +369,7 @@ class Button implements \IteratorAggregate, FormInterface
* @param null|string $submittedData The data
* @param bool $clearMissing Not used
*
- * @return Button The button instance
+ * @return $this
*
* @throws Exception\AlreadySubmittedException If the button has already been submitted.
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php
index 23dced53..c65fb303 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/ButtonBuilder.php
@@ -286,7 +286,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* @param bool $disabled Whether the button is disabled
*
- * @return ButtonBuilder The button builder
+ * @return $this
*/
public function setDisabled($disabled)
{
@@ -398,7 +398,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* @param ResolvedFormTypeInterface $type The type of the button
*
- * @return ButtonBuilder The button builder
+ * @return $this
*/
public function setType(ResolvedFormTypeInterface $type)
{
@@ -490,7 +490,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
*
* @param bool $initialize
*
- * @return ButtonBuilder
+ * @return $this
*
* @throws BadMethodCallException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
index 9e648cc3..f3eae376 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
@@ -48,7 +48,7 @@ class ChoiceGroupView implements \IteratorAggregate
/**
* {@inheritdoc}
*
- * @return ChoiceGroupView[]|ChoiceView[]
+ * @return self[]|ChoiceView[]
*/
public function getIterator()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index 8434f893..68ce27b0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -129,11 +129,11 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
try {
if ($dateOnly) {
// we only care about year-month-date, which has been delivered as a timestamp pointing to UTC midnight
- return new \DateTime(gmdate('Y-m-d', $timestamp), new \DateTimeZone($this->inputTimezone));
+ $dateTime = new \DateTime(gmdate('Y-m-d', $timestamp), new \DateTimeZone($this->outputTimezone));
+ } else {
+ // read timestamp into DateTime object - the formatter delivers a timestamp
+ $dateTime = new \DateTime(sprintf('@%s', $timestamp));
}
-
- // read timestamp into DateTime object - the formatter delivers a timestamp
- $dateTime = new \DateTime(sprintf('@%s', $timestamp));
// set timezone separately, as it would be ignored if set via the constructor,
// see http://php.net/manual/en/datetime.construct.php
$dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index ca26ae57..af907932 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -56,11 +56,11 @@ class DateType extends AbstractType
throw new InvalidOptionsException('The "format" option must be one of the IntlDateFormatter constants (FULL, LONG, MEDIUM, SHORT) or a string representing a custom format.');
}
- if (null !== $pattern && (false === strpos($pattern, 'y') || false === strpos($pattern, 'M') || false === strpos($pattern, 'd'))) {
- throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $pattern));
- }
-
if ('single_text' === $options['widget']) {
+ if (null !== $pattern && false === strpos($pattern, 'y') && false === strpos($pattern, 'M') && false === strpos($pattern, 'd')) {
+ throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" or "d". Its current value is "%s".', $pattern));
+ }
+
$builder->addViewTransformer(new DateTimeToLocalizedStringTransformer(
$options['model_timezone'],
$options['view_timezone'],
@@ -70,6 +70,10 @@ class DateType extends AbstractType
$pattern
));
} else {
+ if (null !== $pattern && (false === strpos($pattern, 'y') || false === strpos($pattern, 'M') || false === strpos($pattern, 'd'))) {
+ throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $pattern));
+ }
+
$yearOptions = $monthOptions = $dayOptions = array(
'error_bubbling' => true,
);
@@ -212,7 +216,7 @@ class DateType extends AbstractType
array('year' => $default, 'month' => $default, 'day' => $default),
$choiceTranslationDomain
);
- };
+ }
return array(
'year' => $choiceTranslationDomain,
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 4ba23a8c..d1c04f73 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -213,7 +213,7 @@ class TimeType extends AbstractType
array('hour' => $default, 'minute' => $default, 'second' => $default),
$choiceTranslationDomain
);
- };
+ }
return array(
'hour' => $choiceTranslationDomain,
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index 07803ab5..93d5188d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Form\Extension\Validator\Constraints;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\GroupSequence;
use Symfony\Component\Validator\Constraints\Valid;
use Symfony\Component\Validator\ConstraintValidator;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -47,8 +48,8 @@ class FormValidator extends ConstraintValidator
// Validate the data against its own constraints
if ($form->isRoot() && (is_object($data) || is_array($data))) {
- foreach ($groups as $group) {
- $validator->atPath('data')->validate($form->getData(), null, $group);
+ if (is_array($groups) && count($groups) > 0 || $groups instanceof GroupSequence && count($groups->groups) > 0) {
+ $validator->atPath('data')->validate($form->getData(), null, $groups);
}
}
@@ -166,6 +167,10 @@ class FormValidator extends ConstraintValidator
$groups = call_user_func($groups, $form);
}
+ if ($groups instanceof GroupSequence) {
+ return $groups;
+ }
+
return (array) $groups;
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
index 512d8184..4f52003c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/BaseValidatorExtension.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Form\Extension\Validator\Type;
use Symfony\Component\Form\AbstractTypeExtension;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\GroupSequence;
/**
* Encapsulates common logic of {@link FormTypeValidatorExtension} and
@@ -42,6 +43,10 @@ abstract class BaseValidatorExtension extends AbstractTypeExtension
return $groups;
}
+ if ($groups instanceof GroupSequence) {
+ return $groups;
+ }
+
return (array) $groups;
};
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
index c8acaf82..a04a17c9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Form.php
@@ -713,7 +713,7 @@ class Form implements \IteratorAggregate, FormInterface
return FormUtil::isEmpty($this->modelData) ||
// arrays, countables
- 0 === count($this->modelData) ||
+ ((is_array($this->modelData) || $this->modelData instanceof \Countable) && 0 === count($this->modelData)) ||
// traversables that are not countable
($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php
index a9bf67be..e8648ac4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilder.php
@@ -248,7 +248,7 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
*
* @param string $name The name of the unresolved child
*
- * @return FormBuilder The created instance
+ * @return self The created instance
*/
private function resolveChild($name)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php
index 68a176c9..bd7ce9b6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormBuilderInterface.php
@@ -27,7 +27,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
* @param string|null $type
* @param array $options
*
- * @return FormBuilderInterface The builder object
+ * @return $this
*/
public function add($child, $type = null, array $options = array());
@@ -38,7 +38,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
* @param string|null $type The type of the form or null if name is a property
* @param array $options The options
*
- * @return FormBuilderInterface The created builder
+ * @return self
*/
public function create($name, $type = null, array $options = array());
@@ -47,7 +47,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
*
* @param string $name The name of the child
*
- * @return FormBuilderInterface The builder for the child
+ * @return self
*
* @throws Exception\InvalidArgumentException if the given child does not exist
*/
@@ -58,7 +58,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
*
* @param string $name
*
- * @return FormBuilderInterface The builder object
+ * @return $this
*/
public function remove($name);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index 72d747c2..13ac4682 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -28,7 +28,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* with a higher priority are called before
* listeners with a lower priority.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function addEventListener($eventName, $listener, $priority = 0);
@@ -37,7 +37,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param EventSubscriberInterface $subscriber The subscriber to attach
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function addEventSubscriber(EventSubscriberInterface $subscriber);
@@ -52,14 +52,14 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* @param DataTransformerInterface $viewTransformer
* @param bool $forcePrepend if set to true, prepend instead of appending
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function addViewTransformer(DataTransformerInterface $viewTransformer, $forcePrepend = false);
/**
* Clears the view transformers.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function resetViewTransformers();
@@ -74,14 +74,14 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* @param DataTransformerInterface $modelTransformer
* @param bool $forceAppend if set to true, append instead of prepending
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function addModelTransformer(DataTransformerInterface $modelTransformer, $forceAppend = false);
/**
* Clears the normalization transformers.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function resetModelTransformers();
@@ -91,7 +91,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* @param string $name The name of the attribute
* @param mixed $value The value of the attribute
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setAttribute($name, $value);
@@ -100,7 +100,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param array $attributes The attributes
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setAttributes(array $attributes);
@@ -109,7 +109,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param DataMapperInterface $dataMapper
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setDataMapper(DataMapperInterface $dataMapper = null);
@@ -118,7 +118,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $disabled Whether the form is disabled
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setDisabled($disabled);
@@ -127,7 +127,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param mixed $emptyData The empty data
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setEmptyData($emptyData);
@@ -136,7 +136,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $errorBubbling
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setErrorBubbling($errorBubbling);
@@ -145,7 +145,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $required
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setRequired($required);
@@ -156,7 +156,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* The property path or null if the path should be set
* automatically based on the form's name.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setPropertyPath($propertyPath);
@@ -166,7 +166,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $mapped Whether the form should be mapped
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setMapped($mapped);
@@ -176,7 +176,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* @param bool $byReference Whether the data should be
* modified by reference.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setByReference($byReference);
@@ -185,7 +185,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $inheritData Whether the form should inherit its parent's data
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setInheritData($inheritData);
@@ -194,7 +194,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $compound Whether the form should be compound
*
- * @return self The configuration object
+ * @return $this The configuration object
*
* @see FormConfigInterface::getCompound()
*/
@@ -205,7 +205,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param ResolvedFormTypeInterface $type The type of the form
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setType(ResolvedFormTypeInterface $type);
@@ -214,7 +214,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param mixed $data The data of the form in application format
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setData($data);
@@ -227,7 +227,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param bool $locked Whether to lock the default data
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setDataLocked($locked);
@@ -243,7 +243,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param string $action The target URL of the form
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setAction($action);
@@ -252,7 +252,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param string $method The HTTP method of the form
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setMethod($method);
@@ -261,7 +261,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
*
* @param RequestHandlerInterface $requestHandler
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setRequestHandler(RequestHandlerInterface $requestHandler);
@@ -275,7 +275,7 @@ interface FormConfigBuilderInterface extends FormConfigInterface
* In the second case, you need to call
* {@link FormInterface::initialize()} manually.
*
- * @return self The configuration object
+ * @return $this The configuration object
*/
public function setAutoInitialize($initialize);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php
index d89e2f9f..c1e55dcc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormFactoryBuilderInterface.php
@@ -23,7 +23,7 @@ interface FormFactoryBuilderInterface
*
* @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function setResolvedTypeFactory(ResolvedFormTypeFactoryInterface $resolvedTypeFactory);
@@ -32,7 +32,7 @@ interface FormFactoryBuilderInterface
*
* @param FormExtensionInterface $extension The extension
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addExtension(FormExtensionInterface $extension);
@@ -41,7 +41,7 @@ interface FormFactoryBuilderInterface
*
* @param FormExtensionInterface[] $extensions The extensions
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addExtensions(array $extensions);
@@ -50,7 +50,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeInterface $type The form type
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addType(FormTypeInterface $type);
@@ -59,7 +59,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeInterface[] $types The form types
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addTypes(array $types);
@@ -68,7 +68,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeExtensionInterface $typeExtension The form type extension
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addTypeExtension(FormTypeExtensionInterface $typeExtension);
@@ -77,7 +77,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeExtensionInterface[] $typeExtensions The form type extensions
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addTypeExtensions(array $typeExtensions);
@@ -86,7 +86,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeGuesserInterface $typeGuesser The type guesser
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addTypeGuesser(FormTypeGuesserInterface $typeGuesser);
@@ -95,7 +95,7 @@ interface FormFactoryBuilderInterface
*
* @param FormTypeGuesserInterface[] $typeGuessers The type guessers
*
- * @return FormFactoryBuilderInterface The builder
+ * @return $this
*/
public function addTypeGuessers(array $typeGuessers);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php
index 8cb7122b..98869977 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormInterface.php
@@ -25,7 +25,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param FormInterface|null $parent The parent form or null if it's the root
*
- * @return FormInterface The form instance
+ * @return self
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
* @throws Exception\LogicException When trying to set a parent for a form with
@@ -36,7 +36,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/**
* Returns the parent form.
*
- * @return FormInterface|null The parent form or null if there is none
+ * @return self|null The parent form or null if there is none
*/
public function getParent();
@@ -47,7 +47,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* @param string|null $type The child's type, if a name was passed
* @param array $options The child's options, if a name was passed
*
- * @return FormInterface The form instance
+ * @return self
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
* @throws Exception\LogicException When trying to add a child to a non-compound form.
@@ -60,7 +60,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param string $name The name of the child
*
- * @return FormInterface The child form
+ * @return self
*
* @throws \OutOfBoundsException If the named child does not exist.
*/
@@ -80,7 +80,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param string $name The name of the child to remove
*
- * @return FormInterface The form instance
+ * @return $this
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
*/
@@ -89,7 +89,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/**
* Returns all children in this group.
*
- * @return FormInterface[] An array of FormInterface instances
+ * @return self[]
*/
public function all();
@@ -110,7 +110,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param mixed $modelData The data formatted as expected for the underlying object
*
- * @return FormInterface The form instance
+ * @return $this
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
* @throws Exception\LogicException If listeners try to call setData in a cycle. Or if
@@ -182,7 +182,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param FormError $error
*
- * @return FormInterface The form instance
+ * @return $this
*/
public function addError(FormError $error);
@@ -248,7 +248,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* Should be called on the root form after constructing the tree.
*
- * @return FormInterface The form instance
+ * @return $this
*/
public function initialize();
@@ -262,7 +262,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
*
* @param mixed $request The request to handle
*
- * @return FormInterface The form instance
+ * @return $this
*/
public function handleRequest($request = null);
@@ -274,7 +274,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* when they are missing in the
* submitted data.
*
- * @return FormInterface The form instance
+ * @return $this
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
*/
@@ -283,7 +283,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/**
* Returns the root of the form tree.
*
- * @return FormInterface The root of the tree
+ * @return self The root of the tree
*/
public function getRoot();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php b/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php
index 401288cf..c1da5f8f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/FormView.php
@@ -81,7 +81,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
/**
* Marks the view as rendered.
*
- * @return FormView The view object
+ * @return $this
*/
public function setRendered()
{
@@ -95,7 +95,7 @@ class FormView implements \ArrayAccess, \IteratorAggregate, \Countable
*
* @param string $name The child name
*
- * @return FormView The child view
+ * @return self The child view
*/
public function offsetGet($name)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php
index 0595e7bb..36614ffd 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Guess/Guess.php
@@ -70,7 +70,7 @@ abstract class Guess
*
* @param Guess[] $guesses An array of guesses
*
- * @return Guess|null The guess with the highest confidence
+ * @return self|null
*/
public static function getBestGuess(array $guesses)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
index 7d764772..dc3b81d2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/ResolvedFormTypeInterface.php
@@ -30,7 +30,7 @@ interface ResolvedFormTypeInterface
/**
* Returns the parent type.
*
- * @return ResolvedFormTypeInterface|null The parent type or null
+ * @return self|null The parent type or null
*/
public function getParent();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php b/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php
index 53ff7bc3..4bfc1b64 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/SubmitButton.php
@@ -37,7 +37,7 @@ class SubmitButton extends Button implements ClickableInterface
* @param null|string $submittedData The data
* @param bool $clearMissing Not used
*
- * @return SubmitButton The button instance
+ * @return $this
*
* @throws Exception\AlreadySubmittedException If the form has already been submitted.
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
index c2c3ad21..09138b1d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -1364,7 +1364,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testDateTime()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
'input' => 'string',
'with_seconds' => false,
));
@@ -1383,7 +1383,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
/following-sibling::select
[@id="name_date_year"]
[@class="form-control"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
/following-sibling::select
[@id="name_time_hour"]
[@class="form-control"]
@@ -1438,7 +1438,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testDateTimeWithHourAndMinute()
{
- $data = array('year' => '2011', 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
+ $data = array('year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, array(
'input' => 'array',
@@ -1460,7 +1460,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
/following-sibling::select
[@id="name_date_year"]
[@class="form-control"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
/following-sibling::select
[@id="name_time_hour"]
[@class="form-control"]
@@ -1477,7 +1477,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testDateTimeWithSeconds()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
'input' => 'string',
'with_seconds' => true,
));
@@ -1497,7 +1497,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
/following-sibling::select
[@id="name_date_year"]
[@class="form-control"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
/following-sibling::select
[@id="name_time_hour"]
[@class="form-control"]
@@ -1587,7 +1587,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
public function testDateChoice()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', array(
'input' => 'string',
'widget' => 'choice',
));
@@ -1607,7 +1607,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
/following-sibling::select
[@id="name_year"]
[@class="form-control"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
]
[count(./select)=3]
'
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php
index dec9df70..95125892 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractFormTest.php
@@ -35,7 +35,7 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->dispatcher = new EventDispatcher();
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$this->form = $this->createForm();
}
@@ -71,8 +71,8 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
*/
protected function getMockForm($name = 'name')
{
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
- $config = $this->getMock('Symfony\Component\Form\FormConfigInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
+ $config = $this->getMockBuilder('Symfony\Component\Form\FormConfigInterface')->getMock();
$form->expects($this->any())
->method('getName')
@@ -89,7 +89,7 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
*/
protected function getDataMapper()
{
- return $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
}
/**
@@ -97,7 +97,7 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
*/
protected function getDataTransformer()
{
- return $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
}
/**
@@ -105,6 +105,6 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
*/
protected function getFormValidator()
{
- return $this->getMock('Symfony\Component\Form\FormValidatorInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\FormValidatorInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index 25edbed1..31372ebe 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -28,7 +28,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
\Locale::setDefault('en');
- $this->csrfTokenManager = $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
+ $this->csrfTokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
parent::setUp();
}
@@ -1233,7 +1233,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
public function testDateTime()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
'input' => 'string',
'with_seconds' => false,
));
@@ -1252,7 +1252,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
[./option[@value="3"][@selected="selected"]]
/following-sibling::select
[@id="name_date_year"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
]
/following-sibling::div
[@id="name_time"]
@@ -1312,7 +1312,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
public function testDateTimeWithHourAndMinute()
{
- $data = array('year' => '2011', 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
+ $data = array('year' => date('Y'), 'month' => '2', 'day' => '3', 'hour' => '4', 'minute' => '5');
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', $data, array(
'input' => 'array',
@@ -1333,7 +1333,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
[./option[@value="3"][@selected="selected"]]
/following-sibling::select
[@id="name_date_year"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
]
/following-sibling::div
[@id="name_time"]
@@ -1353,7 +1353,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
public function testDateTimeWithSeconds()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', '2011-02-03 04:05:06', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateTimeType', date('Y').'-02-03 04:05:06', array(
'input' => 'string',
'with_seconds' => true,
));
@@ -1372,7 +1372,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
[./option[@value="3"][@selected="selected"]]
/following-sibling::select
[@id="name_date_year"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
]
/following-sibling::div
[@id="name_time"]
@@ -1459,7 +1459,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
public function testDateChoice()
{
- $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', '2011-02-03', array(
+ $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\DateType', date('Y').'-02-03', array(
'input' => 'string',
'widget' => 'choice',
));
@@ -1475,7 +1475,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
[./option[@value="3"][@selected="selected"]]
/following-sibling::select
[@id="name_year"]
- [./option[@value="2011"][@selected="selected"]]
+ [./option[@value="'.date('Y').'"][@selected="selected"]]
]
[count(./select)=3]
'
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
index 022b5148..5ddd6cb6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php
@@ -37,10 +37,7 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serverParams = $this->getMock(
- 'Symfony\Component\Form\Util\ServerParams',
- array('getNormalizedIniPostMaxSize', 'getContentLength')
- );
+ $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize', 'getContentLength'))->getMock();
$this->requestHandler = $this->getRequestHandler();
$this->factory = Forms::createFormFactoryBuilder()->getFormFactory();
$this->request = null;
@@ -363,7 +360,7 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
protected function getMockForm($name, $method = null, $compound = true)
{
- $config = $this->getMock('Symfony\Component\Form\FormConfigInterface');
+ $config = $this->getMockBuilder('Symfony\Component\Form\FormConfigInterface')->getMock();
$config->expects($this->any())
->method('getMethod')
->will($this->returnValue($method));
@@ -371,7 +368,7 @@ abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
->method('getCompound')
->will($this->returnValue($compound));
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$form->expects($this->any())
->method('getName')
->will($this->returnValue($name));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php
index b0c766c7..5fa2fa13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ButtonTest.php
@@ -25,8 +25,8 @@ class ButtonTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
index c27c0093..af73e967 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
@@ -30,7 +30,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->decoratedFactory = $this->getMock('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface');
+ $this->decoratedFactory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
$this->factory = new CachingFactoryDecorator($this->decoratedFactory);
}
@@ -157,7 +157,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderSameLoader()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$list = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -171,8 +171,8 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderDifferentLoader()
{
- $loader1 = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
- $loader2 = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
+ $loader2 = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$list1 = new \stdClass();
$list2 = new \stdClass();
@@ -191,7 +191,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderSameValueClosure()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$list = new \stdClass();
$closure = function () {};
@@ -206,7 +206,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderDifferentValueClosure()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$list1 = new \stdClass();
$list2 = new \stdClass();
$closure1 = function () {};
@@ -228,7 +228,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSamePreferredChoices()
{
$preferred = array('a');
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -244,7 +244,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$preferred1 = array('a');
$preferred2 = array('b');
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -264,7 +264,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSamePreferredChoicesClosure()
{
$preferred = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -280,7 +280,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$preferred1 = function () {};
$preferred2 = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -300,7 +300,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSameLabelClosure()
{
$labels = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -316,7 +316,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$labels1 = function () {};
$labels2 = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -336,7 +336,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSameIndexClosure()
{
$index = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -352,7 +352,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$index1 = function () {};
$index2 = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -372,7 +372,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSameGroupByClosure()
{
$groupBy = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -388,7 +388,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$groupBy1 = function () {};
$groupBy2 = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -408,7 +408,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSameAttributes()
{
$attr = array('class' => 'foobar');
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -424,7 +424,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$attr1 = array('class' => 'foobar1');
$attr2 = array('class' => 'foobar2');
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
@@ -444,7 +444,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewSameAttributesClosure()
{
$attr = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view = new \stdClass();
$this->decoratedFactory->expects($this->once())
@@ -460,7 +460,7 @@ class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
{
$attr1 = function () {};
$attr2 = function () {};
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$view1 = new \stdClass();
$view2 = new \stdClass();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
index 4c268418..80e6e8f2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -193,7 +193,7 @@ class DefaultChoiceListFactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoader()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$list = $this->factory->createListFromLoader($loader);
@@ -202,7 +202,7 @@ class DefaultChoiceListFactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderWithValues()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$value = function () {};
$list = $this->factory->createListFromLoader($loader, $value);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
index c7b22541..30111a24 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
@@ -31,7 +31,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->decoratedFactory = $this->getMock('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface');
+ $this->decoratedFactory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
$this->factory = new PropertyAccessDecorator($this->decoratedFactory);
}
@@ -80,7 +80,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderPropertyPath()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createListFromLoader')
@@ -97,7 +97,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateFromLoaderPropertyPathWithCallableString()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createListFromLoader')
@@ -125,7 +125,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
// https://github.com/symfony/symfony/issues/5494
public function testCreateFromChoiceLoaderAssumeNullIfValuePropertyPathUnreadable()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createListFromLoader')
@@ -139,7 +139,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateFromLoaderPropertyPathInstance()
{
- $loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createListFromLoader')
@@ -153,7 +153,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewPreferredChoicesAsPropertyPath()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -173,7 +173,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewPreferredChoicesAsPropertyPathWithCallableString()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -188,7 +188,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewPreferredChoicesAsPropertyPathInstance()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -206,7 +206,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
// https://github.com/symfony/symfony/issues/5494
public function testCreateViewAssumeNullIfPreferredChoicesPropertyPathUnreadable()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -223,7 +223,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewLabelsAsPropertyPath()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -244,7 +244,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewLabelsAsPropertyPathWithCallableString()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -260,7 +260,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewLabelsAsPropertyPathInstance()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -278,7 +278,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewIndicesAsPropertyPath()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -300,7 +300,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewIndicesAsPropertyPathWithCallableString()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -317,7 +317,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewIndicesAsPropertyPathInstance()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -336,7 +336,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewGroupsAsPropertyPath()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -359,7 +359,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewGroupsAsPropertyPathWithCallableString()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -377,7 +377,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewGroupsAsPropertyPathInstance()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -398,7 +398,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
// https://github.com/symfony/symfony/issues/5494
public function testCreateViewAssumeNullIfGroupsPropertyPathUnreadable()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -418,7 +418,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewAttrAsPropertyPath()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -442,7 +442,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewAttrAsPropertyPathWithCallableString()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
@@ -461,7 +461,7 @@ class PropertyAccessDecoratorTest extends \PHPUnit_Framework_TestCase
public function testCreateViewAttrAsPropertyPathInstance()
{
- $list = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
+ $list = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
$this->decoratedFactory->expects($this->once())
->method('createView')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
index 073913f8..824b2f32 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
@@ -38,8 +38,8 @@ class LazyChoiceListTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->loadedList = $this->getMock('Symfony\Component\Form\ChoiceList\ChoiceListInterface');
- $this->loader = $this->getMock('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface');
+ $this->loadedList = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\ChoiceListInterface')->getMock();
+ $this->loader = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface')->getMock();
$this->value = function () {};
$this->list = new LazyChoiceList($this->loader, $this->value);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
index bfe71668..3e71a83e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -877,7 +877,7 @@ class CompoundFormTest extends AbstractFormTest
// Basic cases are covered in SimpleFormTest
public function testCreateViewWithChildren()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
$options = array('a' => 'Foo', 'b' => 'Bar');
$field1 = $this->getMockForm('foo');
$field2 = $this->getMockForm('bar');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
index 0597de74..3385c05d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -34,8 +34,8 @@ class PropertyPathMapperTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->propertyAccessor = $this->getMock('Symfony\Component\PropertyAccess\PropertyAccessorInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->propertyAccessor = $this->getMockBuilder('Symfony\Component\PropertyAccess\PropertyAccessorInterface')->getMock();
$this->mapper = new PropertyPathMapper($this->propertyAccessor);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
index 7eb716b6..ac61acc4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
@@ -19,11 +19,7 @@ class BaseDateTimeTransformerTest extends \PHPUnit_Framework_TestCase
*/
public function testConstructFailsIfInputTimezoneIsInvalid()
{
- $this->getMock(
- 'Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer',
- array(),
- array('this_timezone_does_not_exist')
- );
+ $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(array('this_timezone_does_not_exist'))->getMock();
}
/**
@@ -32,10 +28,6 @@ class BaseDateTimeTransformerTest extends \PHPUnit_Framework_TestCase
*/
public function testConstructFailsIfOutputTimezoneIsInvalid()
{
- $this->getMock(
- 'Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer',
- array(),
- array(null, 'that_timezone_does_not_exist')
- );
+ $this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(array(null, 'that_timezone_does_not_exist'))->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
index 2ee2f22d..9ec553db 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php
@@ -17,12 +17,12 @@ class DataTransformerChainTest extends \PHPUnit_Framework_TestCase
{
public function testTransform()
{
- $transformer1 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+ $transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
$transformer1->expects($this->once())
->method('transform')
->with($this->identicalTo('foo'))
->will($this->returnValue('bar'));
- $transformer2 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+ $transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
$transformer2->expects($this->once())
->method('transform')
->with($this->identicalTo('bar'))
@@ -35,12 +35,12 @@ class DataTransformerChainTest extends \PHPUnit_Framework_TestCase
public function testReverseTransform()
{
- $transformer2 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+ $transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
$transformer2->expects($this->once())
->method('reverseTransform')
->with($this->identicalTo('foo'))
->will($this->returnValue('bar'));
- $transformer1 = $this->getMock('Symfony\Component\Form\DataTransformerInterface');
+ $transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
$transformer1->expects($this->once())
->method('reverseTransform')
->with($this->identicalTo('bar'))
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
index b54c0d50..05453acb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -237,6 +237,15 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
}
+ public function testReverseTransformOnlyDateWithDifferentTimezones()
+ {
+ $transformer = new DateTimeToLocalizedStringTransformer('Europe/Berlin', 'Pacific/Tahiti', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd');
+
+ $dateTime = new \DateTime('2017-01-10 11:00', new \DateTimeZone('Europe/Berlin'));
+
+ $this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
+ }
+
public function testReverseTransformWithDifferentPatterns()
{
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
index c3c9d084..d31de3ca 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/FixUrlProtocolListenerTest.php
@@ -19,7 +19,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
public function testFixHttpUrl()
{
$data = 'www.symfony.com';
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$event = new FormEvent($form, $data);
$filter = new FixUrlProtocolListener('http');
@@ -31,7 +31,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
public function testSkipKnownUrl()
{
$data = 'http://www.symfony.com';
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$event = new FormEvent($form, $data);
$filter = new FixUrlProtocolListener('http');
@@ -56,7 +56,7 @@ class FixUrlProtocolListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testSkipOtherProtocol($url)
{
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$event = new FormEvent($form, $url);
$filter = new FixUrlProtocolListener('http');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
index 2d7ecfec..ddd46819 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
@@ -22,8 +22,8 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$this->form = $this->getForm('axes');
}
@@ -45,7 +45,7 @@ abstract class MergeCollectionListenerTest extends \PHPUnit_Framework_TestCase
protected function getMockForm()
{
- return $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
}
public function getBooleanMatrix1()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index e4959a3c..52afec76 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -24,8 +24,8 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$this->form = $this->getBuilder()
->setCompound(true)
->setDataMapper($this->getDataMapper())
@@ -54,12 +54,12 @@ class ResizeFormListenerTest extends \PHPUnit_Framework_TestCase
*/
private function getDataMapper()
{
- return $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
}
protected function getMockForm()
{
- return $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
}
public function testPreSetDataResizesForm()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
index 959eb928..b60365ca 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/TrimListenerTest.php
@@ -19,7 +19,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
public function testTrim()
{
$data = ' Foo! ';
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$event = new FormEvent($form, $data);
$filter = new TrimListener();
@@ -31,7 +31,7 @@ class TrimListenerTest extends \PHPUnit_Framework_TestCase
public function testTrimSkipNonStrings()
{
$data = 1234;
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$event = new FormEvent($form, $data);
$filter = new TrimListener();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 9b33db2a..628a71f1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -67,12 +67,28 @@ class DateTypeTest extends TestCase
$this->assertEquals('2010-06-02', $form->getViewData());
}
+ public function testSubmitFromSingleTextDateTimeWithCustomFormat()
+ {
+ $form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+ 'model_timezone' => 'UTC',
+ 'view_timezone' => 'UTC',
+ 'widget' => 'single_text',
+ 'input' => 'datetime',
+ 'format' => 'yyyy',
+ ));
+
+ $form->submit('2010');
+
+ $this->assertDateTimeEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
+ $this->assertEquals('2010', $form->getViewData());
+ }
+
public function testSubmitFromSingleTextDateTime()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
@@ -90,10 +106,10 @@ class DateTypeTest extends TestCase
public function testSubmitFromSingleTextString()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
@@ -111,10 +127,10 @@ class DateTypeTest extends TestCase
public function testSubmitFromSingleTextTimestamp()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
@@ -134,10 +150,10 @@ class DateTypeTest extends TestCase
public function testSubmitFromSingleTextRaw()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
@@ -337,6 +353,7 @@ class DateTypeTest extends TestCase
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+ * @expectedExceptionMessage The "format" option should contain the letters "y", "M" and "d". Its current value is "yy".
*/
public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
{
@@ -346,6 +363,18 @@ class DateTypeTest extends TestCase
));
}
+ /**
+ * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+ * @expectedExceptionMessage The "format" option should contain the letters "y", "M" or "d". Its current value is "wrong".
+ */
+ public function testThrowExceptionIfFormatMissesYearMonthAndDayWithSingleTextWidget()
+ {
+ $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
+ 'widget' => 'single_text',
+ 'format' => 'wrong',
+ ));
+ }
+
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
@@ -398,10 +427,10 @@ class DateTypeTest extends TestCase
public function testSetDataWithNegativeTimezoneOffsetStringInput()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
@@ -420,10 +449,10 @@ class DateTypeTest extends TestCase
public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
{
- // we test against "de_AT", so we need the full implementation
+ // we test against "de_DE", so we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
- \Locale::setDefault('de_AT');
+ \Locale::setDefault('de_DE');
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'format' => \IntlDateFormatter::MEDIUM,
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
index 4904b679..356d1c80 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
@@ -25,9 +25,9 @@ class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->tokenManager = $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+ $this->tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
$this->form = $this->getBuilder('post')
->setDataMapper($this->getDataMapper())
->getForm();
@@ -53,12 +53,12 @@ class CsrfValidationListenerTest extends \PHPUnit_Framework_TestCase
protected function getDataMapper()
{
- return $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
}
protected function getMockForm()
{
- return $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
}
// https://github.com/symfony/symfony/pull/5838
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
index 3a343940..0e7261cc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
@@ -42,8 +42,8 @@ class FormTypeCsrfExtensionTest extends TypeTestCase
protected function setUp()
{
- $this->tokenManager = $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
- $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+ $this->tokenManager = $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
+ $this->translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock();
parent::setUp();
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php
index da34d4a9..7c44eb7a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php
@@ -27,7 +27,7 @@ class DataCollectorExtensionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dataCollector = $this->getMock('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface');
+ $this->dataCollector = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface')->getMock();
$this->extension = new DataCollectorExtension($this->dataCollector);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
index ff75cff2..a64aa272 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -65,11 +65,11 @@ class FormDataCollectorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dataExtractor = $this->getMock('Symfony\Component\Form\Extension\DataCollector\FormDataExtractorInterface');
+ $this->dataExtractor = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataExtractorInterface')->getMock();
$this->dataCollector = new FormDataCollector($this->dataExtractor);
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->dataMapper = $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+ $this->dataMapper = $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
$this->form = $this->createForm('name');
$this->childForm = $this->createForm('child');
$this->view = new FormView();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
index c45ca112..b623d377 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -46,13 +46,13 @@ class FormDataExtractorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->dataExtractor = new FormDataExtractor();
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
}
public function testExtractConfiguration()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
$type->expects($this->any())
->method('getInnerType')
->will($this->returnValue(new \stdClass()));
@@ -73,7 +73,7 @@ class FormDataExtractorTest extends \PHPUnit_Framework_TestCase
public function testExtractConfigurationSortsPassedOptions()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
$type->expects($this->any())
->method('getInnerType')
->will($this->returnValue(new \stdClass()));
@@ -107,7 +107,7 @@ class FormDataExtractorTest extends \PHPUnit_Framework_TestCase
public function testExtractConfigurationSortsResolvedOptions()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
$type->expects($this->any())
->method('getInnerType')
->will($this->returnValue(new \stdClass()));
@@ -138,18 +138,18 @@ class FormDataExtractorTest extends \PHPUnit_Framework_TestCase
public function testExtractConfigurationBuildsIdRecursively()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
$type->expects($this->any())
->method('getInnerType')
->will($this->returnValue(new \stdClass()));
$grandParent = $this->createBuilder('grandParent')
->setCompound(true)
- ->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'))
+ ->setDataMapper($this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock())
->getForm();
$parent = $this->createBuilder('parent')
->setCompound(true)
- ->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'))
+ ->setDataMapper($this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock())
->getForm();
$form = $this->createBuilder('name')
->setType($type)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
index 9c53387c..abe98e29 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
@@ -27,7 +27,7 @@ class DataCollectorTypeExtensionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dataCollector = $this->getMock('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface');
+ $this->dataCollector = $this->getMockBuilder('Symfony\Component\Form\Extension\DataCollector\FormDataCollectorInterface')->getMock();
$this->extension = new DataCollectorTypeExtension($this->dataCollector);
}
@@ -38,7 +38,7 @@ class DataCollectorTypeExtensionTest extends \PHPUnit_Framework_TestCase
public function testBuildForm()
{
- $builder = $this->getMock('Symfony\Component\Form\Test\FormBuilderInterface');
+ $builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->getMock();
$builder->expects($this->atLeastOnce())
->method('addEventSubscriber')
->with($this->isInstanceOf('Symfony\Component\Form\Extension\DataCollector\EventListener\DataCollectorListener'));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
index 77fb370d..cfb7fadf 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
@@ -18,17 +18,17 @@ class DependencyInjectionExtensionTest extends \PHPUnit_Framework_TestCase
{
public function testGetTypeExtensions()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
- $typeExtension1 = $this->getMock('Symfony\Component\Form\FormTypeExtensionInterface');
+ $typeExtension1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeExtensionInterface')->getMock();
$typeExtension1->expects($this->any())
->method('getExtendedType')
->willReturn('test');
- $typeExtension2 = $this->getMock('Symfony\Component\Form\FormTypeExtensionInterface');
+ $typeExtension2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeExtensionInterface')->getMock();
$typeExtension2->expects($this->any())
->method('getExtendedType')
->willReturn('test');
- $typeExtension3 = $this->getMock('Symfony\Component\Form\FormTypeExtensionInterface');
+ $typeExtension3 = $this->getMockBuilder('Symfony\Component\Form\FormTypeExtensionInterface')->getMock();
$typeExtension3->expects($this->any())
->method('getExtendedType')
->willReturn('other');
@@ -61,9 +61,9 @@ class DependencyInjectionExtensionTest extends \PHPUnit_Framework_TestCase
*/
public function testThrowExceptionForInvalidExtendedType()
{
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
- $typeExtension = $this->getMock('Symfony\Component\Form\FormTypeExtensionInterface');
+ $typeExtension = $this->getMockBuilder('Symfony\Component\Form\FormTypeExtensionInterface')->getMock();
$typeExtension->expects($this->any())
->method('getExtendedType')
->willReturn('unmatched');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index 90c3aaf6..49e32435 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
use Symfony\Component\Form\SubmitButtonBuilder;
+use Symfony\Component\Validator\Constraints\GroupSequence;
use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Valid;
@@ -47,12 +48,9 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->serverParams = $this->getMock(
- 'Symfony\Component\Form\Extension\Validator\Util\ServerParams',
- array('getNormalizedIniPostMaxSize', 'getContentLength')
- );
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+ $this->serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize', 'getContentLength'))->getMock();
parent::setUp();
}
@@ -64,14 +62,13 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testValidate()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$options = array('validation_groups' => array('group1', 'group2'));
$form = $this->getBuilder('name', '\stdClass', $options)
->setData($object)
->getForm();
- $this->expectValidateAt(0, 'data', $object, 'group1');
- $this->expectValidateAt(1, 'data', $object, 'group2');
+ $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
$this->validator->validate($form, new Form());
@@ -80,7 +77,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testValidateConstraints()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$constraint1 = new NotNull(array('groups' => array('group1', 'group2')));
$constraint2 = new NotBlank(array('groups' => 'group2'));
@@ -93,12 +90,11 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
->getForm();
// First default constraints
- $this->expectValidateAt(0, 'data', $object, 'group1');
- $this->expectValidateAt(1, 'data', $object, 'group2');
+ $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
// Then custom constraints
- $this->expectValidateValueAt(2, 'data', $object, $constraint1, 'group1');
- $this->expectValidateValueAt(3, 'data', $object, $constraint2, 'group2');
+ $this->expectValidateValueAt(1, 'data', $object, $constraint1, 'group1');
+ $this->expectValidateValueAt(2, 'data', $object, $constraint2, 'group2');
$this->validator->validate($form, new Form());
@@ -107,7 +103,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testValidateChildIfValidConstraint()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parent = $this->getBuilder('parent')
->setCompound(true)
@@ -131,7 +127,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontValidateIfParentWithoutValidConstraint()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parent = $this->getBuilder('parent', null)
->setCompound(true)
@@ -156,7 +152,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
$form = new FormBuilder('name', '\stdClass', $this->dispatcher, $this->factory);
$form = $form->setData($object)->getForm();
- $this->expectValidateAt(0, 'data', $object, 'Default');
+ $this->expectValidateAt(0, 'data', $object, array('Default'));
$this->validator->validate($form, new Form());
@@ -165,7 +161,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testValidateConstraintsOptionEvenIfNoValidConstraint()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$constraint1 = new NotNull(array('groups' => array('group1', 'group2')));
$constraint2 = new NotBlank(array('groups' => 'group2'));
@@ -192,7 +188,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontValidateIfNoValidationGroups()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$form = $this->getBuilder('name', '\stdClass', array(
'validation_groups' => array(),
@@ -211,9 +207,9 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontValidateConstraintsIfNoValidationGroups()
{
- $object = $this->getMock('\stdClass');
- $constraint1 = $this->getMock('Symfony\Component\Validator\Constraint');
- $constraint2 = $this->getMock('Symfony\Component\Validator\Constraint');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
+ $constraint1 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
+ $constraint2 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
$options = array(
'validation_groups' => array(),
@@ -235,7 +231,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontValidateIfNotSynchronized()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$form = $this->getBuilder('name', '\stdClass', array(
'invalid_message' => 'invalid_message_key',
@@ -269,7 +265,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testAddInvalidErrorEvenIfNoValidationGroups()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$form = $this->getBuilder('name', '\stdClass', array(
'invalid_message' => 'invalid_message_key',
@@ -304,9 +300,9 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontValidateConstraintsIfNotSynchronized()
{
- $object = $this->getMock('\stdClass');
- $constraint1 = $this->getMock('Symfony\Component\Validator\Constraint');
- $constraint2 = $this->getMock('Symfony\Component\Validator\Constraint');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
+ $constraint1 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
+ $constraint2 = $this->getMockBuilder('Symfony\Component\Validator\Constraint')->getMock();
$options = array(
'invalid_message' => 'invalid_message_key',
@@ -339,7 +335,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
// https://github.com/symfony/symfony/issues/4359
public function testDontMarkInvalidIfAnyChildIsNotSynchronized()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$failingTransformer = new CallbackTransformer(
function ($data) { return $data; },
@@ -367,16 +363,30 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
$this->assertNoViolation();
}
+ public function testHandleGroupSequenceValidationGroups()
+ {
+ $object = $this->getMockBuilder('\stdClass')->getMock();
+ $options = array('validation_groups' => new GroupSequence(array('group1', 'group2')));
+ $form = $this->getBuilder('name', '\stdClass', $options)
+ ->setData($object)
+ ->getForm();
+
+ $this->expectValidateAt(0, 'data', $object, new GroupSequence(array('group1', 'group2')));
+
+ $this->validator->validate($form, new Form());
+
+ $this->assertNoViolation();
+ }
+
public function testHandleCallbackValidationGroups()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$options = array('validation_groups' => array($this, 'getValidationGroups'));
$form = $this->getBuilder('name', '\stdClass', $options)
->setData($object)
->getForm();
- $this->expectValidateAt(0, 'data', $object, 'group1');
- $this->expectValidateAt(1, 'data', $object, 'group2');
+ $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
$this->validator->validate($form, new Form());
@@ -385,13 +395,13 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontExecuteFunctionNames()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$options = array('validation_groups' => 'header');
$form = $this->getBuilder('name', '\stdClass', $options)
->setData($object)
->getForm();
- $this->expectValidateAt(0, 'data', $object, 'header');
+ $this->expectValidateAt(0, 'data', $object, array('header'));
$this->validator->validate($form, new Form());
@@ -400,7 +410,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testHandleClosureValidationGroups()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$options = array('validation_groups' => function (FormInterface $form) {
return array('group1', 'group2');
});
@@ -408,8 +418,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
->setData($object)
->getForm();
- $this->expectValidateAt(0, 'data', $object, 'group1');
- $this->expectValidateAt(1, 'data', $object, 'group2');
+ $this->expectValidateAt(0, 'data', $object, array('group1', 'group2'));
$this->validator->validate($form, new Form());
@@ -418,7 +427,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testUseValidationGroupOfClickedButton()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parent = $this->getBuilder('parent')
->setCompound(true)
@@ -445,7 +454,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testDontUseValidationGroupOfUnclickedButton()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parent = $this->getBuilder('parent')
->setCompound(true)
@@ -472,7 +481,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testUseInheritedValidationGroup()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parentOptions = array('validation_groups' => 'group');
$parent = $this->getBuilder('parent', null, $parentOptions)
@@ -494,7 +503,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testUseInheritedCallbackValidationGroup()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parentOptions = array('validation_groups' => array($this, 'getValidationGroups'));
$parent = $this->getBuilder('parent', null, $parentOptions)
@@ -516,7 +525,7 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testUseInheritedClosureValidationGroup()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$parentOptions = array(
'validation_groups' => function (FormInterface $form) {
@@ -542,12 +551,12 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
public function testAppendPropertyPath()
{
- $object = $this->getMock('\stdClass');
+ $object = $this->getMockBuilder('\stdClass')->getMock();
$form = $this->getBuilder('name', '\stdClass')
->setData($object)
->getForm();
- $this->expectValidateAt(0, 'data', $object, 'Default');
+ $this->expectValidateAt(0, 'data', $object, array('Default'));
$this->validator->validate($form, new Form());
@@ -620,9 +629,9 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
private function getMockExecutionContext()
{
- $context = $this->getMock('Symfony\Component\Validator\Context\ExecutionContextInterface');
- $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
- $contextualValidator = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+ $context = $this->getMockBuilder('Symfony\Component\Validator\Context\ExecutionContextInterface')->getMock();
+ $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
+ $contextualValidator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ContextualValidatorInterface')->getMock();
$validator->expects($this->any())
->method('inContext')
@@ -670,6 +679,6 @@ class FormValidatorTest extends AbstractConstraintValidatorTest
*/
private function getDataMapper()
{
- return $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
index 6859074c..499ff4e9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
@@ -54,10 +54,10 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
- $this->violationMapper = $this->getMock('Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapperInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+ $this->validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
+ $this->violationMapper = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationMapperInterface')->getMock();
$this->listener = new ValidationListener($this->validator, $this->violationMapper);
$this->message = 'Message';
$this->messageTemplate = 'Message template';
@@ -87,7 +87,7 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
private function getMockForm()
{
- return $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
}
// More specific mapping tests can be found in ViolationMapperTest
@@ -161,7 +161,7 @@ class ValidationListenerTest extends \PHPUnit_Framework_TestCase
public function testValidatorInterface()
{
- $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+ $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
$listener = new ValidationListener($validator, $this->violationMapper);
$this->assertAttributeSame($validator, 'validator', $listener);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
index 01f20c41..f12b915b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
use Symfony\Component\Form\Test\FormInterface;
+use Symfony\Component\Validator\Constraints\GroupSequence;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -70,5 +71,14 @@ abstract class BaseValidatorExtensionTest extends TypeTestCase
$this->assertInternalType('callable', $form->getConfig()->getOption('validation_groups'));
}
+ public function testValidationGroupsCanBeSetToGroupSequence()
+ {
+ $form = $this->createForm(array(
+ 'validation_groups' => new GroupSequence(array('group1', 'group2')),
+ ));
+
+ $this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $form->getConfig()->getOption('validation_groups'));
+ }
+
abstract protected function createForm(array $options = array());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
index 9f920003..2bf10bb3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php
@@ -47,7 +47,7 @@ class FormTypeValidatorExtensionTest extends BaseValidatorExtensionTest
public function testValidatorInterface()
{
- $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+ $validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
$formTypeValidatorExtension = new FormTypeValidatorExtension($validator);
$this->assertAttributeSame($validator, 'validator', $formTypeValidatorExtension);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
index 19b6c1ca..663cdd03 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/TypeTestCase.php
@@ -20,7 +20,7 @@ abstract class TypeTestCase extends BaseTypeTestCase
protected function setUp()
{
- $this->validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+ $this->validator = $this->getMockBuilder('Symfony\Component\Validator\Validator\ValidatorInterface')->getMock();
$metadata = $this->getMockBuilder('Symfony\Component\Validator\Mapping\ClassMetadata')->disableOriginalConstructor()->getMock();
$this->validator->expects($this->once())->method('getMetadataFor')->will($this->returnValue($metadata));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
index dbe13a27..8c0984f7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
@@ -19,7 +19,7 @@ class UploadValidatorExtensionTest extends TypeTestCase
{
public function testPostMaxSizeTranslation()
{
- $translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+ $translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock();
$translator->expects($this->any())
->method('trans')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
index 957b5970..3627f4b9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php
@@ -31,7 +31,7 @@ class ServerParamsTest extends \PHPUnit_Framework_TestCase
public function testGetContentLengthFromRequest()
{
$request = Request::create('http://foo', 'GET', array(), array(), array(), array('CONTENT_LENGTH' => 1024));
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array('getCurrentRequest'));
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(array('getCurrentRequest'))->getMock();
$requestStack->expects($this->once())->method('getCurrentRequest')->will($this->returnValue($request));
$serverParams = new ServerParams($requestStack);
@@ -41,7 +41,7 @@ class ServerParamsTest extends \PHPUnit_Framework_TestCase
/** @dataProvider getGetPostMaxSizeTestData */
public function testGetPostMaxSize($size, $bytes)
{
- $serverParams = $this->getMock('Symfony\Component\Form\Extension\Validator\Util\ServerParams', array('getNormalizedIniPostMaxSize'));
+ $serverParams = $this->getMockBuilder('Symfony\Component\Form\Extension\Validator\Util\ServerParams')->setMethods(array('getNormalizedIniPostMaxSize'))->getMock();
$serverParams
->expects($this->any())
->method('getNormalizedIniPostMaxSize')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
index a5e1cb10..ba5f0cd5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
@@ -51,7 +51,7 @@ class ValidatorTypeGuesserTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->metadata = new ClassMetadata(self::TEST_CLASS);
- $this->metadataFactory = $this->getMock('Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface');
+ $this->metadataFactory = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface')->getMock();
$this->metadataFactory->expects($this->any())
->method('getMetadataFor')
->with(self::TEST_CLASS)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
index 74da4aee..314a645d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -62,7 +62,7 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$this->mapper = new ViolationMapper();
$this->message = 'Message';
$this->messageTemplate = 'Message template';
@@ -95,7 +95,7 @@ class ViolationMapperTest extends \PHPUnit_Framework_TestCase
*/
private function getDataMapper()
{
- return $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php
index 86f50b50..d8e490a6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormBuilderTest.php
@@ -23,8 +23,8 @@ class FormBuilderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
$this->builder = new FormBuilder('name', null, $this->dispatcher, $this->factory);
}
@@ -120,7 +120,7 @@ class FormBuilderTest extends \PHPUnit_Framework_TestCase
public function testAddFormType()
{
$this->assertFalse($this->builder->has('foo'));
- $this->builder->add('foo', $this->getMock('Symfony\Component\Form\FormTypeInterface'));
+ $this->builder->add('foo', $this->getMockBuilder('Symfony\Component\Form\FormTypeInterface')->getMock());
$this->assertTrue($this->builder->has('foo'));
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php
index b77632c5..1bfaf4d0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormConfigTest.php
@@ -71,7 +71,7 @@ class FormConfigTest extends \PHPUnit_Framework_TestCase
*/
public function testNameAcceptsOnlyNamesValidAsIdsInHtml4($name, $accepted)
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
try {
new FormConfigBuilder($name, null, $dispatcher);
@@ -141,7 +141,7 @@ class FormConfigTest extends \PHPUnit_Framework_TestCase
private function getConfigBuilder($name = 'name')
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
return new FormConfigBuilder($name, null, $dispatcher);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
index 9d5cb472..8a26932c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryBuilderTest.php
@@ -26,7 +26,7 @@ class FormFactoryBuilderTest extends \PHPUnit_Framework_TestCase
$this->registry = $factory->getProperty('registry');
$this->registry->setAccessible(true);
- $this->guesser = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
+ $this->guesser = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
$this->type = new FooType();
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php
index 22e88842..27b5e202 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -54,11 +54,11 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->resolvedTypeFactory = $this->getMock('Symfony\Component\Form\ResolvedFormTypeFactoryInterface');
- $this->guesser1 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
- $this->guesser2 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
- $this->registry = $this->getMock('Symfony\Component\Form\FormRegistryInterface');
- $this->builder = $this->getMock('Symfony\Component\Form\Test\FormBuilderInterface');
+ $this->resolvedTypeFactory = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeFactoryInterface')->getMock();
+ $this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
+ $this->guesser2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
+ $this->registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
+ $this->builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->getMock();
$this->factory = new FormFactory($this->registry, $this->resolvedTypeFactory);
$this->registry->expects($this->any())
@@ -241,7 +241,7 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateBuilderForPropertyWithoutTypeGuesser()
{
- $registry = $this->getMock('Symfony\Component\Form\FormRegistryInterface');
+ $registry = $this->getMockBuilder('Symfony\Component\Form\FormRegistryInterface')->getMock();
$factory = $this->getMockBuilder('Symfony\Component\Form\FormFactory')
->setMethods(array('createNamedBuilder'))
->setConstructorArgs(array($registry, $this->resolvedTypeFactory))
@@ -480,6 +480,6 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
private function getMockResolvedType()
{
- return $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php
index cf3cfdc3..84600ef0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -58,9 +58,9 @@ class FormRegistryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->resolvedTypeFactory = $this->getMock('Symfony\Component\Form\ResolvedFormTypeFactory');
- $this->guesser1 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
- $this->guesser2 = $this->getMock('Symfony\Component\Form\FormTypeGuesserInterface');
+ $this->resolvedTypeFactory = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeFactory')->getMock();
+ $this->guesser1 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
+ $this->guesser2 = $this->getMockBuilder('Symfony\Component\Form\FormTypeGuesserInterface')->getMock();
$this->extension1 = new TestExtension($this->guesser1);
$this->extension2 = new TestExtension($this->guesser2);
$this->registry = new FormRegistry(array(
@@ -200,7 +200,7 @@ class FormRegistryTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedGuesser, $this->registry->getTypeGuesser());
$registry = new FormRegistry(
- array($this->getMock('Symfony\Component\Form\FormExtensionInterface')),
+ array($this->getMockBuilder('Symfony\Component\Form\FormExtensionInterface')->getMock()),
$this->resolvedTypeFactory
);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
index 15025e98..5ab148cf 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
@@ -69,9 +69,9 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
- $this->dataMapper = $this->getMock('Symfony\Component\Form\DataMapperInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
+ $this->dataMapper = $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
$this->parentType = $this->getMockFormType();
$this->type = $this->getMockFormType();
$this->extension1 = $this->getMockFormTypeExtension();
@@ -125,7 +125,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
{
$givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
$resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
- $optionsResolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolver');
+ $optionsResolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')->getMock();
$this->resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
->setConstructorArgs(array($this->type, array($this->extension1, $this->extension2), $this->parentResolvedType))
@@ -153,7 +153,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
{
$givenOptions = array('data_class' => 'Foo');
$resolvedOptions = array('data_class' => '\stdClass');
- $optionsResolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolver');
+ $optionsResolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')->getMock();
$this->resolvedType = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormType')
->setConstructorArgs(array($this->type, array($this->extension1, $this->extension2), $this->parentResolvedType))
@@ -190,7 +190,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
};
$options = array('a' => 'Foo', 'b' => 'Bar');
- $builder = $this->getMock('Symfony\Component\Form\Test\FormBuilderInterface');
+ $builder = $this->getMockBuilder('Symfony\Component\Form\Test\FormBuilderInterface')->getMock();
// First the form is built for the super type
$this->parentType->expects($this->once())
@@ -220,7 +220,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
public function testCreateView()
{
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
$view = $this->resolvedType->createView($form);
@@ -230,8 +230,8 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
public function testCreateViewWithParent()
{
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
- $parentView = $this->getMock('Symfony\Component\Form\FormView');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
+ $parentView = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$view = $this->resolvedType->createView($form, $parentView);
@@ -242,8 +242,8 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
public function testBuildView()
{
$options = array('a' => '1', 'b' => '2');
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
- $view = $this->getMock('Symfony\Component\Form\FormView');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
+ $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$i = 0;
@@ -284,8 +284,8 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
public function testFinishView()
{
$options = array('a' => '1', 'b' => '2');
- $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
- $view = $this->getMock('Symfony\Component\Form\FormView');
+ $form = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
+ $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$i = 0;
@@ -361,7 +361,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
*/
private function getMockFormType($typeClass = 'Symfony\Component\Form\AbstractType')
{
- return $this->getMock($typeClass, array('getBlockPrefix', 'configureOptions', 'finishView', 'buildView', 'buildForm'));
+ return $this->getMockBuilder($typeClass)->setMethods(array('getBlockPrefix', 'configureOptions', 'finishView', 'buildView', 'buildForm'))->getMock();
}
/**
@@ -369,7 +369,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
*/
private function getMockFormTypeExtension()
{
- return $this->getMock('Symfony\Component\Form\AbstractTypeExtension', array('getExtendedType', 'configureOptions', 'finishView', 'buildView', 'buildForm'));
+ return $this->getMockBuilder('Symfony\Component\Form\AbstractTypeExtension')->setMethods(array('getExtendedType', 'configureOptions', 'finishView', 'buildView', 'buildForm'))->getMock();
}
/**
@@ -377,7 +377,7 @@ class ResolvedFormTypeTest extends \PHPUnit_Framework_TestCase
*/
private function getMockFormFactory()
{
- return $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+ return $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index f41103fb..624365b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -688,8 +688,8 @@ class SimpleFormTest extends AbstractFormTest
public function testCreateView()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
- $view = $this->getMock('Symfony\Component\Form\FormView');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
+ $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$form = $this->getBuilder()->setType($type)->getForm();
$type->expects($this->once())
@@ -702,10 +702,10 @@ class SimpleFormTest extends AbstractFormTest
public function testCreateViewWithParent()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
- $view = $this->getMock('Symfony\Component\Form\FormView');
- $parentForm = $this->getMock('Symfony\Component\Form\Test\FormInterface');
- $parentView = $this->getMock('Symfony\Component\Form\FormView');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
+ $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
+ $parentForm = $this->getMockBuilder('Symfony\Component\Form\Test\FormInterface')->getMock();
+ $parentView = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$form = $this->getBuilder()->setType($type)->getForm();
$form->setParent($parentForm);
@@ -723,9 +723,9 @@ class SimpleFormTest extends AbstractFormTest
public function testCreateViewWithExplicitParent()
{
- $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
- $view = $this->getMock('Symfony\Component\Form\FormView');
- $parentView = $this->getMock('Symfony\Component\Form\FormView');
+ $type = $this->getMockBuilder('Symfony\Component\Form\ResolvedFormTypeInterface')->getMock();
+ $view = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
+ $parentView = $this->getMockBuilder('Symfony\Component\Form\FormView')->getMock();
$form = $this->getBuilder()->setType($type)->getForm();
$type->expects($this->once())
@@ -850,7 +850,7 @@ class SimpleFormTest extends AbstractFormTest
public function testViewDataMayBeArrayAccessIfDataClassIsNull()
{
- $arrayAccess = $this->getMock('\ArrayAccess');
+ $arrayAccess = $this->getMockBuilder('\ArrayAccess')->getMock();
$config = new FormConfigBuilder('name', null, $this->dispatcher);
$config->addViewTransformer(new FixedDataTransformer(array(
'' => '',
@@ -912,7 +912,7 @@ class SimpleFormTest extends AbstractFormTest
public function testHandleRequestForwardsToRequestHandler()
{
- $handler = $this->getMock('Symfony\Component\Form\RequestHandlerInterface');
+ $handler = $this->getMockBuilder('Symfony\Component\Form\RequestHandlerInterface')->getMock();
$form = $this->getBuilder()
->setRequestHandler($handler)
@@ -1023,7 +1023,7 @@ class SimpleFormTest extends AbstractFormTest
public function testInitializeSetsDefaultData()
{
$config = $this->getBuilder()->setData('DEFAULT')->getFormConfig();
- $form = $this->getMock('Symfony\Component\Form\Form', array('setData'), array($config));
+ $form = $this->getMockBuilder('Symfony\Component\Form\Form')->setMethods(array('setData'))->setConstructorArgs(array($config))->getMock();
$form->expects($this->once())
->method('setData')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php
index 22607876..2aa91dc4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -48,7 +48,7 @@ class AcceptHeader
*
* @param string $headerValue
*
- * @return AcceptHeader
+ * @return self
*/
public static function fromString($headerValue)
{
@@ -101,7 +101,7 @@ class AcceptHeader
*
* @param AcceptHeaderItem $item
*
- * @return AcceptHeader
+ * @return $this
*/
public function add(AcceptHeaderItem $item)
{
@@ -128,7 +128,7 @@ class AcceptHeader
*
* @param string $pattern
*
- * @return AcceptHeader
+ * @return self
*/
public function filter($pattern)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
index 21a5d155..fb54b493 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/AcceptHeaderItem.php
@@ -57,7 +57,7 @@ class AcceptHeaderItem
*
* @param string $itemValue
*
- * @return AcceptHeaderItem
+ * @return self
*/
public static function fromString($itemValue)
{
@@ -103,7 +103,7 @@ class AcceptHeaderItem
*
* @param string $value
*
- * @return AcceptHeaderItem
+ * @return $this
*/
public function setValue($value)
{
@@ -127,7 +127,7 @@ class AcceptHeaderItem
*
* @param float $quality
*
- * @return AcceptHeaderItem
+ * @return $this
*/
public function setQuality($quality)
{
@@ -151,7 +151,7 @@ class AcceptHeaderItem
*
* @param int $index
*
- * @return AcceptHeaderItem
+ * @return $this
*/
public function setIndex($index)
{
@@ -211,7 +211,7 @@ class AcceptHeaderItem
* @param string $name
* @param string $value
*
- * @return AcceptHeaderItem
+ * @return $this
*/
public function setAttribute($name, $value)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
index f95d90c3..825c78fe 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -66,7 +66,7 @@ class BinaryFileResponse extends Response
* @param bool $autoEtag Whether the ETag header should be automatically set
* @param bool $autoLastModified Whether the Last-Modified header should be automatically set
*
- * @return BinaryFileResponse The created response
+ * @return static
*/
public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
{
@@ -81,7 +81,7 @@ class BinaryFileResponse extends Response
* @param bool $autoEtag
* @param bool $autoLastModified
*
- * @return BinaryFileResponse
+ * @return $this
*
* @throws FileException
*/
@@ -153,7 +153,7 @@ class BinaryFileResponse extends Response
* @param string $filename Optionally use this filename instead of the real name of the file
* @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename
*
- * @return BinaryFileResponse
+ * @return $this
*/
public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
{
@@ -348,7 +348,7 @@ class BinaryFileResponse extends Response
*
* @param bool $shouldDelete
*
- * @return BinaryFileResponse
+ * @return $this
*/
public function deleteFileAfterSend($shouldDelete)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php
index e629e873..be13dab8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -63,7 +63,7 @@ class Cookie
} elseif (!is_numeric($expire)) {
$expire = strtotime($expire);
- if (false === $expire || -1 === $expire) {
+ if (false === $expire) {
throw new \InvalidArgumentException('The cookie expiration time is not valid.');
}
}
@@ -71,7 +71,7 @@ class Cookie
$this->name = $name;
$this->value = $value;
$this->domain = $domain;
- $this->expire = $expire;
+ $this->expire = 0 < $expire ? (int) $expire : 0;
$this->path = empty($path) ? '/' : $path;
$this->secure = (bool) $secure;
$this->httpOnly = (bool) $httpOnly;
@@ -91,20 +91,20 @@ class Cookie
*/
public function __toString()
{
- $str = urlencode($this->getName()).'=';
+ $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'=';
if ('' === (string) $this->getValue()) {
$str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001);
} else {
- $str .= urlencode($this->getValue());
+ $str .= $this->isRaw() ? $this->getValue() : urlencode($this->getValue());
- if ($this->getExpiresTime() !== 0) {
+ if (0 !== $this->getExpiresTime()) {
$str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());
}
}
- if ($this->path) {
- $str .= '; path='.$this->path;
+ if ($this->getPath()) {
+ $str .= '; path='.$this->getPath();
}
if ($this->getDomain()) {
@@ -139,7 +139,7 @@ class Cookie
/**
* Gets the value of the cookie.
*
- * @return string
+ * @return string|null
*/
public function getValue()
{
@@ -149,7 +149,7 @@ class Cookie
/**
* Gets the domain that the cookie is available to.
*
- * @return string
+ * @return string|null
*/
public function getDomain()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php
index 4736b45c..e2a67684 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/File.php
@@ -85,7 +85,7 @@ class File extends \SplFileInfo
* @param string $directory The destination folder
* @param string $name The new file name
*
- * @return File A File object representing the new file
+ * @return self A File object representing the new file
*
* @throws FileException if the target file could not be created
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
index ec9b78ab..921751f6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
@@ -42,7 +42,7 @@ class ExtensionGuesser implements ExtensionGuesserInterface
/**
* Returns the singleton instance.
*
- * @return ExtensionGuesser
+ * @return self
*/
public static function getInstance()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
index ecc8a30a..69c803b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
@@ -56,7 +56,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
/**
* Returns the singleton instance.
*
- * @return MimeTypeGuesser
+ * @return self
*/
public static function getInstance()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php
index b7f99704..cf1a11ea 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -62,7 +62,7 @@ class JsonResponse extends Response
* @param int $status The response status code
* @param array $headers An array of response headers
*
- * @return JsonResponse
+ * @return static
*/
public static function create($data = null, $status = 200, $headers = array())
{
@@ -82,7 +82,7 @@ class JsonResponse extends Response
*
* @param string|null $callback The JSONP callback or null to use none
*
- * @return JsonResponse
+ * @return $this
*
* @throws \InvalidArgumentException When the callback name is not valid
*/
@@ -117,7 +117,7 @@ class JsonResponse extends Response
*
* @param string $json
*
- * @return JsonResponse
+ * @return $this
*
* @throws \InvalidArgumentException
*/
@@ -133,7 +133,7 @@ class JsonResponse extends Response
*
* @param mixed $data
*
- * @return JsonResponse
+ * @return $this
*
* @throws \InvalidArgumentException
*/
@@ -180,7 +180,7 @@ class JsonResponse extends Response
*
* @param int $encodingOptions
*
- * @return JsonResponse
+ * @return $this
*/
public function setEncodingOptions($encodingOptions)
{
@@ -192,7 +192,7 @@ class JsonResponse extends Response
/**
* Updates the content and headers according to the JSON data and callback.
*
- * @return JsonResponse
+ * @return $this
*/
protected function update()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php
index 0e199a2b..7435999a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -70,7 +70,7 @@ class RedirectResponse extends Response
*
* @param string $url The URL to redirect to
*
- * @return RedirectResponse The current response
+ * @return $this
*
* @throws \InvalidArgumentException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php
index 4c383ec6..dc23d2ca 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Request.php
@@ -261,7 +261,7 @@ class Request
/**
* Creates a new request with values from PHP's super globals.
*
- * @return Request A new request
+ * @return static
*/
public static function createFromGlobals()
{
@@ -304,7 +304,7 @@ class Request
* @param array $server The server parameters ($_SERVER)
* @param string $content The raw body data
*
- * @return Request A Request instance
+ * @return static
*/
public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
{
@@ -422,7 +422,7 @@ class Request
* @param array $files The FILES parameters
* @param array $server The SERVER parameters
*
- * @return Request The duplicated request
+ * @return static
*/
public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
{
@@ -596,6 +596,7 @@ class Request
* * Request::HEADER_CLIENT_HOST: defaults to X-Forwarded-Host (see getHost())
* * Request::HEADER_CLIENT_PORT: defaults to X-Forwarded-Port (see getPort())
* * Request::HEADER_CLIENT_PROTO: defaults to X-Forwarded-Proto (see getScheme() and isSecure())
+ * * Request::HEADER_FORWARDED: defaults to Forwarded (see RFC 7239)
*
* Setting an empty value allows to disable the trusted header for the given key.
*
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
index 73f64f03..d1dd193f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Response.php
@@ -256,7 +256,7 @@ class Response
* @param int $status The response status code
* @param array $headers An array of response headers
*
- * @return Response
+ * @return static
*/
public static function create($content = '', $status = 200, $headers = array())
{
@@ -299,7 +299,7 @@ class Response
*
* @param Request $request A Request instance
*
- * @return Response The current response
+ * @return $this
*/
public function prepare(Request $request)
{
@@ -361,7 +361,7 @@ class Response
/**
* Sends HTTP headers.
*
- * @return Response
+ * @return $this
*/
public function sendHeaders()
{
@@ -399,7 +399,7 @@ class Response
/**
* Sends content for the current web response.
*
- * @return Response
+ * @return $this
*/
public function sendContent()
{
@@ -411,7 +411,7 @@ class Response
/**
* Sends HTTP headers and content.
*
- * @return Response
+ * @return $this
*/
public function send()
{
@@ -434,7 +434,7 @@ class Response
*
* @param mixed $content Content that can be cast to string
*
- * @return Response
+ * @return $this
*
* @throws \UnexpectedValueException
*/
@@ -464,7 +464,7 @@ class Response
*
* @param string $version The HTTP protocol version
*
- * @return Response
+ * @return $this
*/
public function setProtocolVersion($version)
{
@@ -492,7 +492,7 @@ class Response
* If the status text is null it will be automatically populated for the known
* status codes and left empty otherwise.
*
- * @return Response
+ * @return $this
*
* @throws \InvalidArgumentException When the HTTP status code is not valid
*/
@@ -535,7 +535,7 @@ class Response
*
* @param string $charset Character set
*
- * @return Response
+ * @return $this
*/
public function setCharset($charset)
{
@@ -608,7 +608,7 @@ class Response
*
* It makes the response ineligible for serving other clients.
*
- * @return Response
+ * @return $this
*/
public function setPrivate()
{
@@ -623,7 +623,7 @@ class Response
*
* It makes the response eligible for serving other clients.
*
- * @return Response
+ * @return $this
*/
public function setPublic()
{
@@ -669,7 +669,7 @@ class Response
*
* @param \DateTime $date A \DateTime instance
*
- * @return Response
+ * @return $this
*/
public function setDate(\DateTime $date)
{
@@ -696,7 +696,7 @@ class Response
/**
* Marks the response stale by setting the Age header to be equal to the maximum age of the response.
*
- * @return Response
+ * @return $this
*/
public function expire()
{
@@ -729,7 +729,7 @@ class Response
*
* @param \DateTime|null $date A \DateTime instance or null to remove the header
*
- * @return Response
+ * @return $this
*/
public function setExpires(\DateTime $date = null)
{
@@ -775,7 +775,7 @@ class Response
*
* @param int $value Number of seconds
*
- * @return Response
+ * @return $this
*/
public function setMaxAge($value)
{
@@ -791,7 +791,7 @@ class Response
*
* @param int $value Number of seconds
*
- * @return Response
+ * @return $this
*/
public function setSharedMaxAge($value)
{
@@ -825,7 +825,7 @@ class Response
*
* @param int $seconds Number of seconds
*
- * @return Response
+ * @return $this
*/
public function setTtl($seconds)
{
@@ -841,7 +841,7 @@ class Response
*
* @param int $seconds Number of seconds
*
- * @return Response
+ * @return $this
*/
public function setClientTtl($seconds)
{
@@ -869,7 +869,7 @@ class Response
*
* @param \DateTime|null $date A \DateTime instance or null to remove the header
*
- * @return Response
+ * @return $this
*/
public function setLastModified(\DateTime $date = null)
{
@@ -900,7 +900,7 @@ class Response
* @param string|null $etag The ETag unique identifier or null to remove the header
* @param bool $weak Whether you want a weak ETag or not
*
- * @return Response
+ * @return $this
*/
public function setEtag($etag = null, $weak = false)
{
@@ -924,7 +924,7 @@ class Response
*
* @param array $options An array of cache options
*
- * @return Response
+ * @return $this
*
* @throws \InvalidArgumentException
*/
@@ -975,7 +975,7 @@ class Response
* This sets the status, removes the body, and discards any headers
* that MUST NOT be included in 304 responses.
*
- * @return Response
+ * @return $this
*
* @see http://tools.ietf.org/html/rfc2616#section-10.3.5
*/
@@ -1027,7 +1027,7 @@ class Response
* @param string|array $headers
* @param bool $replace Whether to replace the actual value or not (true by default)
*
- * @return Response
+ * @return $this
*/
public function setVary($headers, $replace = true)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php
index b3feb031..92853130 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/StreamedResponse.php
@@ -55,7 +55,7 @@ class StreamedResponse extends Response
* @param int $status The response status code
* @param array $headers An array of response headers
*
- * @return StreamedResponse
+ * @return static
*/
public static function create($callback = null, $status = 200, $headers = array())
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
index 9134c157..f4263f5d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -52,7 +52,14 @@ class CookieTest extends \PHPUnit_Framework_TestCase
*/
public function testInvalidExpiration()
{
- $cookie = new Cookie('MyCookie', 'foo', 'bar');
+ new Cookie('MyCookie', 'foo', 'bar');
+ }
+
+ public function testNegativeExpirationIsNotPossible()
+ {
+ $cookie = new Cookie('foo', 'bar', -100);
+
+ $this->assertSame(0, $cookie->getExpiresTime());
}
public function testGetValue()
@@ -77,6 +84,13 @@ class CookieTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
}
+ public function testGetExpiresTimeIsCastToInt()
+ {
+ $cookie = new Cookie('foo', 'bar', 3600.9);
+
+ $this->assertSame(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date as an integer');
+ }
+
public function testConstructorWithDateTime()
{
$expire = new \DateTime();
@@ -143,21 +157,23 @@ class CookieTest extends \PHPUnit_Framework_TestCase
public function testToString()
{
$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
- $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
+ $this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() returns string representation of the cookie');
$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
- $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
+ $this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL');
$cookie = new Cookie('foo', 'bar', 0, '/', '');
- $this->assertEquals('foo=bar; path=/; httponly', $cookie->__toString());
+ $this->assertEquals('foo=bar; path=/; httponly', (string) $cookie);
}
public function testRawCookie()
{
- $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true);
+ $cookie = new Cookie('foo', 'b a r', 0, '/', null, false, false);
$this->assertFalse($cookie->isRaw());
+ $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
- $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com', false, true, true);
+ $cookie = new Cookie('foo', 'b+a+r', 0, '/', null, false, false, true);
$this->assertTrue($cookie->isRaw());
+ $this->assertEquals('foo=b+a+r; path=/', (string) $cookie);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
index a92f5728..129d99ee 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
@@ -166,7 +166,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
protected function createMockGuesser($path, $mimeType)
{
- $guesser = $this->getMock('Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface');
+ $guesser = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface')->getMock();
$guesser
->expects($this->once())
->method('guess')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
index 1101b6ac..12da3879 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -124,11 +124,11 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
$bag = new ResponseHeaderBag(array());
$bag->setCookie(new Cookie('foo', 'bar'));
- $this->assertContains('Set-Cookie: foo=bar; path=/; httponly', explode("\r\n", $bag->__toString()));
+ $this->assertSetCookieHeader('foo=bar; path=/; httponly', $bag);
$bag->clearCookie('foo');
- $this->assertRegExp('#^Set-Cookie: foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; httponly#m', $bag->__toString());
+ $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; httponly', $bag);
}
public function testClearCookieSecureNotHttpOnly()
@@ -137,7 +137,7 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
$bag->clearCookie('foo', '/', null, true, false);
- $this->assertRegExp('#^Set-Cookie: foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; secure#m', $bag->__toString());
+ $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; secure', $bag);
}
public function testReplace()
@@ -173,11 +173,10 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
$this->assertCount(4, $bag->getCookies());
- $headers = explode("\r\n", $bag->__toString());
- $this->assertContains('Set-Cookie: foo=bar; path=/path/foo; domain=foo.bar; httponly', $headers);
- $this->assertContains('Set-Cookie: foo=bar; path=/path/foo; domain=foo.bar; httponly', $headers);
- $this->assertContains('Set-Cookie: foo=bar; path=/path/bar; domain=bar.foo; httponly', $headers);
- $this->assertContains('Set-Cookie: foo=bar; path=/; httponly', $headers);
+ $this->assertSetCookieHeader('foo=bar; path=/path/foo; domain=foo.bar; httponly', $bag);
+ $this->assertSetCookieHeader('foo=bar; path=/path/bar; domain=foo.bar; httponly', $bag);
+ $this->assertSetCookieHeader('foo=bar; path=/path/bar; domain=bar.foo; httponly', $bag);
+ $this->assertSetCookieHeader('foo=bar; path=/; httponly', $bag);
$cookies = $bag->getCookies(ResponseHeaderBag::COOKIES_ARRAY);
$this->assertTrue(isset($cookies['foo.bar']['/path/foo']['foo']));
@@ -231,7 +230,7 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
{
$bag = new ResponseHeaderBag();
- $cookies = $bag->getCookies('invalid_argument');
+ $bag->getCookies('invalid_argument');
}
/**
@@ -302,4 +301,9 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
array('attachment', 'föö.html'),
);
}
+
+ private function assertSetCookieHeader($expected, ResponseHeaderBag $actual)
+ {
+ $this->assertRegExp('#^Set-Cookie:\s+'.preg_quote($expected, '#').'$#m', str_replace("\r\n", "\n", (string) $actual));
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index b2b1c480..1a832a1d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -442,7 +442,7 @@ class ResponseTest extends ResponseTestCase
public function testDefaultContentType()
{
- $headerMock = $this->getMock('Symfony\Component\HttpFoundation\ResponseHeaderBag', array('set'));
+ $headerMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->setMethods(array('set'))->getMock();
$headerMock->expects($this->at(0))
->method('set')
->with('Content-Type', 'text/html');
@@ -846,7 +846,7 @@ class ResponseTest extends ResponseTestCase
public function testNoDeprecationsAreTriggered()
{
new DefaultResponse();
- $this->getMock(Response::class);
+ $this->getMockBuilder(Response::class)->getMock();
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
index 6745a224..b321a927 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php
@@ -35,7 +35,7 @@ class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
}
parent::setUp();
- $this->memcache = $this->getMock('Memcache');
+ $this->memcache = $this->getMockBuilder('Memcache')->getMock();
$this->storage = new MemcacheSessionHandler(
$this->memcache,
array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
index bd023ed1..2ffd7c15 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -41,7 +41,7 @@ class MemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('Tests can only be run with memcached extension 2.1.0 or lower, or 3.0.0b1 or higher');
}
- $this->memcached = $this->getMock('Memcached');
+ $this->memcached = $this->getMockBuilder('Memcached')->getMock();
$this->storage = new MemcachedSessionHandler(
$this->memcached,
array('prefix' => self::PREFIX, 'expiretime' => self::TTL)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index 1f88d00d..cfc8aceb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -140,7 +140,7 @@ class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
}
$pdo = new MockPdo('pgsql');
- $pdo->prepareResult = $this->getMock('PDOStatement');
+ $pdo->prepareResult = $this->getMockBuilder('PDOStatement')->getMock();
$content = 'foobar';
$stream = $this->createStream($content);
@@ -161,8 +161,8 @@ class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
}
$pdo = new MockPdo('pgsql');
- $selectStmt = $this->getMock('PDOStatement');
- $insertStmt = $this->getMock('PDOStatement');
+ $selectStmt = $this->getMockBuilder('PDOStatement')->getMock();
+ $insertStmt = $this->getMockBuilder('PDOStatement')->getMock();
$pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
index 069c8870..4fbf31aa 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php
@@ -20,7 +20,7 @@ class WriteCheckSessionHandlerTest extends \PHPUnit_Framework_TestCase
{
public function test()
{
- $wrappedSessionHandlerMock = $this->getMock('SessionHandlerInterface');
+ $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
$writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
$wrappedSessionHandlerMock
@@ -35,7 +35,7 @@ class WriteCheckSessionHandlerTest extends \PHPUnit_Framework_TestCase
public function testWrite()
{
- $wrappedSessionHandlerMock = $this->getMock('SessionHandlerInterface');
+ $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
$writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
$wrappedSessionHandlerMock
@@ -50,7 +50,7 @@ class WriteCheckSessionHandlerTest extends \PHPUnit_Framework_TestCase
public function testSkippedWrite()
{
- $wrappedSessionHandlerMock = $this->getMock('SessionHandlerInterface');
+ $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
$writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
$wrappedSessionHandlerMock
@@ -71,7 +71,7 @@ class WriteCheckSessionHandlerTest extends \PHPUnit_Framework_TestCase
public function testNonSkippedWrite()
{
- $wrappedSessionHandlerMock = $this->getMock('SessionHandlerInterface');
+ $wrappedSessionHandlerMock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
$writeCheckSessionHandler = new WriteCheckSessionHandler($wrappedSessionHandlerMock);
$wrappedSessionHandlerMock
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index bc810a6b..8ed38c90 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -35,7 +35,7 @@ class SessionHandlerProxyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->mock = $this->getMock('SessionHandlerInterface');
+ $this->mock = $this->getMockBuilder('SessionHandlerInterface')->getMock();
$this->proxy = new SessionHandlerProxy($this->mock);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
index 68e1157e..8505bbbd 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -223,6 +223,8 @@ abstract class Bundle implements BundleInterface
{
$pos = strrpos(static::class, '\\');
$this->namespace = false === $pos ? '' : substr(static::class, 0, $pos);
- $this->name = false === $pos ? static::class : substr(static::class, $pos + 1);
+ if (null === $this->name) {
+ $this->name = false === $pos ? static::class : substr(static::class, $pos + 1);
+ }
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
index e1ab2cc4..b638ba79 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -290,7 +290,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
{
$html = '';
- $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
+ $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
$dumper->setDumpHeader('');
$dumper->setDumpBoundaries('', '');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
index 0f2dc9b6..e29cc9da 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -40,12 +40,8 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
public function collect(Request $request, Response $response, \Exception $exception = null)
{
$responseHeaders = $response->headers->all();
- $cookies = array();
foreach ($response->headers->getCookies() as $cookie) {
- $cookies[] = $this->getCookieHeader($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());
- }
- if (count($cookies) > 0) {
- $responseHeaders['Set-Cookie'] = $cookies;
+ $responseHeaders['set-cookie'][] = (string) $cookie;
}
// attributes are serialized and as they can be anything, they need to be converted to strings.
@@ -403,41 +399,4 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
return is_string($controller) ? $controller : 'n/a';
}
-
- private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly)
- {
- $cookie = sprintf('%s=%s', $name, urlencode($value));
-
- if (0 !== $expires) {
- if (is_numeric($expires)) {
- $expires = (int) $expires;
- } elseif ($expires instanceof \DateTime) {
- $expires = $expires->getTimestamp();
- } else {
- $tmp = strtotime($expires);
- if (false === $tmp || -1 == $tmp) {
- throw new \InvalidArgumentException(sprintf('The "expires" cookie parameter is not valid (%s).', $expires));
- }
- $expires = $tmp;
- }
-
- $cookie .= '; expires='.str_replace('+0000', '', \DateTime::createFromFormat('U', $expires, new \DateTimeZone('GMT'))->format('D, d-M-Y H:i:s T'));
- }
-
- if ($domain) {
- $cookie .= '; domain='.$domain;
- }
-
- $cookie .= '; path='.$path;
-
- if ($secure) {
- $cookie .= '; secure';
- }
-
- if ($httponly) {
- $cookie .= '; httponly';
- }
-
- return $cookie;
- }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
index 14a5d435..280844c1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
@@ -52,6 +52,6 @@ class AddRequestFormatsListener implements EventSubscriberInterface
*/
public static function getSubscribedEvents()
{
- return array(KernelEvents::REQUEST => 'onKernelRequest');
+ return array(KernelEvents::REQUEST => array('onKernelRequest', 1));
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
index ef2b17ff..29e1725a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -137,7 +137,7 @@ class DebugHandlersListener implements EventSubscriberInterface
{
$events = array(KernelEvents::REQUEST => array('configure', 2048));
- if ('cli' === php_sapi_name() && defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
+ if ('cli' === PHP_SAPI && defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
$events[ConsoleEvents::COMMAND] = array('configure', 2048);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php
index 6581a10d..6bc132aa 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,11 +58,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '3.2.1';
- const VERSION_ID = 30201;
+ const VERSION = '3.2.3';
+ const VERSION_ID = 30203;
const MAJOR_VERSION = 3;
const MINOR_VERSION = 2;
- const RELEASE_VERSION = 1;
+ const RELEASE_VERSION = 3;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '07/2017';
@@ -505,8 +505,15 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected function getKernelParameters()
{
$bundles = array();
+ $bundlesMetadata = array();
+
foreach ($this->bundles as $name => $bundle) {
$bundles[$name] = get_class($bundle);
+ $bundlesMetadata[$name] = array(
+ 'parent' => $bundle->getParent(),
+ 'path' => $bundle->getPath(),
+ 'namespace' => $bundle->getNamespace(),
+ );
}
return array_merge(
@@ -518,6 +525,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
'kernel.bundles' => $bundles,
+ 'kernel.bundles_metadata' => $bundlesMetadata,
'kernel.charset' => $this->getCharset(),
'kernel.container_class' => $this->getContainerClass(),
),
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php
index 1ea045a4..18070d06 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Profiler/Profile.php
@@ -76,7 +76,7 @@ class Profile
/**
* Sets the parent token.
*
- * @param Profile $parent The parent Profile
+ * @param Profile $parent
*/
public function setParent(Profile $parent)
{
@@ -86,7 +86,7 @@ class Profile
/**
* Returns the parent profile.
*
- * @return Profile The parent profile
+ * @return self
*/
public function getParent()
{
@@ -191,7 +191,7 @@ class Profile
/**
* Finds children profilers.
*
- * @return Profile[] An array of Profile
+ * @return self[]
*/
public function getChildren()
{
@@ -201,7 +201,7 @@ class Profile
/**
* Sets children profiler.
*
- * @param Profile[] $children An array of Profile
+ * @param Profile[] $children
*/
public function setChildren(array $children)
{
@@ -214,7 +214,7 @@ class Profile
/**
* Adds the child token.
*
- * @param Profile $child The child Profile
+ * @param Profile $child
*/
public function addChild(Profile $child)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
index ee0c3128..a8b91453 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionNotValidBundle\ExtensionNotValidBundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
@@ -32,7 +33,7 @@ class BundleTest extends \PHPUnit_Framework_TestCase
public function testRegisterCommands()
{
$cmd = new FooCommand();
- $app = $this->getMock('Symfony\Component\Console\Application');
+ $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
$app->expects($this->once())->method('add')->with($this->equalTo($cmd));
$bundle = new ExtensionPresentBundle();
@@ -56,9 +57,9 @@ class BundleTest extends \PHPUnit_Framework_TestCase
public function testHttpKernelRegisterCommandsIgnoresCommandsThatAreRegisteredAsServices()
{
$container = new ContainerBuilder();
- $container->register('console.command.Symfony_Component_HttpKernel_Tests_Fixtures_ExtensionPresentBundle_Command_FooCommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
+ $container->register('console.command.symfony_component_httpkernel_tests_fixtures_extensionpresentbundle_command_foocommand', 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand');
- $application = $this->getMock('Symfony\Component\Console\Application');
+ $application = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
// add() is never called when the found command classes are already registered as services
$application->expects($this->never())->method('add');
@@ -66,4 +67,33 @@ class BundleTest extends \PHPUnit_Framework_TestCase
$bundle->setContainer($container);
$bundle->registerCommands($application);
}
+
+ public function testBundleNameIsGuessedFromClass()
+ {
+ $bundle = new GuessedNameBundle();
+
+ $this->assertSame('Symfony\Component\HttpKernel\Tests\Bundle', $bundle->getNamespace());
+ $this->assertSame('GuessedNameBundle', $bundle->getName());
+ }
+
+ public function testBundleNameCanBeExplicitlyProvided()
+ {
+ $bundle = new NamedBundle();
+
+ $this->assertSame('ExplicitlyNamedBundle', $bundle->getName());
+ $this->assertSame('Symfony\Component\HttpKernel\Tests\Bundle', $bundle->getNamespace());
+ $this->assertSame('ExplicitlyNamedBundle', $bundle->getName());
+ }
+}
+
+class NamedBundle extends Bundle
+{
+ public function __construct()
+ {
+ $this->name = 'ExplicitlyNamedBundle';
+ }
+}
+
+class GuessedNameBundle extends Bundle
+{
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
index b54d169a..41af579b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/CacheClearer/ChainCacheClearerTest.php
@@ -52,6 +52,6 @@ class ChainCacheClearerTest extends \PHPUnit_Framework_TestCase
protected function getMockClearer()
{
- return $this->getMock('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface');
+ return $this->getMockBuilder('Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
index b5d2c9ce..f12e1e78 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
@@ -18,6 +18,9 @@ use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpKernel\Tests\Fixtures\TestClient;
+/**
+ * @group time-sensitive
+ */
class ClientTest extends \PHPUnit_Framework_TestCase
{
public function testDoRequest()
@@ -56,22 +59,38 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$m = $r->getMethod('filterResponse');
$m->setAccessible(true);
- $expected = array(
+ $expected31 = array(
'foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
'foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
);
+ $expected33 = array(
+ 'foo=bar; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly',
+ 'foo1=bar1; expires=Sun, 15-Feb-2009 20:00:00 GMT; max-age='.(strtotime('Sun, 15-Feb-2009 20:00:00 GMT') - time()).'; path=/foo; domain=http://example.com; secure; httponly',
+ );
$response = new Response();
$response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
$domResponse = $m->invoke($client, $response);
- $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
+ try {
+ $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+ } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+ $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+ }
$response = new Response();
$response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
$response->headers->setCookie(new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
$domResponse = $m->invoke($client, $response);
- $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
- $this->assertEquals($expected, $domResponse->getHeader('Set-Cookie', false));
+ try {
+ $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+ } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+ $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
+ }
+ try {
+ $this->assertEquals($expected31, $domResponse->getHeader('Set-Cookie', false));
+ } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+ $this->assertEquals($expected33, $domResponse->getHeader('Set-Cookie', false));
+ }
}
public function testFilterResponseSupportsStreamedResponses()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php
index be594862..b7babf2c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php
@@ -17,7 +17,7 @@ class FileLocatorTest extends \PHPUnit_Framework_TestCase
{
public function testLocate()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->atLeastOnce())
->method('locateResource')
@@ -35,7 +35,7 @@ class FileLocatorTest extends \PHPUnit_Framework_TestCase
public function testLocateWithGlobalResourcePath()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel
->expects($this->atLeastOnce())
->method('locateResource')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index d89ba605..3be354d7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -190,7 +190,7 @@ class ArgumentResolverTest extends \PHPUnit_Framework_TestCase
public function testGetArgumentWithoutArray()
{
$factory = new ArgumentMetadataFactory();
- $valueResolver = $this->getMock(ArgumentValueResolverInterface::class);
+ $valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
$resolver = new ArgumentResolver($factory, array($valueResolver));
$valueResolver->expects($this->any())->method('supports')->willReturn(true);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index 13b496de..afe9261a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -21,7 +21,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
{
public function testGetControllerWithoutControllerParameter()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->once())->method('warning')->with('Unable to look for the controller as the "_controller" parameter is missing.');
$resolver = $this->createControllerResolver($logger);
@@ -219,7 +219,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
public function testCreateControllerCanReturnAnyCallable()
{
- $mock = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolver', array('createController'));
+ $mock = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolver')->setMethods(array('createController'))->getMock();
$mock->expects($this->once())->method('createController')->will($this->returnValue('Symfony\Component\HttpKernel\Tests\Controller\some_controller_function'));
$request = Request::create('/');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
index f331dbb3..843cfc7b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -24,7 +24,7 @@ class LoggerDataCollectorTest extends \PHPUnit_Framework_TestCase
*/
public function testCollect($nb, $logs, $expectedLogs, $expectedDeprecationCount, $expectedScreamCount, $expectedPriorities = null)
{
- $logger = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');
+ $logger = $this->getMockBuilder('Symfony\Component\HttpKernel\Log\DebugLoggerInterface')->getMock();
$logger->expects($this->once())->method('countErrors')->will($this->returnValue($nb));
$logger->expects($this->exactly(2))->method('getLogs')->will($this->returnValue($logs));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
index a8b4e1ce..0a833acb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -71,7 +71,7 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
public function testKernelResponseDoesNotStartSession()
{
- $kernel = $this->getMock(HttpKernelInterface::class);
+ $kernel = $this->getMockBuilder(HttpKernelInterface::class)->getMock();
$request = new Request();
$session = new Session(new MockArraySessionStorage());
$request->setSession($session);
@@ -247,8 +247,8 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
*/
protected function injectController($collector, $controller, $request)
{
- $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
- $httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMock(ArgumentResolverInterface::class));
+ $resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
+ $httpKernel = new HttpKernel(new EventDispatcher(), $resolver, null, $this->getMockBuilder(ArgumentResolverInterface::class)->getMock());
$event = new FilterControllerEvent($httpKernel, $controller, $request, HttpKernelInterface::MASTER_REQUEST);
$collector->onKernelController($event);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
index 0bdcccd5..a07e924d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
@@ -41,7 +41,7 @@ class TimeDataCollectorTest extends \PHPUnit_Framework_TestCase
$c->collect($request, new Response());
$this->assertEquals(0, $c->getStartTime());
- $kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
$kernel->expects($this->once())->method('getStartTime')->will($this->returnValue(123456));
$c = new TimeDataCollector($kernel);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
index d90e9dc1..51c7d5ea 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
@@ -110,9 +110,9 @@ class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
protected function getHttpKernel($dispatcher, $controller)
{
- $controllerResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface');
+ $controllerResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ControllerResolverInterface')->getMock();
$controllerResolver->expects($this->once())->method('getController')->will($this->returnValue($controller));
- $argumentResolver = $this->getMock('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface');
+ $argumentResolver = $this->getMockBuilder('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface')->getMock();
$argumentResolver->expects($this->once())->method('getArguments')->will($this->returnValue(array()));
return new HttpKernel($dispatcher, $controllerResolver, new RequestStack(), $argumentResolver);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
index 98266e94..85dad766 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -30,12 +30,9 @@ class FragmentRendererPassTest extends \PHPUnit_Framework_TestCase
'my_content_renderer' => array(array('alias' => 'foo')),
);
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
- $builder = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
@@ -59,14 +56,14 @@ class FragmentRendererPassTest extends \PHPUnit_Framework_TestCase
'my_content_renderer' => array(array('alias' => 'foo')),
);
- $renderer = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $renderer = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
$renderer
->expects($this->once())
->method('addMethodCall')
->with('addRendererService', array('foo', 'my_content_renderer'))
;
- $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
+ $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
$definition->expects($this->atLeastOnce())
->method('getClass')
->will($this->returnValue('Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService'));
@@ -76,10 +73,7 @@ class FragmentRendererPassTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(true))
;
- $builder = $this->getMock(
- 'Symfony\Component\DependencyInjection\ContainerBuilder',
- array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
- );
+ $builder = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
$builder->expects($this->any())
->method('hasDefinition')
->will($this->returnValue(true));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
index 34bd87a9..12fbf23f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/LazyLoadingFragmentHandlerTest.php
@@ -19,14 +19,14 @@ class LazyLoadingFragmentHandlerTest extends \PHPUnit_Framework_TestCase
{
public function test()
{
- $renderer = $this->getMock('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface');
+ $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
$renderer->expects($this->once())->method('getName')->will($this->returnValue('foo'));
$renderer->expects($this->any())->method('render')->will($this->returnValue(new Response()));
- $requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStack->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
- $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
$container->expects($this->once())->method('get')->will($this->returnValue($renderer));
$handler = new LazyLoadingFragmentHandler($container, $requestStack, false);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
index 895973d7..516813f0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php
@@ -17,18 +17,8 @@ class MergeExtensionConfigurationPassTest extends \PHPUnit_Framework_TestCase
{
public function testAutoloadMainExtension()
{
- $container = $this->getMock(
- 'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
- array(
- 'getExtensionConfig',
- 'loadFromExtension',
- 'getParameterBag',
- 'getDefinitions',
- 'getAliases',
- 'getExtensions',
- )
- );
- $params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
+ $container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerBuilder')->setMethods(array('getExtensionConfig', 'loadFromExtension', 'getParameterBag', 'getDefinitions', 'getAliases', 'getExtensions'))->getMock();
+ $params = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag')->getMock();
$container->expects($this->at(0))
->method('getExtensionConfig')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
index 3a82ce0f..c5b2c51e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/AddRequestFormatsListenerTest.php
@@ -45,7 +45,7 @@ class AddRequestFormatsListenerTest extends \PHPUnit_Framework_TestCase
public function testRegisteredEvent()
{
$this->assertEquals(
- array(KernelEvents::REQUEST => 'onKernelRequest'),
+ array(KernelEvents::REQUEST => array('onKernelRequest', 1)),
AddRequestFormatsListener::getSubscribedEvents()
);
}
@@ -64,7 +64,7 @@ class AddRequestFormatsListenerTest extends \PHPUnit_Framework_TestCase
protected function getRequestMock()
{
- return $this->getMock('Symfony\Component\HttpFoundation\Request');
+ return $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
}
protected function getGetResponseEventMock(Request $request)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
index 8e1c35b3..2aa284cc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -36,7 +36,7 @@ class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
{
public function testConfigure()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$userHandler = function () {};
$listener = new DebugHandlersListener($userHandler, $logger);
$xHandler = new ExceptionHandler();
@@ -70,7 +70,7 @@ class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
$listener = new DebugHandlersListener(null);
$eHandler = new ErrorHandler();
$event = new KernelEvent(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
Request::create('/'),
HttpKernelInterface::MASTER_REQUEST
);
@@ -94,7 +94,7 @@ class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
{
$dispatcher = new EventDispatcher();
$listener = new DebugHandlersListener(null);
- $app = $this->getMock('Symfony\Component\Console\Application');
+ $app = $this->getMockBuilder('Symfony\Component\Console\Application')->getMock();
$app->expects($this->once())->method('getHelperSet')->will($this->returnValue(new HelperSet()));
$command = new Command(__FUNCTION__);
$command->setApplication($app);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
index 947af112..94c2557f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
@@ -105,9 +105,9 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
public function testSubRequestFormat()
{
- $listener = new ExceptionListener('foo', $this->getMock('Psr\Log\LoggerInterface'));
+ $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock());
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
return new Response($request->getRequestFormat());
}));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
index 7cfce98f..b1d7d82c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
@@ -116,6 +116,6 @@ class FragmentListenerTest extends \PHPUnit_Framework_TestCase
private function createGetResponseEvent(Request $request, $requestType = HttpKernelInterface::MASTER_REQUEST)
{
- return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, $requestType);
+ return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, $requestType);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index a23268ca..46444e66 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -22,7 +22,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
+ $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
}
public function testDefaultLocaleWithoutSession()
@@ -51,10 +51,10 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
public function testLocaleSetForRoutingContext()
{
// the request context is updated
- $context = $this->getMock('Symfony\Component\Routing\RequestContext');
+ $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
$context->expects($this->once())->method('setParameter')->with('_locale', 'es');
- $router = $this->getMock('Symfony\Component\Routing\Router', array('getContext'), array(), '', false);
+ $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
$router->expects($this->once())->method('getContext')->will($this->returnValue($context));
$request = Request::create('/');
@@ -67,10 +67,10 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
public function testRouterResetWithParentRequestOnKernelFinishRequest()
{
// the request context is updated
- $context = $this->getMock('Symfony\Component\Routing\RequestContext');
+ $context = $this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock();
$context->expects($this->once())->method('setParameter')->with('_locale', 'es');
- $router = $this->getMock('Symfony\Component\Routing\Router', array('getContext'), array(), '', false);
+ $router = $this->getMockBuilder('Symfony\Component\Routing\Router')->setMethods(array('getContext'))->disableOriginalConstructor()->getMock();
$router->expects($this->once())->method('getContext')->will($this->returnValue($context));
$parentRequest = Request::create('/');
@@ -78,7 +78,7 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
$this->requestStack->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\FinishRequestEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FinishRequestEvent')->disableOriginalConstructor()->getMock();
$listener = new LocaleListener($this->requestStack, 'fr', $router);
$listener->onKernelFinishRequest($event);
@@ -97,6 +97,6 @@ class LocaleListenerTest extends \PHPUnit_Framework_TestCase
private function getEvent(Request $request)
{
- return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);
+ return new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
index d452ceb1..2f25c9b5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php
@@ -38,7 +38,7 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase
->method('collect')
->will($this->returnValue($profile));
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$masterRequest = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
->disableOriginalConstructor()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
index 821688ef..e23c2cd1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ResponseListenerTest.php
@@ -31,7 +31,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase
$listener = new ResponseListener('UTF-8');
$this->dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'onKernelResponse'));
- $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $this->kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
}
protected function tearDown()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index 0b772e5d..645d69d0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -23,7 +23,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array(), array(), '', false);
+ $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
}
/**
@@ -67,7 +67,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
*/
private function createGetResponseEventForUri($uri)
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create($uri);
$request->attributes->set('_controller', null); // Prevents going in to routing process
@@ -84,11 +84,11 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
public function testRequestMatcher()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://localhost/');
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
- $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$requestMatcher->expects($this->once())
->method('matchRequest')
->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
@@ -100,11 +100,11 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
public function testSubRequestWithDifferentMethod()
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://localhost/', 'post');
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
- $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$requestMatcher->expects($this->any())
->method('matchRequest')
->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Request'))
@@ -116,7 +116,7 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
$listener->onKernelRequest($event);
// sub-request with another HTTP method
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://localhost/', 'get');
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST);
@@ -130,17 +130,17 @@ class RouterListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testLoggingParameter($parameter, $log, $parameters)
{
- $requestMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$requestMatcher->expects($this->once())
->method('matchRequest')
->will($this->returnValue($parameter));
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->once())
->method('info')
->with($this->equalTo($log), $this->equalTo($parameters));
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://localhost/');
$listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext(), $logger);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
index 1a0acf92..0100131f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/SurrogateListenerTest.php
@@ -25,7 +25,7 @@ class SurrogateListenerTest extends \PHPUnit_Framework_TestCase
public function testFilterDoesNothingForSubRequests()
{
$dispatcher = new EventDispatcher();
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$response = new Response('foo <esi:include src="" />');
$listener = new SurrogateListener(new Esi());
@@ -39,7 +39,7 @@ class SurrogateListenerTest extends \PHPUnit_Framework_TestCase
public function testFilterWhenThereIsSomeEsiIncludes()
{
$dispatcher = new EventDispatcher();
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$response = new Response('foo <esi:include src="" />');
$listener = new SurrogateListener(new Esi());
@@ -53,7 +53,7 @@ class SurrogateListenerTest extends \PHPUnit_Framework_TestCase
public function testFilterWhenThereIsNoEsiIncludes()
{
$dispatcher = new EventDispatcher();
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$response = new Response('foo');
$listener = new SurrogateListener(new Esi());
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
index cbaaf5f9..34f561d1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
@@ -82,7 +82,7 @@ class TestSessionListenerTest extends \PHPUnit_Framework_TestCase
{
$request->setSession($this->session);
$response = new Response();
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$event = new FilterResponseEvent($kernel, $request, $type, $response);
$this->listener->onKernelResponse($event);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
index c37d6478..b5b05bb4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/TranslatorListenerTest.php
@@ -25,8 +25,8 @@ class TranslatorListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
- $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+ $this->translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock();
+ $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$this->listener = new TranslatorListener($this->translator, $this->requestStack);
}
@@ -96,7 +96,7 @@ class TranslatorListenerTest extends \PHPUnit_Framework_TestCase
private function createHttpKernel()
{
- return $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ return $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
}
private function createRequest($locale)
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
index b9d8f06f..7fcbc3b7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -26,7 +26,7 @@ class ValidateRequestListenerTest extends \PHPUnit_Framework_TestCase
public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
{
$dispatcher = new EventDispatcher();
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = new Request();
$request->setTrustedProxies(array('1.1.1.1'));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php
index 1a603c2c..e8e0b603 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/BasicTypesController.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
class BasicTypesController
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php
index e90e87c7..9b4754b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/ExtendingRequest.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
use Symfony\Component\HttpFoundation\Request;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php
index a540f9d1..c3981245 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fixtures/Controller/VariadicController.php
@@ -1,5 +1,14 @@
<?php
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
class VariadicController
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index 79fee3fc..230c15ed 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -74,7 +74,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
protected function getHandler($returnValue, $arguments = array())
{
- $renderer = $this->getMock('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface');
+ $renderer = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface')->getMock();
$renderer
->expects($this->any())
->method('getName')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
index 2f266dba..9a9373c6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -75,7 +75,7 @@ class HIncludeFragmentRendererTest extends \PHPUnit_Framework_TestCase
public function testRenderWithDefaultText()
{
- $engine = $this->getMock('Symfony\\Component\\Templating\\EngineInterface');
+ $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
$engine->expects($this->once())
->method('exists')
->with('default')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index b3ebe79c..adefd1fb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -57,7 +57,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
*/
public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheControllerLegacy()
{
- $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver', array('getController'));
+ $resolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver')->setMethods(array('getController'))->getMock();
$resolver
->expects($this->once())
->method('getController')
@@ -78,7 +78,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
*/
public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheController()
{
- $resolver = $this->getMock(ControllerResolverInterface::class);
+ $resolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
$resolver
->expects($this->once())
->method('getController')
@@ -111,7 +111,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
*/
public function testRenderExceptionNoIgnoreErrors()
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher->expects($this->never())->method('dispatch');
$strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
@@ -121,7 +121,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
public function testRenderExceptionIgnoreErrors()
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher->expects($this->once())->method('dispatch')->with(KernelEvents::EXCEPTION);
$strategy = new InlineFragmentRenderer($this->getKernel($this->throwException(new \RuntimeException('foo'))), $dispatcher);
@@ -141,7 +141,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
private function getKernel($returnValue)
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel
->expects($this->any())
->method('handle')
@@ -157,7 +157,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
*/
private function getKernelExpectingRequest(Request $request)
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel
->expects($this->any())
->method('handle')
@@ -169,7 +169,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
{
- $controllerResolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
+ $controllerResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface')->getMock();
$controllerResolver
->expects($this->once())
->method('getController')
@@ -180,7 +180,7 @@ class InlineFragmentRendererTest extends \PHPUnit_Framework_TestCase
}))
;
- $argumentResolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface');
+ $argumentResolver = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface')->getMock();
$argumentResolver
->expects($this->once())
->method('getArguments')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
index e41f7b5b..37d48500 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -225,7 +225,7 @@ class EsiTest extends \PHPUnit_Framework_TestCase
protected function getCache($request, $response)
{
- $cache = $this->getMock('Symfony\Component\HttpKernel\HttpCache\HttpCache', array('getRequest', 'handle'), array(), '', false);
+ $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(array('getRequest', 'handle'))->disableOriginalConstructor()->getMock();
$cache->expects($this->any())
->method('getRequest')
->will($this->returnValue($request))
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
index 74ef0965..039694ae 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -192,7 +192,7 @@ class SsiTest extends \PHPUnit_Framework_TestCase
protected function getCache($request, $response)
{
- $cache = $this->getMock('Symfony\Component\HttpKernel\HttpCache\HttpCache', array('getRequest', 'handle'), array(), '', false);
+ $cache = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpCache\HttpCache')->setMethods(array('getRequest', 'handle'))->disableOriginalConstructor()->getMock();
$cache->expects($this->any())
->method('getRequest')
->will($this->returnValue($request))
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
index ee3d9993..92f28027 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -292,7 +292,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
{
$request = new Request();
- $stack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack', array('push', 'pop'));
+ $stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(array('push', 'pop'))->getMock();
$stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
$stack->expects($this->at(1))->method('pop');
@@ -328,13 +328,13 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
$controller = function () { return new Response('Hello'); };
}
- $controllerResolver = $this->getMock(ControllerResolverInterface::class);
+ $controllerResolver = $this->getMockBuilder(ControllerResolverInterface::class)->getMock();
$controllerResolver
->expects($this->any())
->method('getController')
->will($this->returnValue($controller));
- $argumentResolver = $this->getMock(ArgumentResolverInterface::class);
+ $argumentResolver = $this->getMockBuilder(ArgumentResolverInterface::class)->getMock();
$argumentResolver
->expects($this->any())
->method('getArguments')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 2eacb8ae..dad52adc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -64,7 +64,7 @@ class KernelTest extends \PHPUnit_Framework_TestCase
public function testBootSetsTheContainerToTheBundles()
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
$bundle->expects($this->once())
->method('setContainer');
@@ -161,7 +161,7 @@ class KernelTest extends \PHPUnit_Framework_TestCase
public function testShutdownCallsShutdownOnAllBundles()
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
$bundle->expects($this->once())
->method('shutdown');
@@ -173,7 +173,7 @@ class KernelTest extends \PHPUnit_Framework_TestCase
public function testShutdownGivesNullContainerToAllBundles()
{
- $bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\Bundle');
+ $bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
$bundle->expects($this->at(3))
->method('setContainer')
->with(null);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE
index 7bca398c..ac30964e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Inflector/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2016 Fabien Potencier
+Copyright (c) 2012-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php
index 95f2ac23..c9c69a0f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Collator/Collator.php
@@ -88,7 +88,7 @@ class Collator
*
* @param string $locale The locale code. The only currently supported locale is "en" (or null using the default locale, i.e. "en")
*
- * @return Collator
+ * @return self
*
* @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
index 84b7f743..6b7cf5a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -42,9 +42,6 @@ abstract class AbstractDataGenerator
$this->dirName = $dirName;
}
- /**
- * {@inheritdoc}
- */
public function generateData(GeneratorConfig $config)
{
$filesystem = new Filesystem();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
index 5f4f9510..e89e5e87 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php
@@ -57,9 +57,6 @@ class LocaleDataGenerator
$this->regionDataProvider = $regionDataProvider;
}
- /**
- * {@inheritdoc}
- */
public function generateData(GeneratorConfig $config)
{
$filesystem = new Filesystem();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
index e6896385..51de3586 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -173,7 +173,7 @@ class IntlDateFormatter
* One of the calendar constants.
* @param string $pattern Optional pattern to use when formatting
*
- * @return IntlDateFormatter
+ * @return self
*
* @see http://www.php.net/manual/en/intldateformatter.create.php
* @see http://userguide.icu-project.org/formatparse/datetime
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
index 3938c04b..3ded2d07 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -304,7 +304,7 @@ class NumberFormatter
* NumberFormat::PATTERN_RULEBASED. It must conform to the syntax
* described in the ICU DecimalFormat or ICU RuleBasedNumberFormat documentation
*
- * @return NumberFormatter
+ * @return self
*
* @see http://www.php.net/manual/en/numberformatter.create.php
* @see http://www.icu-project.org/apiref/icu4c/classDecimalFormat.html#_details
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
index 90bdc483..9ddef240 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -62,7 +62,7 @@ class BundleEntryReaderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->readerImpl = $this->getMock('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface');
+ $this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();
$this->reader = new BundleEntryReader($this->readerImpl);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php
index 71fb4acd..c1e37a72 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/IntlTestHelper.php
@@ -41,7 +41,7 @@ class IntlTestHelper
// * the intl extension is loaded with version Intl::getIcuStubVersion()
// * the intl extension is not loaded
- if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '!=', 1)) {
+ if (($minimumIcuVersion || defined('HHVM_VERSION_ID')) && IcuVersion::compare(Intl::getIcuVersion(), $minimumIcuVersion, '<', 1)) {
$testCase->markTestSkipped('ICU version '.$minimumIcuVersion.' is required.');
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php b/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php
index 6e5d87b1..8b5e8f31 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Intl/Util/SvnRepository.php
@@ -42,7 +42,7 @@ class SvnRepository
* @param string $url The URL to download from
* @param string $targetDir The directory in which to store the repository
*
- * @return SvnRepository The directory where the data is stored
+ * @return static
*
* @throws RuntimeException If an error occurs during the download.
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
index b53e2e06..9538abfa 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/EntryManagerInterface.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Ldap\Adapter;
use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
/**
* Entry manager interface.
*
* @author Charles Sarrazin <charles@sarraz.in>
+ * @author Bob van de Vijver <bobvandevijver@hotmail.com>
*/
interface EntryManagerInterface
{
@@ -24,6 +27,9 @@ interface EntryManagerInterface
* Adds a new entry in the Ldap server.
*
* @param Entry $entry
+ *
+ * @throws NotBoundException
+ * @throws LdapException
*/
public function add(Entry $entry);
@@ -31,6 +37,9 @@ interface EntryManagerInterface
* Updates an entry from the Ldap server.
*
* @param Entry $entry
+ *
+ * @throws NotBoundException
+ * @throws LdapException
*/
public function update(Entry $entry);
@@ -38,6 +47,9 @@ interface EntryManagerInterface
* Removes an entry from the Ldap server.
*
* @param Entry $entry
+ *
+ * @throws NotBoundException
+ * @throws LdapException
*/
public function remove(Entry $entry);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
index 545d5d69..06dbc815 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php
@@ -50,7 +50,7 @@ class Adapter implements AdapterInterface
public function getEntryManager()
{
if (null === $this->entryManager) {
- $this->entryManager = new EntryManager($this->connection);
+ $this->entryManager = new EntryManager($this->getConnection());
}
return $this->entryManager;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
index 18043ccc..455602c5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -14,9 +14,11 @@ namespace Symfony\Component\Ldap\Adapter\ExtLdap;
use Symfony\Component\Ldap\Adapter\EntryManagerInterface;
use Symfony\Component\Ldap\Entry;
use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
/**
* @author Charles Sarrazin <charles@sarraz.in>
+ * @author Bob van de Vijver <bobvandevijver@hotmail.com>
*/
class EntryManager implements EntryManagerInterface
{
@@ -32,7 +34,7 @@ class EntryManager implements EntryManagerInterface
*/
public function add(Entry $entry)
{
- $con = $this->connection->getResource();
+ $con = $this->getConnectionResource();
if (!@ldap_add($con, $entry->getDn(), $entry->getAttributes())) {
throw new LdapException(sprintf('Could not add entry "%s": %s', $entry->getDn(), ldap_error($con)));
@@ -46,7 +48,7 @@ class EntryManager implements EntryManagerInterface
*/
public function update(Entry $entry)
{
- $con = $this->connection->getResource();
+ $con = $this->getConnectionResource();
if (!@ldap_modify($con, $entry->getDn(), $entry->getAttributes())) {
throw new LdapException(sprintf('Could not update entry "%s": %s', $entry->getDn(), ldap_error($con)));
@@ -58,10 +60,23 @@ class EntryManager implements EntryManagerInterface
*/
public function remove(Entry $entry)
{
- $con = $this->connection->getResource();
+ $con = $this->getConnectionResource();
if (!@ldap_delete($con, $entry->getDn())) {
throw new LdapException(sprintf('Could not remove entry "%s": %s', $entry->getDn(), ldap_error($con)));
}
}
+
+ /**
+ * Get the connection resource, but first check if the connection is bound.
+ */
+ private function getConnectionResource()
+ {
+ // If the connection is not bound, throw an exception. Users should use an explicit bind call first.
+ if (!$this->connection->isBound()) {
+ throw new NotBoundException('Query execution is not possible without binding the connection first.');
+ }
+
+ return $this->connection->getResource();
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
index 0e8eae7d..a2686305 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -13,13 +13,15 @@ namespace Symfony\Component\Ldap\Adapter\ExtLdap;
use Symfony\Component\Ldap\Adapter\AbstractQuery;
use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
/**
* @author Charles Sarrazin <charles@sarraz.in>
+ * @author Bob van de Vijver <bobvandevijver@hotmail.com>
*/
class Query extends AbstractQuery
{
- /** @var Connection */
+ /** @var Connection */
protected $connection;
/** @var resource */
@@ -53,9 +55,9 @@ class Query extends AbstractQuery
public function execute()
{
if (null === $this->search) {
- // If the connection is not bound, then we try an anonymous bind.
+ // If the connection is not bound, throw an exception. Users should use an explicit bind call first.
if (!$this->connection->isBound()) {
- $this->connection->bind();
+ throw new NotBoundException('Query execution is not possible without binding the connection first.');
}
$con = $this->connection->getResource();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php
index ba26de79..c4cd4329 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Adapter/QueryInterface.php
@@ -12,9 +12,12 @@
namespace Symfony\Component\Ldap\Adapter;
use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
/**
* @author Charles Sarrazin <charles@sarraz.in>
+ * @author Bob van de Vijver <bobvandevijver@hotmail.com>
*/
interface QueryInterface
{
@@ -27,6 +30,9 @@ interface QueryInterface
* Executes a query and returns the list of Ldap entries.
*
* @return CollectionInterface|Entry[]
+ *
+ * @throws NotBoundException
+ * @throws LdapException
*/
public function execute();
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
index f25d1818..a1a80231 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Ldap\Tests;
use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
use Symfony\Component\Ldap\Entry;
+use Symfony\Component\Ldap\Exception\NotBoundException;
use Symfony\Component\Ldap\LdapInterface;
/**
@@ -65,4 +66,15 @@ class AdapterTest extends LdapTestCase
$this->assertEquals(array('Fabien Potencier'), $entry->getAttribute('cn'));
$this->assertEquals(array('fabpot@symfony.com', 'fabien@potencier.com'), $entry->getAttribute('mail'));
}
+
+ /**
+ * @group functional
+ */
+ public function testLdapQueryWithoutBind()
+ {
+ $ldap = new Adapter($this->getLdapConfig());
+ $this->setExpectedException(NotBoundException::class);
+ $query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', array());
+ $query->execute();
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
index fa9c7ba1..846d6a31 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -15,6 +15,7 @@ use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter;
use Symfony\Component\Ldap\Adapter\ExtLdap\Collection;
use Symfony\Component\Ldap\Entry;
use Symfony\Component\Ldap\Exception\LdapException;
+use Symfony\Component\Ldap\Exception\NotBoundException;
/**
* @requires extension ldap
@@ -98,6 +99,39 @@ class LdapManagerTest extends LdapTestCase
$this->assertNull($entry->getAttribute('email'));
}
+ /**
+ * @group functional
+ */
+ public function testLdapUnboundAdd()
+ {
+ $this->adapter = new Adapter($this->getLdapConfig());
+ $this->setExpectedException(NotBoundException::class);
+ $em = $this->adapter->getEntryManager();
+ $em->add(new Entry(''));
+ }
+
+ /**
+ * @group functional
+ */
+ public function testLdapUnboundRemove()
+ {
+ $this->adapter = new Adapter($this->getLdapConfig());
+ $this->setExpectedException(NotBoundException::class);
+ $em = $this->adapter->getEntryManager();
+ $em->remove(new Entry(''));
+ }
+
+ /**
+ * @group functional
+ */
+ public function testLdapUnboundUpdate()
+ {
+ $this->adapter = new Adapter($this->getLdapConfig());
+ $this->setExpectedException(NotBoundException::class);
+ $em = $this->adapter->getEntryManager();
+ $em->update(new Entry(''));
+ }
+
/**
* @return Collection|Entry[]
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php
index 30c5adfd..176c8f16 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapClientTest.php
@@ -29,7 +29,7 @@ class LdapClientTest extends LdapTestCase
protected function setUp()
{
- $this->ldap = $this->getMock(LdapInterface::class);
+ $this->ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$this->client = new LdapClient(null, 389, 3, false, false, false, $this->ldap);
}
@@ -66,7 +66,7 @@ class LdapClientTest extends LdapTestCase
public function testLdapFind()
{
- $collection = $this->getMock(CollectionInterface::class);
+ $collection = $this->getMockBuilder(CollectionInterface::class)->getMock();
$collection
->expects($this->once())
->method('getIterator')
@@ -83,7 +83,7 @@ class LdapClientTest extends LdapTestCase
)),
))))
;
- $query = $this->getMock(QueryInterface::class);
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php
index ddd294f3..94978a3a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Ldap/Tests/LdapTest.php
@@ -26,13 +26,13 @@ class LdapTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->adapter = $this->getMock(AdapterInterface::class);
+ $this->adapter = $this->getMockBuilder(AdapterInterface::class)->getMock();
$this->ldap = new Ldap($this->adapter);
}
public function testLdapBind()
{
- $connection = $this->getMock(ConnectionInterface::class);
+ $connection = $this->getMockBuilder(ConnectionInterface::class)->getMock();
$connection
->expects($this->once())
->method('bind')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index bcaea9e4..32ac5663 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -145,7 +145,7 @@ class OptionsResolver implements Options
* @param string $option The name of the option
* @param mixed $value The default value of the option
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
@@ -208,7 +208,7 @@ class OptionsResolver implements Options
*
* @param array $defaults The default values to set
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
@@ -241,7 +241,7 @@ class OptionsResolver implements Options
*
* @param string|string[] $optionNames One or more option names
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
@@ -322,7 +322,7 @@ class OptionsResolver implements Options
*
* @param string|string[] $optionNames One or more option names
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
@@ -389,7 +389,7 @@ class OptionsResolver implements Options
* @param string $option The option name
* @param \Closure $normalizer The normalizer
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws UndefinedOptionsException If the option is undefined
* @throws AccessException If called from a lazy option or normalizer
@@ -432,7 +432,7 @@ class OptionsResolver implements Options
* @param string $option The option name
* @param mixed $allowedValues One or more acceptable values/closures
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws UndefinedOptionsException If the option is undefined
* @throws AccessException If called from a lazy option or normalizer
@@ -477,7 +477,7 @@ class OptionsResolver implements Options
* @param string $option The option name
* @param mixed $allowedValues One or more acceptable values/closures
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws UndefinedOptionsException If the option is undefined
* @throws AccessException If called from a lazy option or normalizer
@@ -522,7 +522,7 @@ class OptionsResolver implements Options
* @param string $option The option name
* @param string|string[] $allowedTypes One or more accepted types
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws UndefinedOptionsException If the option is undefined
* @throws AccessException If called from a lazy option or normalizer
@@ -561,7 +561,7 @@ class OptionsResolver implements Options
* @param string $option The option name
* @param string|string[] $allowedTypes One or more accepted types
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws UndefinedOptionsException If the option is undefined
* @throws AccessException If called from a lazy option or normalizer
@@ -599,7 +599,7 @@ class OptionsResolver implements Options
*
* @param string|string[] $optionNames One or more option names
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
@@ -620,7 +620,7 @@ class OptionsResolver implements Options
/**
* Removes all options.
*
- * @return OptionsResolver This instance
+ * @return $this
*
* @throws AccessException If called from a lazy option or normalizer
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
index 6282f17b..ffe59f0c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Process.php
@@ -334,7 +334,7 @@ class Process implements \IteratorAggregate
* @param callable|null $callback A PHP callback to run whenever there is some
* output available on STDOUT or STDERR
*
- * @return Process The new process
+ * @return $this
*
* @throws RuntimeException When process can't be launched
* @throws RuntimeException When process is already running
@@ -414,7 +414,7 @@ class Process implements \IteratorAggregate
*
* @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
*
- * @return Process
+ * @return $this
*
* @throws LogicException In case the process is not running
* @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
@@ -430,7 +430,7 @@ class Process implements \IteratorAggregate
/**
* Disables fetching output and error output from the underlying process.
*
- * @return Process
+ * @return $this
*
* @throws RuntimeException In case the process is already running
* @throws LogicException if an idle timeout is set
@@ -452,7 +452,7 @@ class Process implements \IteratorAggregate
/**
* Enables fetching output and error output from the underlying process.
*
- * @return Process
+ * @return $this
*
* @throws RuntimeException In case the process is already running
*/
@@ -581,7 +581,7 @@ class Process implements \IteratorAggregate
/**
* Clears the process output.
*
- * @return Process
+ * @return $this
*/
public function clearOutput()
{
@@ -640,7 +640,7 @@ class Process implements \IteratorAggregate
/**
* Clears the process output.
*
- * @return Process
+ * @return $this
*/
public function clearErrorOutput()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php
index 0a43416d..cc91371f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessBuilder.php
@@ -46,7 +46,7 @@ class ProcessBuilder
*
* @param string[] $arguments An array of arguments
*
- * @return ProcessBuilder
+ * @return static
*/
public static function create(array $arguments = array())
{
@@ -58,7 +58,7 @@ class ProcessBuilder
*
* @param string $argument A command argument
*
- * @return ProcessBuilder
+ * @return $this
*/
public function add($argument)
{
@@ -74,7 +74,7 @@ class ProcessBuilder
*
* @param string|array $prefix A command prefix or an array of command prefixes
*
- * @return ProcessBuilder
+ * @return $this
*/
public function setPrefix($prefix)
{
@@ -91,7 +91,7 @@ class ProcessBuilder
*
* @param string[] $arguments
*
- * @return ProcessBuilder
+ * @return $this
*/
public function setArguments(array $arguments)
{
@@ -105,7 +105,7 @@ class ProcessBuilder
*
* @param null|string $cwd The working directory
*
- * @return ProcessBuilder
+ * @return $this
*/
public function setWorkingDirectory($cwd)
{
@@ -119,7 +119,7 @@ class ProcessBuilder
*
* @param bool $inheritEnv
*
- * @return ProcessBuilder
+ * @return $this
*/
public function inheritEnvironmentVariables($inheritEnv = true)
{
@@ -137,7 +137,7 @@ class ProcessBuilder
* @param string $name The variable name
* @param null|string $value The variable value
*
- * @return ProcessBuilder
+ * @return $this
*/
public function setEnv($name, $value)
{
@@ -155,7 +155,7 @@ class ProcessBuilder
*
* @param array $variables The variables
*
- * @return ProcessBuilder
+ * @return $this
*/
public function addEnvironmentVariables(array $variables)
{
@@ -169,7 +169,7 @@ class ProcessBuilder
*
* @param resource|scalar|\Traversable|null $input The input content
*
- * @return ProcessBuilder
+ * @return $this
*
* @throws InvalidArgumentException In case the argument is invalid
*/
@@ -187,7 +187,7 @@ class ProcessBuilder
*
* @param float|null $timeout
*
- * @return ProcessBuilder
+ * @return $this
*
* @throws InvalidArgumentException
*/
@@ -216,7 +216,7 @@ class ProcessBuilder
* @param string $name The option name
* @param string $value The option value
*
- * @return ProcessBuilder
+ * @return $this
*/
public function setOption($name, $value)
{
@@ -228,7 +228,7 @@ class ProcessBuilder
/**
* Disables fetching output and error output from the underlying process.
*
- * @return ProcessBuilder
+ * @return $this
*/
public function disableOutput()
{
@@ -240,7 +240,7 @@ class ProcessBuilder
/**
* Enables fetching output and error output from the underlying process.
*
- * @return ProcessBuilder
+ * @return $this
*/
public function enableOutput()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php b/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php
index 500202e5..cbc95708 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/ProcessUtils.php
@@ -71,7 +71,7 @@ class ProcessUtils
return $escapedArgument;
}
- return escapeshellarg($argument);
+ return "'".str_replace("'", "'\\''", $argument)."'";
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
index 963bbb30..e9720c75 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
@@ -23,11 +23,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
*/
public function testProcessFailedExceptionThrowsException()
{
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful'),
- array('php')
- );
+ $process = $this->getMockBuilder('Symfony\Component\Process\Process')->setMethods(array('isSuccessful'))->setConstructorArgs(array('php'))->getMock();
$process->expects($this->once())
->method('isSuccessful')
->will($this->returnValue(true));
@@ -53,11 +49,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
$errorOutput = 'FATAL: Unexpected error';
$workingDirectory = getcwd();
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful', 'getOutput', 'getErrorOutput', 'getExitCode', 'getExitCodeText', 'isOutputDisabled', 'getWorkingDirectory'),
- array($cmd)
- );
+ $process = $this->getMockBuilder('Symfony\Component\Process\Process')->setMethods(array('isSuccessful', 'getOutput', 'getErrorOutput', 'getExitCode', 'getExitCodeText', 'isOutputDisabled', 'getWorkingDirectory'))->setConstructorArgs(array($cmd))->getMock();
$process->expects($this->once())
->method('isSuccessful')
->will($this->returnValue(false));
@@ -105,11 +97,7 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
$exitText = 'General error';
$workingDirectory = getcwd();
- $process = $this->getMock(
- 'Symfony\Component\Process\Process',
- array('isSuccessful', 'isOutputDisabled', 'getExitCode', 'getExitCodeText', 'getOutput', 'getErrorOutput', 'getWorkingDirectory'),
- array($cmd)
- );
+ $process = $this->getMockBuilder('Symfony\Component\Process\Process')->setMethods(array('isSuccessful', 'isOutputDisabled', 'getExitCode', 'getExitCodeText', 'getOutput', 'getErrorOutput', 'getWorkingDirectory'))->setConstructorArgs(array($cmd))->getMock();
$process->expects($this->once())
->method('isSuccessful')
->will($this->returnValue(false));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php
index 811c98f1..c1920611 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1281,7 +1281,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
{
$i = 0;
$input = new InputStream();
- $input->onEmpty(function () use (&$i) {++$i;});
+ $input->onEmpty(function () use (&$i) { ++$i; });
$process = $this->getProcess(self::$phpBin.' -r '.escapeshellarg('echo 123; echo fread(STDIN, 1); echo 456;'));
$process->setInput($input);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
index e6564cde..0f554b61 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/ProcessUtilsTest.php
@@ -43,6 +43,7 @@ class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
array("'<|>\" \"'\\''f'", '<|>" "\'f'),
array("''", ''),
array("'with\\trailingbs\\'", 'with\trailingbs\\'),
+ array("'withNonAsciiAccentLikeéÉèÈàÀöä'", 'withNonAsciiAccentLikeéÉèÈàÀöä'),
);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php
index 03536577..9e30ce3b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Process/Tests/SignalListener.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-pcntl_signal(SIGUSR1, function () {echo 'SIGUSR1'; exit;});
+pcntl_signal(SIGUSR1, function () { echo 'SIGUSR1'; exit; });
echo 'Caught ';
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php
index 6c9bb423..3c8dc1c5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccess.php
@@ -21,7 +21,7 @@ final class PropertyAccess
/**
* Creates a property accessor with the default configuration.
*
- * @return PropertyAccessor The new property accessor
+ * @return PropertyAccessor
*/
public static function createPropertyAccessor()
{
@@ -31,7 +31,7 @@ final class PropertyAccess
/**
* Creates a property accessor builder.
*
- * @return PropertyAccessorBuilder The new property accessor builder
+ * @return PropertyAccessorBuilder
*/
public static function createPropertyAccessorBuilder()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 618007ef..6019544a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -267,7 +267,7 @@ class PropertyAccessor implements PropertyAccessorInterface
private static function throwInvalidArgumentException($message, $trace, $i)
{
if (isset($trace[$i]['file']) && __FILE__ === $trace[$i]['file']) {
- $pos = strpos($message, $delim = 'must be of the type ') ?: strpos($message, $delim = 'must be an instance of ');
+ $pos = strpos($message, $delim = 'must be of the type ') ?: (strpos($message, $delim = 'must be an instance of ') ?: strpos($message, $delim = 'must implement interface '));
$pos += strlen($delim);
$type = $trace[$i]['args'][0];
$type = is_object($type) ? get_class($type) : gettype($type);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
index 3225cf9b..93fb0d91 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
@@ -38,7 +38,7 @@ class PropertyAccessorBuilder
/**
* Enables the use of "__call" by the PropertyAccessor.
*
- * @return PropertyAccessorBuilder The builder object
+ * @return $this
*/
public function enableMagicCall()
{
@@ -50,7 +50,7 @@ class PropertyAccessorBuilder
/**
* Disables the use of "__call" by the PropertyAccessor.
*
- * @return PropertyAccessorBuilder The builder object
+ * @return $this
*/
public function disableMagicCall()
{
@@ -73,7 +73,7 @@ class PropertyAccessorBuilder
* This has no influence on writing non-existing indices with PropertyAccessorInterface::setValue()
* which are always created on-the-fly.
*
- * @return PropertyAccessorBuilder The builder object
+ * @return $this
*/
public function enableExceptionOnInvalidIndex()
{
@@ -87,7 +87,7 @@ class PropertyAccessorBuilder
*
* Instead, null is returned when calling PropertyAccessorInterface::getValue() on a non-existing index.
*
- * @return PropertyAccessorBuilder The builder object
+ * @return $this
*/
public function disableExceptionOnInvalidIndex()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
index ca4c5745..ce0f3d89 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/Fixtures/TypeHinted.php
@@ -18,6 +18,11 @@ class TypeHinted
{
private $date;
+ /**
+ * @var \Countable
+ */
+ private $countable;
+
public function setDate(\DateTime $date)
{
$this->date = $date;
@@ -27,4 +32,20 @@ class TypeHinted
{
return $this->date;
}
+
+ /**
+ * @return \Countable
+ */
+ public function getCountable()
+ {
+ return $this->countable;
+ }
+
+ /**
+ * @param \Countable $countable
+ */
+ public function setCountable(\Countable $countable)
+ {
+ $this->countable = $countable;
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
index 6721c2fb..b4dc05da 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -121,8 +121,8 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
public function testSetValueCallsAdderAndRemoverForNestedCollections()
{
- $car = $this->getMock(__CLASS__.'_CompositeCar');
- $structure = $this->getMock(__CLASS__.'_CarStructure');
+ $car = $this->getMockBuilder(__CLASS__.'_CompositeCar')->getMock();
+ $structure = $this->getMockBuilder(__CLASS__.'_CarStructure')->getMock();
$axesBefore = $this->getContainer(array(1 => 'second', 3 => 'fourth'));
$axesAfter = $this->getContainer(array(0 => 'first', 1 => 'second', 2 => 'third'));
@@ -152,7 +152,7 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
*/
public function testSetValueFailsIfNoAdderNorRemoverFound()
{
- $car = $this->getMock(__CLASS__.'_CarNoAdderAndRemover');
+ $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
$axesBefore = $this->getContainer(array(1 => 'second', 3 => 'fourth'));
$axesAfter = $this->getContainer(array(0 => 'first', 1 => 'second', 2 => 'third'));
@@ -165,25 +165,25 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
public function testIsWritableReturnsTrueIfAdderAndRemoverExists()
{
- $car = $this->getMock(__CLASS__.'_Car');
+ $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();
$this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));
}
public function testIsWritableReturnsFalseIfOnlyAdderExists()
{
- $car = $this->getMock(__CLASS__.'_CarOnlyAdder');
+ $car = $this->getMockBuilder(__CLASS__.'_CarOnlyAdder')->getMock();
$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
}
public function testIsWritableReturnsFalseIfOnlyRemoverExists()
{
- $car = $this->getMock(__CLASS__.'_CarOnlyRemover');
+ $car = $this->getMockBuilder(__CLASS__.'_CarOnlyRemover')->getMock();
$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
}
public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
{
- $car = $this->getMock(__CLASS__.'_CarNoAdderAndRemover');
+ $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
}
@@ -193,7 +193,7 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
*/
public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
{
- $car = $this->getMock(__CLASS__.'_Car');
+ $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();
$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
index a3a82b0b..33d4085b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -566,4 +566,15 @@ class PropertyAccessorTest extends \PHPUnit_Framework_TestCase
$propertyAccessor->setValue($obj, 'publicGetSetter', 'baz');
$this->assertEquals('baz', $propertyAccessor->getValue($obj, 'publicGetSetter'));
}
+
+ /**
+ * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
+ * @expectedExceptionMessage Expected argument of type "Countable", "string" given
+ */
+ public function testThrowTypeErrorWithInterface()
+ {
+ $object = new TypeHinted();
+
+ $this->propertyAccessor->setValue($object, 'countable', 'This is a string, \Countable expected.');
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index 5e459f4b..f7e4aa87 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -223,6 +223,9 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
try {
$reflectionMethod = new \ReflectionMethod($class, $methodName);
+ if ($reflectionMethod->isStatic()) {
+ continue;
+ }
if (
(self::ACCESSOR === $type && 0 === $reflectionMethod->getNumberOfRequiredParameters()) ||
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index e92da1fc..96c2e9b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -73,6 +73,10 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
}
foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflectionMethod) {
+ if ($reflectionMethod->isStatic()) {
+ continue;
+ }
+
$propertyName = $this->getPropertyName($reflectionMethod->name, $reflectionProperties);
if (!$propertyName || isset($properties[$propertyName])) {
continue;
@@ -263,6 +267,9 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
foreach (self::$accessorPrefixes as $prefix) {
try {
$reflectionMethod = new \ReflectionMethod($class, $prefix.$ucProperty);
+ if ($reflectionMethod->isStatic()) {
+ continue;
+ }
if (0 === $reflectionMethod->getNumberOfRequiredParameters()) {
return array($reflectionMethod, $prefix);
@@ -298,6 +305,9 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
foreach ($names as $name) {
try {
$reflectionMethod = new \ReflectionMethod($class, $prefix.$name);
+ if ($reflectionMethod->isStatic()) {
+ continue;
+ }
// Parameter can be optional to allow things like: method(array $foo = null)
if ($reflectionMethod->getNumberOfParameters() >= 1) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE
index f2b04702..2ca4d630 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016 Fabien Potencier
+Copyright (c) 2015-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
index 942318af..031c8ac0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/PropertyInfoExtractor.php
@@ -44,7 +44,7 @@ class PropertyInfoExtractor implements PropertyInfoExtractorInterface
* @param PropertyDescriptionExtractorInterface[] $descriptionExtractors
* @param PropertyAccessExtractorInterface[] $accessExtractors
*/
- public function __construct(array $listExtractors = array(), array $typeExtractors = array(), array $descriptionExtractors = array(), array $accessExtractors = array())
+ public function __construct(array $listExtractors = array(), array $typeExtractors = array(), array $descriptionExtractors = array(), array $accessExtractors = array())
{
$this->listExtractors = $listExtractors;
$this->typeExtractors = $typeExtractors;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
index a8cc99ec..942dd74c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -68,6 +68,8 @@ class PhpDocExtractorTest extends \PHPUnit_Framework_TestCase
array('e', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))), null, null),
array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))), null, null),
array('donotexist', null, null, null),
+ array('staticGetter', null, null, null),
+ array('staticSetter', null, null, null),
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
index 70050f94..91974d68 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -73,6 +73,8 @@ class ReflectionExtractorTest extends \PHPUnit_Framework_TestCase
array('e', null),
array('f', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime')))),
array('donotexist', null),
+ array('staticGetter', null),
+ array('staticSetter', null),
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
index 41a513ac..96cb87db 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -51,6 +51,21 @@ class Dummy extends ParentDummy
*/
public $B;
+ public static function getStatic()
+ {
+ }
+
+ /**
+ * @return string
+ */
+ public static function staticGetter()
+ {
+ }
+
+ public static function staticSetter(\DateTime $d)
+ {
+ }
+
/**
* A.
*
diff --git a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php
index 8a55a7cb..ad21f917 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/PropertyInfo/Type.php
@@ -148,7 +148,7 @@ class Type
*
* Only applicable for a collection type.
*
- * @return Type|null
+ * @return self|null
*/
public function getCollectionKeyType()
{
@@ -160,7 +160,7 @@ class Type
*
* Only applicable for a collection type.
*
- * @return Type|null
+ * @return self|null
*/
public function getCollectionValueType()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
index 565698e8..8463673e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -139,7 +139,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
$defaults = array_replace($globals['defaults'], $annot->getDefaults());
foreach ($method->getParameters() as $param) {
- if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
+ if (false !== strpos($globals['path'].$annot->getPath(), sprintf('{%s}', $param->getName())) && !isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
$defaults[$param->getName()] = $param->getDefaultValue();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
index 0f2815b7..b24c8512 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
@@ -38,7 +38,7 @@ class DumperCollection implements \IteratorAggregate
/**
* Returns the children routes and collections.
*
- * @return DumperCollection[]|DumperRoute[] Array of DumperCollection|DumperRoute
+ * @return self[]|DumperRoute[]
*/
public function all()
{
@@ -86,7 +86,7 @@ class DumperCollection implements \IteratorAggregate
/**
* Returns the root of the collection.
*
- * @return DumperCollection The root collection
+ * @return self The root collection
*/
public function getRoot()
{
@@ -96,7 +96,7 @@ class DumperCollection implements \IteratorAggregate
/**
* Returns the parent collection.
*
- * @return DumperCollection|null The parent collection or null if the collection has no parent
+ * @return self|null The parent collection or null if the collection has no parent
*/
protected function getParent()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php
index dd1a0d90..5ea622c7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php
@@ -50,7 +50,7 @@ class DumperPrefixCollection extends DumperCollection
*
* @param DumperRoute $route The route
*
- * @return DumperPrefixCollection The node the route was added to
+ * @return self
*
* @throws \LogicException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php
index 862b824d..9b15cd07 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/RequestContext.php
@@ -66,7 +66,7 @@ class RequestContext
*
* @param Request $request A Request instance
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function fromRequest(Request $request)
{
@@ -97,7 +97,7 @@ class RequestContext
*
* @param string $baseUrl The base URL
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setBaseUrl($baseUrl)
{
@@ -121,7 +121,7 @@ class RequestContext
*
* @param string $pathInfo The path info
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setPathInfo($pathInfo)
{
@@ -147,7 +147,7 @@ class RequestContext
*
* @param string $method The HTTP method
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setMethod($method)
{
@@ -173,7 +173,7 @@ class RequestContext
*
* @param string $host The HTTP host
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setHost($host)
{
@@ -197,7 +197,7 @@ class RequestContext
*
* @param string $scheme The HTTP scheme
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setScheme($scheme)
{
@@ -221,7 +221,7 @@ class RequestContext
*
* @param int $httpPort The HTTP port
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setHttpPort($httpPort)
{
@@ -245,7 +245,7 @@ class RequestContext
*
* @param int $httpsPort The HTTPS port
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setHttpsPort($httpsPort)
{
@@ -269,7 +269,7 @@ class RequestContext
*
* @param string $queryString The query string (after "?")
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setQueryString($queryString)
{
@@ -294,7 +294,7 @@ class RequestContext
*
* @param array $parameters The parameters
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setParameters(array $parameters)
{
@@ -333,7 +333,7 @@ class RequestContext
* @param string $name A parameter name
* @param mixed $parameter The parameter value
*
- * @return RequestContext The current instance, implementing a fluent interface
+ * @return $this
*/
public function setParameter($name, $parameter)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
index ee3b5a59..69a7cade 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Route.php
@@ -150,7 +150,7 @@ class Route implements \Serializable
*
* @param string $pattern The path pattern
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setPath($pattern)
{
@@ -179,7 +179,7 @@ class Route implements \Serializable
*
* @param string $pattern The host pattern
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setHost($pattern)
{
@@ -208,7 +208,7 @@ class Route implements \Serializable
*
* @param string|array $schemes The scheme or an array of schemes
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setSchemes($schemes)
{
@@ -249,7 +249,7 @@ class Route implements \Serializable
*
* @param string|array $methods The method or an array of methods
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setMethods($methods)
{
@@ -276,7 +276,7 @@ class Route implements \Serializable
*
* @param array $options The options
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setOptions(array $options)
{
@@ -294,7 +294,7 @@ class Route implements \Serializable
*
* @param array $options The options
*
- * @return Route The current Route instance
+ * @return $this
*/
public function addOptions(array $options)
{
@@ -314,7 +314,7 @@ class Route implements \Serializable
* @param string $name An option name
* @param mixed $value The option value
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setOption($name, $value)
{
@@ -365,7 +365,7 @@ class Route implements \Serializable
*
* @param array $defaults The defaults
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setDefaults(array $defaults)
{
@@ -381,7 +381,7 @@ class Route implements \Serializable
*
* @param array $defaults The defaults
*
- * @return Route The current Route instance
+ * @return $this
*/
public function addDefaults(array $defaults)
{
@@ -423,7 +423,7 @@ class Route implements \Serializable
* @param string $name A variable name
* @param mixed $default The default value
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setDefault($name, $default)
{
@@ -450,7 +450,7 @@ class Route implements \Serializable
*
* @param array $requirements The requirements
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setRequirements(array $requirements)
{
@@ -466,7 +466,7 @@ class Route implements \Serializable
*
* @param array $requirements The requirements
*
- * @return Route The current Route instance
+ * @return $this
*/
public function addRequirements(array $requirements)
{
@@ -508,7 +508,7 @@ class Route implements \Serializable
* @param string $key The key
* @param string $regex The regex
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setRequirement($key, $regex)
{
@@ -535,7 +535,7 @@ class Route implements \Serializable
*
* @param string $condition The condition
*
- * @return Route The current Route instance
+ * @return $this
*/
public function setCondition($condition)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php
index 5f0256ac..726dfa90 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/RouteCollectionBuilder.php
@@ -55,7 +55,7 @@ class RouteCollectionBuilder
* @param string|null $prefix
* @param string $type
*
- * @return RouteCollectionBuilder
+ * @return self
*
* @throws FileLoaderLoadException
*/
@@ -101,7 +101,7 @@ class RouteCollectionBuilder
/**
* Returns a RouteCollectionBuilder that can be configured and then added with mount().
*
- * @return RouteCollectionBuilder
+ * @return self
*/
public function createBuilder()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
index e8870b6e..693f3145 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -208,7 +208,7 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
public function testGenerateForRouteWithInvalidOptionalParameterNonStrictWithLogger()
{
$routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+')));
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->once())
->method('error');
$generator = $this->getGenerator($routes, array(), $logger);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
index 83bf7108..44229633 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -136,11 +136,10 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
array_intersect_assoc($routeData['options'], $route->getOptions()),
'->load preserves options annotation'
);
- $defaults = array_replace($methodArgs, $routeData['defaults']);
$this->assertCount(
- count($defaults),
- array_intersect_assoc($defaults, $route->getDefaults()),
- '->load preserves defaults annotation and merges them with default arguments in method signature'
+ count($routeData['defaults']),
+ $route->getDefaults(),
+ '->load preserves defaults annotation'
);
$this->assertEquals($routeData['schemes'], $route->getSchemes(), '->load preserves schemes annotation');
$this->assertEquals($routeData['methods'], $route->getMethods(), '->load preserves methods annotation');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
index 5d66446f..ed7c5a4b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
@@ -18,7 +18,7 @@ class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase
{
public function testSupports()
{
- $loader = new PhpFileLoader($this->getMock('Symfony\Component\Config\FileLocator'));
+ $loader = new PhpFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
$this->assertTrue($loader->supports('foo.php'), '->supports() returns true if the resource is loadable');
$this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 50741d3b..52ec93a6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -19,7 +19,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
{
public function testSupports()
{
- $loader = new XmlFileLoader($this->getMock('Symfony\Component\Config\FileLocator'));
+ $loader = new XmlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
$this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
$this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
index a6ae50b1..90d2a955 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
@@ -19,7 +19,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
{
public function testSupports()
{
- $loader = new YamlFileLoader($this->getMock('Symfony\Component\Config\FileLocator'));
+ $loader = new YamlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
$this->assertTrue($loader->supports('foo.yml'), '->supports() returns true if the resource is loadable');
$this->assertTrue($loader->supports('foo.yaml'), '->supports() returns true if the resource is loadable');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
index b944ffe8..ece28746 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -20,8 +20,8 @@ class RouteCollectionBuilderTest extends \PHPUnit_Framework_TestCase
{
public function testImport()
{
- $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
- $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
+ $resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
+ $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
$resolver->expects($this->once())
->method('resolve')
->with('admin_routing.yml', 'yaml')
@@ -38,7 +38,7 @@ class RouteCollectionBuilderTest extends \PHPUnit_Framework_TestCase
->with('admin_routing.yml', 'yaml')
->will($this->returnValue($expectedCollection));
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader->expects($this->any())
->method('getResolver')
->will($this->returnValue($resolver));
@@ -89,7 +89,7 @@ class RouteCollectionBuilderTest extends \PHPUnit_Framework_TestCase
$importedCollection->add('imported_route1', new Route('/imported/foo1'));
$importedCollection->add('imported_route2', new Route('/imported/foo2'));
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
// make this loader able to do the import - keeps mocking simple
$loader->expects($this->any())
->method('supports')
@@ -252,7 +252,7 @@ class RouteCollectionBuilderTest extends \PHPUnit_Framework_TestCase
public function testFlushSetsPrefixedWithMultipleLevels()
{
- $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$routes = new RouteCollectionBuilder($loader);
$routes->add('homepage', 'MainController::homepageAction', 'homepage');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php
index 9a1c568e..fd418e13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Routing/Tests/RouterTest.php
@@ -22,7 +22,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
+ $this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$this->router = new Router($this->loader, 'routing.yml');
}
@@ -82,7 +82,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
{
$this->router->setOption('resource_type', 'ResourceType');
- $routeCollection = $this->getMock('Symfony\Component\Routing\RouteCollection');
+ $routeCollection = $this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock();
$this->loader->expects($this->once())
->method('load')->with('routing.yml', 'ResourceType')
@@ -100,7 +100,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
$this->loader->expects($this->once())
->method('load')->with('routing.yml', null)
- ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RouteCollection')));
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
$this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
}
@@ -122,7 +122,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
$this->loader->expects($this->once())
->method('load')->with('routing.yml', null)
- ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RouteCollection')));
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
$this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
}
@@ -137,7 +137,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
public function testMatchRequestWithUrlMatcherInterface()
{
- $matcher = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
+ $matcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
$matcher->expects($this->once())->method('match');
$p = new \ReflectionProperty($this->router, 'matcher');
@@ -149,7 +149,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
public function testMatchRequestWithRequestMatcherInterface()
{
- $matcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $matcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$matcher->expects($this->once())->method('matchRequest');
$p = new \ReflectionProperty($this->router, 'matcher');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
index cc8b7c02..274992ed 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
@@ -44,7 +44,7 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
));
try {
- $manager->authenticate($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->fail();
} catch (ProviderNotFoundException $e) {
$this->assertSame($token, $e->getToken());
@@ -58,7 +58,7 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
));
try {
- $manager->authenticate($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->fail();
} catch (AccountStatusException $e) {
$this->assertSame($token, $e->getToken());
@@ -72,7 +72,7 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
));
try {
- $manager->authenticate($token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $manager->authenticate($token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->fail();
} catch (AuthenticationException $e) {
$this->assertSame($token, $e->getToken());
@@ -83,26 +83,26 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
{
$manager = new AuthenticationProviderManager(array(
$this->getAuthenticationProvider(true, null, 'Symfony\Component\Security\Core\Exception\AuthenticationException'),
- $this->getAuthenticationProvider(true, $expected = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')),
+ $this->getAuthenticationProvider(true, $expected = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()),
));
- $token = $manager->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertSame($expected, $token);
}
public function testAuthenticateReturnsTokenOfTheFirstMatchingProvider()
{
- $second = $this->getMock('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface');
+ $second = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock();
$second
->expects($this->never())
->method('supports')
;
$manager = new AuthenticationProviderManager(array(
- $this->getAuthenticationProvider(true, $expected = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')),
+ $this->getAuthenticationProvider(true, $expected = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()),
$second,
));
- $token = $manager->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertSame($expected, $token);
}
@@ -112,20 +112,20 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
$this->getAuthenticationProvider(true, $token = new UsernamePasswordToken('foo', 'bar', 'key')),
));
- $token = $manager->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertEquals('', $token->getCredentials());
$manager = new AuthenticationProviderManager(array(
$this->getAuthenticationProvider(true, $token = new UsernamePasswordToken('foo', 'bar', 'key')),
), false);
- $token = $manager->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $token = $manager->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertEquals('bar', $token->getCredentials());
}
protected function getAuthenticationProvider($supports, $token = null, $exception = null)
{
- $provider = $this->getMock('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface');
+ $provider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock();
$provider->expects($this->once())
->method('supports')
->will($this->returnValue($supports))
@@ -139,7 +139,7 @@ class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
} elseif (null !== $exception) {
$provider->expects($this->once())
->method('authenticate')
- ->will($this->throwException($this->getMock($exception, null, array(), '')))
+ ->will($this->throwException($this->getMockBuilder($exception)->setMethods(null)->getMock()))
;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
index 36409811..e3f7f5f1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php
@@ -47,17 +47,17 @@ class AuthenticationTrustResolverTest extends \PHPUnit_Framework_TestCase
protected function getToken()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
protected function getAnonymousToken()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken', null, array('', ''));
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(array('', ''))->getMock();
}
protected function getRememberMeToken()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', array('setPersistent'), array(), '', false);
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('setPersistent'))->disableOriginalConstructor()->getMock();
}
protected function getResolver()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
index 8f4b3927..f22227b0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
@@ -20,14 +20,14 @@ class AnonymousAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider('foo');
$this->assertTrue($provider->supports($this->getSupportedToken('foo')));
- $this->assertFalse($provider->supports($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
public function testAuthenticateWhenTokenIsNotSupported()
{
$provider = $this->getProvider('foo');
- $this->assertNull($provider->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
/**
@@ -50,7 +50,7 @@ class AnonymousAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getSupportedToken($secret)
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken', array('getSecret'), array(), '', false);
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setMethods(array('getSecret'))->disableOriginalConstructor()->getMock();
$token->expects($this->any())
->method('getSecret')
->will($this->returnValue($secret))
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
index 3eedb8e5..8edf1b02 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
@@ -34,13 +34,13 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testRetrieveUserWhenUsernameIsNotFound()
{
- $userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->once())
->method('loadUserByUsername')
->will($this->throwException(new UsernameNotFoundException()))
;
- $provider = new DaoAuthenticationProvider($userProvider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface'), 'key', $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface'));
+ $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
$method = new \ReflectionMethod($provider, 'retrieveUser');
$method->setAccessible(true);
@@ -52,13 +52,13 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testRetrieveUserWhenAnExceptionOccurs()
{
- $userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->once())
->method('loadUserByUsername')
->will($this->throwException(new \RuntimeException()))
;
- $provider = new DaoAuthenticationProvider($userProvider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface'), 'key', $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface'));
+ $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
$method = new \ReflectionMethod($provider, 'retrieveUser');
$method->setAccessible(true);
@@ -67,19 +67,19 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testRetrieveUserReturnsUserFromTokenOnReauthentication()
{
- $userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->never())
->method('loadUserByUsername')
;
- $user = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $user = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$token = $this->getSupportedToken();
$token->expects($this->once())
->method('getUser')
->will($this->returnValue($user))
;
- $provider = new DaoAuthenticationProvider($userProvider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface'), 'key', $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface'));
+ $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
$reflection = new \ReflectionMethod($provider, 'retrieveUser');
$reflection->setAccessible(true);
$result = $reflection->invoke($provider, null, $token);
@@ -89,15 +89,15 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testRetrieveUser()
{
- $user = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $user = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
- $userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->once())
->method('loadUserByUsername')
->will($this->returnValue($user))
;
- $provider = new DaoAuthenticationProvider($userProvider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface'), 'key', $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface'));
+ $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
$method = new \ReflectionMethod($provider, 'retrieveUser');
$method->setAccessible(true);
@@ -109,7 +109,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testCheckAuthenticationWhenCredentialsAreEmpty()
{
- $encoder = $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface');
+ $encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder
->expects($this->never())
->method('isPasswordValid')
@@ -128,14 +128,14 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$method->invoke(
$provider,
- $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface'),
+ $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock(),
$token
);
}
public function testCheckAuthenticationWhenCredentialsAre0()
{
- $encoder = $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface');
+ $encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder
->expects($this->once())
->method('isPasswordValid')
@@ -155,7 +155,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$method->invoke(
$provider,
- $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface'),
+ $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock(),
$token
);
}
@@ -165,7 +165,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testCheckAuthenticationWhenCredentialsAreNotValid()
{
- $encoder = $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface');
+ $encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder->expects($this->once())
->method('isPasswordValid')
->will($this->returnValue(false))
@@ -181,7 +181,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('foo'))
;
- $method->invoke($provider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface'), $token);
+ $method->invoke($provider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock(), $token);
}
/**
@@ -189,7 +189,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testCheckAuthenticationDoesNotReauthenticateWhenPasswordHasChanged()
{
- $user = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $user = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$user->expects($this->once())
->method('getPassword')
->will($this->returnValue('foo'))
@@ -200,7 +200,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->method('getUser')
->will($this->returnValue($user));
- $dbUser = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $dbUser = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$dbUser->expects($this->once())
->method('getPassword')
->will($this->returnValue('newFoo'))
@@ -214,7 +214,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testCheckAuthenticationWhenTokenNeedsReauthenticationWorksWithoutOriginalCredentials()
{
- $user = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $user = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$user->expects($this->once())
->method('getPassword')
->will($this->returnValue('foo'))
@@ -225,7 +225,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->method('getUser')
->will($this->returnValue($user));
- $dbUser = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface');
+ $dbUser = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$dbUser->expects($this->once())
->method('getPassword')
->will($this->returnValue('foo'))
@@ -239,7 +239,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testCheckAuthentication()
{
- $encoder = $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface');
+ $encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder->expects($this->once())
->method('isPasswordValid')
->will($this->returnValue(true))
@@ -255,12 +255,12 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('foo'))
;
- $method->invoke($provider, $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserInterface'), $token);
+ $method->invoke($provider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock(), $token);
}
protected function getSupportedToken()
{
- $mock = $this->getMock('Symfony\\Component\\Security\\Core\\Authentication\\Token\\UsernamePasswordToken', array('getCredentials', 'getUser', 'getProviderKey'), array(), '', false);
+ $mock = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Authentication\\Token\\UsernamePasswordToken')->setMethods(array('getCredentials', 'getUser', 'getProviderKey'))->disableOriginalConstructor()->getMock();
$mock
->expects($this->any())
->method('getProviderKey')
@@ -272,7 +272,7 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getProvider($user = null, $userChecker = null, $passwordEncoder = null)
{
- $userProvider = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
if (null !== $user) {
$userProvider->expects($this->once())
->method('loadUserByUsername')
@@ -281,14 +281,14 @@ class DaoAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
}
if (null === $userChecker) {
- $userChecker = $this->getMock('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock();
}
if (null === $passwordEncoder) {
$passwordEncoder = new PlaintextPasswordEncoder();
}
- $encoderFactory = $this->getMock('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface');
+ $encoderFactory = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock();
$encoderFactory
->expects($this->any())
->method('getEncoder')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
index da3068f6..9359f869 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -30,9 +30,9 @@ class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testEmptyPasswordShouldThrowAnException()
{
- $userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
- $ldap = $this->getMock('Symfony\Component\Ldap\LdapClientInterface');
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
+ $ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapClientInterface')->getMock();
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
$reflection = new \ReflectionMethod($provider, 'checkAuthentication');
@@ -47,14 +47,14 @@ class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testBindFailureShouldThrowAnException()
{
- $userProvider = $this->getMock(UserProviderInterface::class);
- $ldap = $this->getMock(LdapInterface::class);
+ $userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
->expects($this->once())
->method('bind')
->will($this->throwException(new ConnectionException()))
;
- $userChecker = $this->getMock(UserCheckerInterface::class);
+ $userChecker = $this->getMockBuilder(UserCheckerInterface::class)->getMock();
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
$reflection = new \ReflectionMethod($provider, 'checkAuthentication');
@@ -65,15 +65,15 @@ class LdapBindAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testRetrieveUser()
{
- $userProvider = $this->getMock(UserProviderInterface::class);
+ $userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
$userProvider
->expects($this->once())
->method('loadUserByUsername')
->with('foo')
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
- $userChecker = $this->getMock(UserCheckerInterface::class);
+ $userChecker = $this->getMockBuilder(UserCheckerInterface::class)->getMock();
$provider = new LdapBindAuthenticationProvider($userProvider, $userChecker, 'key', $ldap);
$reflection = new \ReflectionMethod($provider, 'retrieveUser');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
index 5fd7b05e..27d8566e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -21,7 +21,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
$provider = $this->getProvider();
$this->assertTrue($provider->supports($this->getSupportedToken()));
- $this->assertFalse($provider->supports($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken')
->disableOriginalConstructor()
@@ -39,7 +39,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
{
$provider = $this->getProvider();
- $this->assertNull($provider->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
/**
@@ -53,7 +53,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
public function testAuthenticate()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getRoles')
@@ -75,9 +75,9 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
*/
public function testAuthenticateWhenUserCheckerThrowsException()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPostAuth')
->will($this->throwException(new LockedException()))
@@ -90,7 +90,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
protected function getSupportedToken($user = false, $credentials = false)
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken', array('getUser', 'getCredentials', 'getProviderKey'), array(), '', false);
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken')->setMethods(array('getUser', 'getCredentials', 'getProviderKey'))->disableOriginalConstructor()->getMock();
if (false !== $user) {
$token->expects($this->once())
->method('getUser')
@@ -117,7 +117,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
protected function getProvider($user = null, $userChecker = null)
{
- $userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
if (null !== $user) {
$userProvider->expects($this->once())
->method('loadUserByUsername')
@@ -126,7 +126,7 @@ class PreAuthenticatedAuthenticationProviderTest extends \PHPUnit_Framework_Test
}
if (null === $userChecker) {
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
}
return new PreAuthenticatedAuthenticationProvider($userProvider, $userChecker, 'key');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
index 735d195d..2099d983 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
@@ -22,14 +22,14 @@ class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider();
$this->assertTrue($provider->supports($this->getSupportedToken()));
- $this->assertFalse($provider->supports($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
public function testAuthenticateWhenTokenIsNotSupported()
{
$provider = $this->getProvider();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$this->assertNull($provider->authenticate($token));
}
@@ -49,7 +49,7 @@ class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testAuthenticateWhenPreChecksFails()
{
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPreAuth')
->will($this->throwException(new DisabledException()));
@@ -61,7 +61,7 @@ class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testAuthenticate()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->exactly(2))
->method('getRoles')
->will($this->returnValue(array('ROLE_FOO')));
@@ -80,14 +80,14 @@ class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getSupportedToken($user = null, $secret = 'test')
{
if (null === $user) {
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->any())
->method('getRoles')
->will($this->returnValue(array()));
}
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', array('getProviderKey'), array($user, 'foo', $secret));
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('getProviderKey'))->setConstructorArgs(array($user, 'foo', $secret))->getMock();
$token
->expects($this->once())
->method('getProviderKey')
@@ -99,7 +99,7 @@ class RememberMeAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getProvider($userChecker = null, $key = 'test')
{
if (null === $userChecker) {
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
}
return new RememberMeAuthenticationProvider($userChecker, $key, 'foo');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
index 05030543..0a78ee8c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -25,14 +25,14 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider();
$this->assertTrue($provider->supports($this->getSupportedToken()));
- $this->assertFalse($provider->supports($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
public function testAuthenticateWhenTokenIsNotSupported()
{
$provider = $this->getProvider();
- $this->assertNull($provider->authenticate($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $this->assertNull($provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
/**
@@ -82,7 +82,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testAuthenticateWhenPreChecksFails()
{
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPreAuth')
->will($this->throwException(new CredentialsExpiredException()))
@@ -91,7 +91,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider($userChecker);
$provider->expects($this->once())
->method('retrieveUser')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\User\UserInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()))
;
$provider->authenticate($this->getSupportedToken());
@@ -102,7 +102,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testAuthenticateWhenPostChecksFails()
{
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPostAuth')
->will($this->throwException(new AccountExpiredException()))
@@ -111,7 +111,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider($userChecker);
$provider->expects($this->once())
->method('retrieveUser')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\User\UserInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()))
;
$provider->authenticate($this->getSupportedToken());
@@ -126,7 +126,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider();
$provider->expects($this->once())
->method('retrieveUser')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\User\UserInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()))
;
$provider->expects($this->once())
->method('checkAuthentication')
@@ -145,7 +145,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$provider = $this->getProvider(false, false);
$provider->expects($this->once())
->method('retrieveUser')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\User\UserInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()))
;
$provider->expects($this->once())
->method('checkAuthentication')
@@ -157,7 +157,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testAuthenticate()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->once())
->method('getRoles')
->will($this->returnValue(array('ROLE_FOO')))
@@ -191,7 +191,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
public function testAuthenticateWithPreservingRoleSwitchUserRole()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->once())
->method('getRoles')
->will($this->returnValue(array('ROLE_FOO')))
@@ -209,7 +209,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('foo'))
;
- $switchUserRole = new SwitchUserRole('foo', $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $switchUserRole = new SwitchUserRole('foo', $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$token->expects($this->once())
->method('getRoles')
->will($this->returnValue(array($switchUserRole)))
@@ -227,7 +227,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getSupportedToken()
{
- $mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', array('getCredentials', 'getProviderKey', 'getRoles'), array(), '', false);
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken')->setMethods(array('getCredentials', 'getProviderKey', 'getRoles'))->disableOriginalConstructor()->getMock();
$mock
->expects($this->any())
->method('getProviderKey')
@@ -242,7 +242,7 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function getProvider($userChecker = false, $hide = true)
{
if (false === $userChecker) {
- $userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
}
return $this->getMockForAbstractClass('Symfony\Component\Security\Core\Authentication\Provider\UserAuthenticationProvider', array($userChecker, 'key', $hide));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
index 1a786d7c..896ea37f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -68,7 +68,7 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
$token->setUser(new TestUser('fabien'));
$this->assertEquals('fabien', $token->getUsername());
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->once())->method('getUsername')->will($this->returnValue('fabien'));
$token->setUser($user);
$this->assertEquals('fabien', $token->getUsername());
@@ -78,7 +78,7 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
{
$token = $this->getToken(array('ROLE_FOO'));
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->once())->method('eraseCredentials');
$token->setUser($user);
@@ -168,8 +168,8 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
public function getUsers()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $advancedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
return array(
array($advancedUser),
@@ -197,8 +197,8 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
public function getUserChanges()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $advancedUser = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $advancedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
return array(
array(
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
index b83de4a9..882f2224 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -54,7 +54,7 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase
protected function getUser($roles = array('ROLE_FOO'))
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getRoles')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php
index d06e3f03..a3bcc96f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authentication/Token/Storage/TokenStorageTest.php
@@ -19,7 +19,7 @@ class TokenStorageTest extends \PHPUnit_Framework_TestCase
{
$tokenStorage = new TokenStorage();
$this->assertNull($tokenStorage->getToken());
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$tokenStorage->setToken($token);
$this->assertSame($token, $tokenStorage->getToken());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
index 0e77c75f..8aace211 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -29,7 +29,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
*/
public function testStrategies($strategy, $voters, $allowIfAllAbstainDecisions, $allowIfEqualGrantedDeniedDecisions, $expected)
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$manager = new AccessDecisionManager($voters, $strategy, $allowIfAllAbstainDecisions, $allowIfEqualGrantedDeniedDecisions);
$this->assertSame($expected, $manager->decide($token, array('ROLE_FOO')));
@@ -47,7 +47,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
public function getStrategiesWith2RolesTests()
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
return array(
array($token, 'affirmative', $this->getVoter(VoterInterface::ACCESS_DENIED), false),
@@ -65,7 +65,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
protected function getVoterFor2Roles($token, $vote1, $vote2)
{
- $voter = $this->getMock('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface');
+ $voter = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface')->getMock();
$voter->expects($this->any())
->method('vote')
->will($this->returnValueMap(array(
@@ -130,7 +130,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
protected function getVoter($vote)
{
- $voter = $this->getMock('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface');
+ $voter = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\Voter\VoterInterface')->getMock();
$voter->expects($this->any())
->method('vote')
->will($this->returnValue($vote));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
index aafc12fd..eed361cb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
@@ -23,8 +23,8 @@ class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
- $this->accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface');
+ $this->authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
+ $this->accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();
$this->tokenStorage = new TokenStorage();
$this->authorizationChecker = new AuthorizationChecker(
@@ -36,10 +36,10 @@ class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase
public function testVoteAuthenticatesTokenIfNecessary()
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$this->tokenStorage->setToken($token);
- $newToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $newToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$this->authenticationManager
->expects($this->once())
@@ -78,7 +78,7 @@ class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase
*/
public function testIsGranted($decide)
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('isAuthenticated')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php
index 16661f70..14b06850 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php
@@ -23,7 +23,7 @@ class DebugAccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
public function testDecideLog($expectedLog, $object)
{
$adm = new DebugAccessDecisionManager(new AccessDecisionManager());
- $adm->decide($this->getMock(TokenInterface::class), array('ATTRIBUTE_1'), $object);
+ $adm->decide($this->getMockBuilder(TokenInterface::class)->getMock(), array('ATTRIBUTE_1'), $object);
$this->assertSame($expectedLog, $adm->getDecisionLog());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
index 60e2a195..d685f0f0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AuthenticatedVoterTest.php
@@ -62,11 +62,11 @@ class AuthenticatedVoterTest extends \PHPUnit_Framework_TestCase
protected function getToken($authenticated)
{
if ('fully' === $authenticated) {
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
} elseif ('remembered' === $authenticated) {
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken', array('setPersistent'), array(), '', false);
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\RememberMeToken')->setMethods(array('setPersistent'))->disableOriginalConstructor()->getMock();
} else {
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken', null, array('', ''));
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\AnonymousToken')->setConstructorArgs(array('', ''))->getMock();
}
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
index 52962969..714e6a04 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/ExpressionVoterTest.php
@@ -45,7 +45,7 @@ class ExpressionVoterTest extends \PHPUnit_Framework_TestCase
foreach ($roles as $i => $role) {
$roles[$i] = new Role($role);
}
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
if ($tokenExpectsGetRoles) {
$token->expects($this->once())
@@ -58,7 +58,7 @@ class ExpressionVoterTest extends \PHPUnit_Framework_TestCase
protected function createExpressionLanguage($expressionLanguageExpectsEvaluate = true)
{
- $mock = $this->getMock('Symfony\Component\Security\Core\Authorization\ExpressionLanguage');
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\ExpressionLanguage')->getMock();
if ($expressionLanguageExpectsEvaluate) {
$mock->expects($this->once())
@@ -71,12 +71,12 @@ class ExpressionVoterTest extends \PHPUnit_Framework_TestCase
protected function createTrustResolver()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface')->getMock();
}
protected function createRoleHierarchy()
{
- return $this->getMock('Symfony\Component\Security\Core\Role\RoleHierarchyInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleHierarchyInterface')->getMock();
}
protected function createExpression()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
index 45535ca4..5918fd85 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/RoleVoterTest.php
@@ -50,7 +50,7 @@ class RoleVoterTest extends \PHPUnit_Framework_TestCase
foreach ($roles as $i => $role) {
$roles[$i] = new Role($role);
}
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token->expects($this->once())
->method('getRoles')
->will($this->returnValue($roles));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
index 4bac44d9..cbd2755d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/VoterTest.php
@@ -21,7 +21,7 @@ class VoterTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
public function getTests()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
index 21aaae4f..191a4d87 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -26,7 +26,7 @@ class EncoderFactoryTest extends \PHPUnit_Framework_TestCase
'arguments' => array('sha512', true, 5),
)));
- $encoder = $factory->getEncoder($this->getMock('Symfony\Component\Security\Core\User\UserInterface'));
+ $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
$expectedEncoder = new MessageDigestPasswordEncoder('sha512', true, 5);
$this->assertEquals($expectedEncoder->encodePassword('foo', 'moo'), $encoder->encodePassword('foo', 'moo'));
@@ -38,7 +38,7 @@ class EncoderFactoryTest extends \PHPUnit_Framework_TestCase
'Symfony\Component\Security\Core\User\UserInterface' => new MessageDigestPasswordEncoder('sha1'),
));
- $encoder = $factory->getEncoder($this->getMock('Symfony\Component\Security\Core\User\UserInterface'));
+ $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
$expectedEncoder = new MessageDigestPasswordEncoder('sha1');
$this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php
index 590652da..e8adb9b3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Encoder/UserPasswordEncoderTest.php
@@ -17,18 +17,18 @@ class UserPasswordEncoderTest extends \PHPUnit_Framework_TestCase
{
public function testEncodePassword()
{
- $userMock = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $userMock = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$userMock->expects($this->any())
->method('getSalt')
->will($this->returnValue('userSalt'));
- $mockEncoder = $this->getMock('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface');
+ $mockEncoder = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface')->getMock();
$mockEncoder->expects($this->any())
->method('encodePassword')
->with($this->equalTo('plainPassword'), $this->equalTo('userSalt'))
->will($this->returnValue('encodedPassword'));
- $mockEncoderFactory = $this->getMock('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface');
+ $mockEncoderFactory = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface')->getMock();
$mockEncoderFactory->expects($this->any())
->method('getEncoder')
->with($this->equalTo($userMock))
@@ -42,7 +42,7 @@ class UserPasswordEncoderTest extends \PHPUnit_Framework_TestCase
public function testIsPasswordValid()
{
- $userMock = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $userMock = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$userMock->expects($this->any())
->method('getSalt')
->will($this->returnValue('userSalt'));
@@ -50,13 +50,13 @@ class UserPasswordEncoderTest extends \PHPUnit_Framework_TestCase
->method('getPassword')
->will($this->returnValue('encodedPassword'));
- $mockEncoder = $this->getMock('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface');
+ $mockEncoder = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface')->getMock();
$mockEncoder->expects($this->any())
->method('isPasswordValid')
->with($this->equalTo('encodedPassword'), $this->equalTo('plainPassword'), $this->equalTo('userSalt'))
->will($this->returnValue(true));
- $mockEncoderFactory = $this->getMock('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface');
+ $mockEncoderFactory = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface')->getMock();
$mockEncoderFactory->expects($this->any())
->method('getEncoder')
->with($this->equalTo($userMock))
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php
index f0ce4686..fff5ff21 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Role/SwitchUserRoleTest.php
@@ -17,14 +17,14 @@ class SwitchUserRoleTest extends \PHPUnit_Framework_TestCase
{
public function testGetSource()
{
- $role = new SwitchUserRole('FOO', $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $role = new SwitchUserRole('FOO', $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertSame($token, $role->getSource());
}
public function testGetRole()
{
- $role = new SwitchUserRole('FOO', $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $role = new SwitchUserRole('FOO', $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
$this->assertEquals('FOO', $role->getRole());
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
index ab01f476..dae58ae9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -173,11 +173,11 @@ class ChainUserProviderTest extends \PHPUnit_Framework_TestCase
protected function getAccount()
{
- return $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
}
protected function getProvider()
{
- return $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
index b942e76d..06baeae7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
@@ -28,7 +28,7 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadUserByUsernameFailsIfCantConnectToLdap()
{
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
->expects($this->once())
->method('bind')
@@ -44,8 +44,8 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadUserByUsernameFailsIfNoLdapEntries()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
@@ -56,7 +56,7 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
->method('count')
->will($this->returnValue(0))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
->expects($this->once())
->method('escape')
@@ -77,8 +77,8 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
@@ -89,7 +89,7 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
->method('count')
->will($this->returnValue(2))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
->expects($this->once())
->method('escape')
@@ -110,14 +110,14 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
*/
public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
->will($this->returnValue($result))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$result
->expects($this->once())
->method('offsetGet')
@@ -151,19 +151,61 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
+ */
+ public function testLoadUserByUsernameFailsIfEntryHasNoUidKeyAttribute()
+ {
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
+ $query
+ ->expects($this->once())
+ ->method('execute')
+ ->will($this->returnValue($result))
+ ;
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
+ $result
+ ->expects($this->once())
+ ->method('offsetGet')
+ ->with(0)
+ ->will($this->returnValue(new Entry('foo', array())))
+ ;
+ $result
+ ->expects($this->once())
+ ->method('count')
+ ->will($this->returnValue(1))
+ ;
+ $ldap
+ ->expects($this->once())
+ ->method('escape')
+ ->will($this->returnValue('foo'))
+ ;
+ $ldap
+ ->expects($this->once())
+ ->method('query')
+ ->will($this->returnValue($query))
+ ;
+
+ $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com', null, null, array(), 'sAMAccountName', '({uid_key}={username})');
+ $this->assertInstanceOf(
+ 'Symfony\Component\Security\Core\User\User',
+ $provider->loadUserByUsername('foo')
+ );
+ }
+
/**
* @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
*/
public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
->will($this->returnValue($result))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$result
->expects($this->once())
->method('offsetGet')
@@ -198,14 +240,14 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttribute()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
->will($this->returnValue($result))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$result
->expects($this->once())
->method('offsetGet')
@@ -238,16 +280,55 @@ class LdapUserProviderTest extends \PHPUnit_Framework_TestCase
);
}
+ public function testLoadUserByUsernameIsSuccessfulWithoutPasswordAttributeAndWrongCase()
+ {
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
+ $query
+ ->expects($this->once())
+ ->method('execute')
+ ->will($this->returnValue($result))
+ ;
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
+ $result
+ ->expects($this->once())
+ ->method('offsetGet')
+ ->with(0)
+ ->will($this->returnValue(new Entry('foo', array(
+ 'sAMAccountName' => array('foo'),
+ )
+ )))
+ ;
+ $result
+ ->expects($this->once())
+ ->method('count')
+ ->will($this->returnValue(1))
+ ;
+ $ldap
+ ->expects($this->once())
+ ->method('escape')
+ ->will($this->returnValue('Foo'))
+ ;
+ $ldap
+ ->expects($this->once())
+ ->method('query')
+ ->will($this->returnValue($query))
+ ;
+
+ $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com');
+ $this->assertSame('foo', $provider->loadUserByUsername('Foo')->getUsername());
+ }
+
public function testLoadUserByUsernameIsSuccessfulWithPasswordAttribute()
{
- $result = $this->getMock(CollectionInterface::class);
- $query = $this->getMock(QueryInterface::class);
+ $result = $this->getMockBuilder(CollectionInterface::class)->getMock();
+ $query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
->expects($this->once())
->method('execute')
->will($this->returnValue($result))
;
- $ldap = $this->getMock(LdapInterface::class);
+ $ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$result
->expects($this->once())
->method('offsetGet')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
index ac217814..4b6e5271 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
@@ -19,14 +19,14 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $this->assertNull($checker->checkPostAuth($this->getMock('Symfony\Component\Security\Core\User\UserInterface')));
+ $this->assertNull($checker->checkPostAuth($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()));
}
public function testCheckPostAuthPass()
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isCredentialsNonExpired')->will($this->returnValue(true));
$this->assertNull($checker->checkPostAuth($account));
@@ -39,7 +39,7 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isCredentialsNonExpired')->will($this->returnValue(false));
$checker->checkPostAuth($account);
@@ -49,14 +49,14 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $this->assertNull($checker->checkPreAuth($this->getMock('Symfony\Component\Security\Core\User\UserInterface')));
+ $this->assertNull($checker->checkPreAuth($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()));
}
public function testCheckPreAuthPass()
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
$account->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
$account->expects($this->once())->method('isAccountNonExpired')->will($this->returnValue(true));
@@ -71,7 +71,7 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(false));
$checker->checkPreAuth($account);
@@ -84,7 +84,7 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
$account->expects($this->once())->method('isEnabled')->will($this->returnValue(false));
@@ -98,7 +98,7 @@ class UserCheckerTest extends \PHPUnit_Framework_TestCase
{
$checker = new UserChecker();
- $account = $this->getMock('Symfony\Component\Security\Core\User\AdvancedUserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
$account->expects($this->once())->method('isAccountNonLocked')->will($this->returnValue(true));
$account->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
$account->expects($this->once())->method('isAccountNonExpired')->will($this->returnValue(false));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
index 047c9299..7ebe65c6 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -95,7 +95,7 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
*/
public function testUserIsNotValid()
{
- $user = $this->getMock('Foo\Bar\User');
+ $user = $this->getMockBuilder('Foo\Bar\User')->getMock();
$this->tokenStorage = $this->createTokenStorage($user);
$this->validator = $this->createValidator();
@@ -106,7 +106,7 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
protected function createUser()
{
- $mock = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$mock
->expects($this->any())
@@ -125,12 +125,12 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
protected function createPasswordEncoder($isPasswordValid = true)
{
- return $this->getMock('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface')->getMock();
}
protected function createEncoderFactory($encoder = null)
{
- $mock = $this->getMock('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface')->getMock();
$mock
->expects($this->any())
@@ -145,7 +145,7 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
{
$token = $this->createAuthenticationToken($user);
- $mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$mock
->expects($this->any())
->method('getToken')
@@ -157,7 +157,7 @@ abstract class UserPasswordValidatorTest extends AbstractConstraintValidatorTest
protected function createAuthenticationToken($user = null)
{
- $mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $mock = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$mock
->expects($this->any())
->method('getUser')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
index fc42419a..1edf3f76 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Core/User/LdapUserProvider.php
@@ -31,6 +31,7 @@ class LdapUserProvider implements UserProviderInterface
private $searchDn;
private $searchPassword;
private $defaultRoles;
+ private $uidKey;
private $defaultSearch;
private $passwordAttribute;
@@ -46,11 +47,16 @@ class LdapUserProvider implements UserProviderInterface
*/
public function __construct(LdapInterface $ldap, $baseDn, $searchDn = null, $searchPassword = null, array $defaultRoles = array(), $uidKey = 'sAMAccountName', $filter = '({uid_key}={username})', $passwordAttribute = null)
{
+ if (null === $uidKey) {
+ $uidKey = 'uid';
+ }
+
$this->ldap = $ldap;
$this->baseDn = $baseDn;
$this->searchDn = $searchDn;
$this->searchPassword = $searchPassword;
$this->defaultRoles = $defaultRoles;
+ $this->uidKey = $uidKey;
$this->defaultSearch = str_replace('{uid_key}', $uidKey, $filter);
$this->passwordAttribute = $passwordAttribute;
}
@@ -80,7 +86,10 @@ class LdapUserProvider implements UserProviderInterface
throw new UsernameNotFoundException('More than one user found');
}
- return $this->loadUser($username, $entries[0]);
+ $entry = $entries[0];
+ $username = $this->getAttributeValue($entry, $this->uidKey);
+
+ return $this->loadUser($username, $entry);
}
/**
@@ -113,30 +122,30 @@ class LdapUserProvider implements UserProviderInterface
*/
protected function loadUser($username, Entry $entry)
{
- $password = $this->getPassword($entry);
+ $password = null;
+ if (null !== $this->passwordAttribute) {
+ $password = $this->getAttributeValue($entry, $this->passwordAttribute);
+ }
return new User($username, $password, $this->defaultRoles);
}
/**
- * Fetches the password from an LDAP entry.
+ * Fetches a required unique attribute value from an LDAP entry.
*
* @param null|Entry $entry
+ * @param string $attribute
*/
- private function getPassword(Entry $entry)
+ private function getAttributeValue(Entry $entry, $attribute)
{
- if (null === $this->passwordAttribute) {
- return;
- }
-
- if (!$entry->hasAttribute($this->passwordAttribute)) {
- throw new InvalidArgumentException(sprintf('Missing attribute "%s" for user "%s".', $this->passwordAttribute, $entry->getDn()));
+ if (!$entry->hasAttribute($attribute)) {
+ throw new InvalidArgumentException(sprintf('Missing attribute "%s" for user "%s".', $attribute, $entry->getDn()));
}
- $values = $entry->getAttribute($this->passwordAttribute);
+ $values = $entry->getAttribute($attribute);
if (1 !== count($values)) {
- throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $this->passwordAttribute));
+ throw new InvalidArgumentException(sprintf('Attribute "%s" has multiple values.', $attribute));
}
return $values[0];
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
index 3112038e..16baec13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Csrf/Tests/CsrfTokenManagerTest.php
@@ -36,8 +36,8 @@ class CsrfTokenManagerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->generator = $this->getMock('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface');
- $this->storage = $this->getMock('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface');
+ $this->generator = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface')->getMock();
+ $this->storage = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock();
$this->manager = new CsrfTokenManager($this->generator, $this->storage);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 3224fee7..dee7ad16 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -31,8 +31,8 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleSuccess()
{
- $authenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticateToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$providerKey = 'my_firewall';
$credentials = array('username' => 'weaverryan', 'password' => 'all_your_base');
@@ -81,8 +81,8 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleSuccessStopsAfterResponseIsSet()
{
- $authenticator1 = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticator2 = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $authenticator1 = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticator2 = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
// mock the first authenticator to fail, and set a Response
$authenticator1
@@ -111,8 +111,8 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleSuccessWithRememberMe()
{
- $authenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticateToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticateToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$providerKey = 'my_firewall_with_rememberme';
$authenticator
@@ -154,7 +154,7 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleCatchesAuthenticationException()
{
- $authenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
$providerKey = 'my_firewall2';
$authException = new AuthenticationException('Get outta here crazy user with a bad password!');
@@ -186,8 +186,8 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testReturnNullToSkipAuth()
{
- $authenticatorA = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticatorB = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
$providerKey = 'my_firewall3';
$authenticatorA
@@ -240,8 +240,8 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->method('getRequest')
->will($this->returnValue($this->request));
- $this->logger = $this->getMock('Psr\Log\LoggerInterface');
- $this->rememberMeServices = $this->getMock('Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface');
+ $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ $this->rememberMeServices = $this->getMockBuilder('Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface')->getMock();
}
protected function tearDown()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
index 6f36702d..58a3e179 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/GuardAuthenticatorHandlerTest.php
@@ -123,11 +123,11 @@ class GuardAuthenticatorHandlerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
- $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
+ $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$this->request = new Request(array(), array(), array(), array(), array(), array());
- $this->guardAuthenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $this->guardAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
}
protected function tearDown()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index bfcf24b7..e7e323a1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -27,9 +27,9 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
{
$providerKey = 'my_cool_firewall';
- $authenticatorA = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticatorB = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
- $authenticatorC = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $authenticatorA = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticatorB = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
+ $authenticatorC = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
$authenticators = array($authenticatorA, $authenticatorB, $authenticatorC);
// called 2 times - for authenticator A and B (stops on B because of match)
@@ -52,7 +52,7 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
$authenticatorC->expects($this->never())
->method('getUser');
- $mockedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$authenticatorB->expects($this->once())
->method('getUser')
->with($enteredCredentials, $this->userProvider)
@@ -63,7 +63,7 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->with($enteredCredentials, $mockedUser)
// authentication works!
->will($this->returnValue(true));
- $authedToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $authedToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$authenticatorB->expects($this->once())
->method('createAuthenticatedToken')
->with($mockedUser, $providerKey)
@@ -89,7 +89,7 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
{
$providerKey = 'my_uncool_firewall';
- $authenticator = $this->getMock('Symfony\Component\Security\Guard\GuardAuthenticatorInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Guard\GuardAuthenticatorInterface')->getMock();
// make sure the authenticator is used
$this->preAuthenticationToken->expects($this->any())
@@ -101,7 +101,7 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
->method('getCredentials')
->will($this->returnValue('non-null-value'));
- $mockedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$authenticator->expects($this->once())
->method('getUser')
->will($this->returnValue($mockedUser));
@@ -124,7 +124,7 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
// create a token and mark it as NOT authenticated anymore
// this mimics what would happen if a user "changed" between request
- $mockedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $mockedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$token = new PostAuthenticationGuardToken($mockedUser, $providerKey, array('ROLE_USER'));
$token->setAuthenticated(false);
@@ -134,8 +134,8 @@ class GuardAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
- $this->userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
+ $this->userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
+ $this->userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$this->preAuthenticationToken = $this->getMockBuilder('Symfony\Component\Security\Guard\Token\PreAuthenticationGuardToken')
->disableOriginalConstructor()
->getMock();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
index d8ab7aae..b71ad856 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/AccessMapTest.php
@@ -17,7 +17,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase
{
public function testReturnsFirstMatchedPattern()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$requestMatcher1 = $this->getRequestMatcher($request, false);
$requestMatcher2 = $this->getRequestMatcher($request, true);
@@ -30,7 +30,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase
public function testReturnsEmptyPatternIfNoneMatched()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$requestMatcher = $this->getRequestMatcher($request, false);
$map = new AccessMap();
@@ -41,7 +41,7 @@ class AccessMapTest extends \PHPUnit_Framework_TestCase
private function getRequestMatcher($request, $matches)
{
- $requestMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcherInterface');
+ $requestMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcherInterface')->getMock();
$requestMatcher->expects($this->once())
->method('matches')->with($request)
->will($this->returnValue($matches));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
index c97ee692..cb5fb51c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationFailureHandlerTest.php
@@ -27,14 +27,14 @@ class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCas
protected function setUp()
{
- $this->httpKernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
- $this->httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
- $this->logger = $this->getMock('Psr\Log\LoggerInterface');
+ $this->httpKernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+ $this->httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
+ $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
- $this->session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
- $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $this->session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
+ $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$this->request->expects($this->any())->method('getSession')->will($this->returnValue($this->session));
- $this->exception = $this->getMock('Symfony\Component\Security\Core\Exception\AuthenticationException', array('getMessage'));
+ $this->exception = $this->getMockBuilder('Symfony\Component\Security\Core\Exception\AuthenticationException')->setMethods(array('getMessage'))->getMock();
}
public function testForward()
@@ -181,8 +181,8 @@ class DefaultAuthenticationFailureHandlerTest extends \PHPUnit_Framework_TestCas
private function getRequest()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
- $request->attributes = $this->getMock('Symfony\Component\HttpFoundation\ParameterBag');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+ $request->attributes = $this->getMockBuilder('Symfony\Component\HttpFoundation\ParameterBag')->getMock();
return $request;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
index 53729934..8b937c5f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php
@@ -24,10 +24,10 @@ class DefaultAuthenticationSuccessHandlerTest extends \PHPUnit_Framework_TestCas
protected function setUp()
{
- $this->httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
- $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
- $this->request->headers = $this->getMock('Symfony\Component\HttpFoundation\HeaderBag');
- $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $this->httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
+ $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+ $this->request->headers = $this->getMockBuilder('Symfony\Component\HttpFoundation\HeaderBag')->getMock();
+ $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
public function testRequestIsRedirected()
@@ -101,7 +101,7 @@ class DefaultAuthenticationSuccessHandlerTest extends \PHPUnit_Framework_TestCas
public function testTargetPathIsTakenFromTheSession()
{
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$session->expects($this->once())
->method('get')->with('_security.admin.target_path')
->will($this->returnValue('/admin/dashboard'));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
index 8a318868..330b21a4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -34,11 +34,11 @@ class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->successHandler = $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface');
- $this->failureHandler = $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface');
+ $this->successHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface')->getMock();
+ $this->failureHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface')->getMock();
- $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
- $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+ $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
// No methods are invoked on the exception; we just assert on its class
$this->authenticationException = new AuthenticationException();
@@ -47,7 +47,7 @@ class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
public function testOnAuthenticationSuccessFallsBackToDefaultHandlerIfSimpleIsNotASuccessHandler()
{
- $authenticator = $this->getMock('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
$this->successHandler->expects($this->once())
->method('onAuthenticationSuccess')
@@ -117,7 +117,7 @@ class SimpleAuthenticationHandlerTest extends \PHPUnit_Framework_TestCase
public function testOnAuthenticationFailureFallsBackToDefaultHandlerIfSimpleIsNotAFailureHandler()
{
- $authenticator = $this->getMock('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface');
+ $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
$this->failureHandler->expects($this->once())
->method('onAuthenticationFailure')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php
index ca5922c8..359c6de5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/BasicAuthenticationEntryPointTest.php
@@ -18,7 +18,7 @@ class BasicAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
{
public function testStart()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$authException = new AuthenticationException('The exception message');
@@ -31,7 +31,7 @@ class BasicAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
public function testStartWithoutAuthException()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$entryPoint = new BasicAuthenticationEntryPoint('TheRealmName');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
index 4082986e..e9c7f108 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/DigestAuthenticationEntryPointTest.php
@@ -19,7 +19,7 @@ class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
{
public function testStart()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$authenticationException = new AuthenticationException('TheAuthenticationExceptionMessage');
@@ -32,7 +32,7 @@ class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
public function testStartWithNoException()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$entryPoint = new DigestAuthenticationEntryPoint('TheRealmName', 'TheSecret');
$response = $entryPoint->start($request);
@@ -43,7 +43,7 @@ class DigestAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
public function testStartWithNonceExpiredException()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$nonceExpiredException = new NonceExpiredException('TheNonceExpiredExceptionMessage');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
index 75a6be4d..0247e5fc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/EntryPoint/FormAuthenticationEntryPointTest.php
@@ -19,11 +19,11 @@ class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
{
public function testStart()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$response = new Response();
- $httpKernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
- $httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
+ $httpKernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+ $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
$httpUtils
->expects($this->once())
->method('createRedirectResponse')
@@ -38,11 +38,11 @@ class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
public function testStartWithUseForward()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
- $subRequest = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
+ $subRequest = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$response = new Response('', 200);
- $httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
+ $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
$httpUtils
->expects($this->once())
->method('createRequest')
@@ -50,7 +50,7 @@ class FormAuthenticationEntryPointTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($subRequest))
;
- $httpKernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $httpKernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$httpKernel
->expects($this->once())
->method('handle')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
index 61f086a5..fa8a583e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
@@ -24,9 +24,9 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), array());
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -38,7 +38,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($token))
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -56,7 +56,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->method('getPreAuthenticatedData')
->will($this->returnValue($userCredentials));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -72,7 +72,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), array());
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -84,7 +84,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
;
$exception = new AuthenticationException('Authentication failed.');
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -102,7 +102,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->method('getPreAuthenticatedData')
->will($this->returnValue($userCredentials));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -120,7 +120,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), array());
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -132,7 +132,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
;
$exception = new AuthenticationException('Authentication failed.');
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -150,7 +150,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->method('getPreAuthenticatedData')
->will($this->returnValue($userCredentials));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -168,14 +168,14 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
$token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
->will($this->returnValue($token))
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->never())
->method('authenticate')
@@ -191,7 +191,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->method('getPreAuthenticatedData')
->will($this->returnValue($userCredentials));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -209,7 +209,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
$token = new PreAuthenticatedToken('AnotherUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -222,7 +222,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
;
$exception = new AuthenticationException('Authentication failed.');
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -240,7 +240,7 @@ class AbstractPreAuthenticatedListenerTest extends \PHPUnit_Framework_TestCase
->method('getPreAuthenticatedData')
->will($this->returnValue($userCredentials));
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
index af9d5654..7f8eceaa 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
@@ -20,9 +20,9 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -30,21 +30,21 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array('foo' => 'bar'), null)))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->any())
->method('isAuthenticated')
->will($this->returnValue(true))
;
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
->will($this->returnValue($token))
;
- $accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface');
+ $accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();
$accessDecisionManager
->expects($this->once())
->method('decide')
@@ -56,10 +56,10 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
$tokenStorage,
$accessDecisionManager,
$accessMap,
- $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -71,9 +71,9 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleWhenTheTokenIsNotAuthenticated()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -81,21 +81,21 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array('foo' => 'bar'), null)))
;
- $notAuthenticatedToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $notAuthenticatedToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$notAuthenticatedToken
->expects($this->any())
->method('isAuthenticated')
->will($this->returnValue(false))
;
- $authenticatedToken = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $authenticatedToken = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$authenticatedToken
->expects($this->any())
->method('isAuthenticated')
->will($this->returnValue(true))
;
- $authManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authManager
->expects($this->once())
->method('authenticate')
@@ -103,7 +103,7 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($authenticatedToken))
;
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -115,7 +115,7 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($authenticatedToken))
;
- $accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface');
+ $accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();
$accessDecisionManager
->expects($this->once())
->method('decide')
@@ -130,7 +130,7 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
$authManager
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -142,9 +142,9 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleWhenThereIsNoAccessMapEntryMatchingTheRequest()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -152,13 +152,13 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(null, null)))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->never())
->method('isAuthenticated')
;
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -167,12 +167,12 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
$listener = new AccessListener(
$tokenStorage,
- $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock(),
$accessMap,
- $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -187,7 +187,7 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testHandleWhenTheSecurityTokenStorageHasNoToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -196,12 +196,12 @@ class AccessListenerTest extends \PHPUnit_Framework_TestCase
$listener = new AccessListener(
$tokenStorage,
- $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface'),
- $this->getMock('Symfony\Component\Security\Http\AccessMapInterface'),
- $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock(),
+ $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock(),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$listener->handle($event);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
index d99b5623..ba740c41 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
@@ -18,30 +18,30 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
{
public function testHandleWithTokenStorageHavingAToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()))
;
$tokenStorage
->expects($this->never())
->method('setToken')
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->never())
->method('authenticate')
;
$listener = new AnonymousAuthenticationListener($tokenStorage, 'TheSecret', null, $authenticationManager);
- $listener->handle($this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false));
+ $listener->handle($this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock());
}
public function testHandleWithTokenStorageHavingNoToken()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -50,7 +50,7 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$anonymousToken = new AnonymousToken('TheSecret', 'anon.', array());
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -67,21 +67,21 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
;
$listener = new AnonymousAuthenticationListener($tokenStorage, 'TheSecret', null, $authenticationManager);
- $listener->handle($this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false));
+ $listener->handle($this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock());
}
public function testHandledEventIsLogged()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->once())
->method('info')
->with('Populated the TokenStorage with an anonymous Token.')
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new AnonymousAuthenticationListener($tokenStorage, 'TheSecret', $logger, $authenticationManager);
- $listener->handle($this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false));
+ $listener->handle($this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock());
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
index 8901cb2d..62c23f61 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -27,9 +27,9 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
'PHP_AUTH_PW' => 'ThePassword',
));
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -41,7 +41,7 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo($token))
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->once())
->method('authenticate')
@@ -53,10 +53,10 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$tokenStorage,
$authenticationManager,
'TheProviderKey',
- $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -73,9 +73,9 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
'PHP_AUTH_PW' => 'ThePassword',
));
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -88,7 +88,7 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$response = new Response();
- $authenticationEntryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $authenticationEntryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$authenticationEntryPoint
->expects($this->any())
->method('start')
@@ -98,12 +98,12 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$listener = new BasicAuthenticationListener(
$tokenStorage,
- new AuthenticationProviderManager(array($this->getMock('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface'))),
+ new AuthenticationProviderManager(array($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock())),
'TheProviderKey',
$authenticationEntryPoint
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -122,7 +122,7 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
{
$request = new Request();
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->never())
->method('getToken')
@@ -130,12 +130,12 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$listener = new BasicAuthenticationListener(
$tokenStorage,
- $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock(),
'TheProviderKey',
- $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -151,14 +151,14 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$token = new UsernamePasswordToken('TheUsername', 'ThePassword', 'TheProviderKey', array('ROLE_FOO'));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
->will($this->returnValue($token))
;
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$authenticationManager
->expects($this->never())
->method('authenticate')
@@ -168,10 +168,10 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$tokenStorage,
$authenticationManager,
'TheProviderKey',
- $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock()
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -188,10 +188,10 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
public function testItRequiresProviderKey()
{
new BasicAuthenticationListener(
- $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'),
- $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock(),
'',
- $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')
+ $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock()
);
}
@@ -204,7 +204,7 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$token = new PreAuthenticatedToken('TheUser', 'TheCredentials', 'TheProviderKey', array('ROLE_FOO'));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
->method('getToken')
@@ -217,7 +217,7 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$response = new Response();
- $authenticationEntryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $authenticationEntryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$authenticationEntryPoint
->expects($this->any())
->method('start')
@@ -227,12 +227,12 @@ class BasicAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$listener = new BasicAuthenticationListener(
$tokenStorage,
- new AuthenticationProviderManager(array($this->getMock('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface'))),
+ new AuthenticationProviderManager(array($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface')->getMock())),
'TheProviderKey',
$authenticationEntryPoint
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
index 1465224e..ae6c39f3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ChannelListenerTest.php
@@ -18,14 +18,14 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
{
public function testHandleWithNotSecuredRequestAndHttpChannel()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$request
->expects($this->any())
->method('isSecure')
->will($this->returnValue(false))
;
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -33,13 +33,13 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array(), 'http')))
;
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint
->expects($this->never())
->method('start')
;
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -56,14 +56,14 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleWithSecuredRequestAndHttpsChannel()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$request
->expects($this->any())
->method('isSecure')
->will($this->returnValue(true))
;
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -71,13 +71,13 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array(), 'https')))
;
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint
->expects($this->never())
->method('start')
;
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -94,7 +94,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleWithNotSecuredRequestAndHttpsChannel()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$request
->expects($this->any())
->method('isSecure')
@@ -103,7 +103,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
$response = new Response();
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -111,7 +111,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array(), 'https')))
;
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint
->expects($this->once())
->method('start')
@@ -119,7 +119,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($response))
;
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
@@ -137,7 +137,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleWithSecuredRequestAndHttpChannel()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$request
->expects($this->any())
->method('isSecure')
@@ -146,7 +146,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
$response = new Response();
- $accessMap = $this->getMock('Symfony\Component\Security\Http\AccessMapInterface');
+ $accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
$accessMap
->expects($this->any())
->method('getPatterns')
@@ -154,7 +154,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array(), 'http')))
;
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint
->expects($this->once())
->method('start')
@@ -162,7 +162,7 @@ class ChannelListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($response))
;
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 02133307..3af62014 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -33,7 +33,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
public function testItRequiresContextKey()
{
new ContextListener(
- $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
array(),
''
);
@@ -46,7 +46,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
public function testUserProvidersNeedToImplementAnInterface()
{
new ContextListener(
- $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
array(new \stdClass()),
'key123'
);
@@ -102,7 +102,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
$request->setSession($session);
$event = new FilterResponseEvent(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
$request,
HttpKernelInterface::MASTER_REQUEST,
new Response()
@@ -121,7 +121,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
$request->setSession($session);
$event = new FilterResponseEvent(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
$request,
HttpKernelInterface::MASTER_REQUEST,
new Response()
@@ -138,12 +138,12 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testInvalidTokenInSession($token)
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
->disableOriginalConstructor()
->getMock();
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$event->expects($this->any())
->method('getRequest')
@@ -177,8 +177,8 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleAddsKernelResponseListener()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
->disableOriginalConstructor()
->getMock();
@@ -190,7 +190,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(true));
$event->expects($this->any())
->method('getRequest')
- ->will($this->returnValue($this->getMock('Symfony\Component\HttpFoundation\Request')));
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock()));
$dispatcher->expects($this->once())
->method('addListener')
@@ -201,15 +201,15 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
public function testOnKernelResponseListenerRemovesItself()
{
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FilterResponseEvent')
->disableOriginalConstructor()
->getMock();
$listener = new ContextListener($tokenStorage, array(), 'key123', null, $dispatcher);
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->expects($this->any())
->method('hasSession')
->will($this->returnValue(true));
@@ -230,7 +230,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
public function testHandleRemovesTokenIfNoPreviousSessionWasFound()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->expects($this->any())->method('hasPreviousSession')->will($this->returnValue(false));
$event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
@@ -238,7 +238,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
->getMock();
$event->expects($this->any())->method('getRequest')->will($this->returnValue($request));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage->expects($this->once())->method('setToken')->with(null);
$listener = new ContextListener($tokenStorage, array(), 'key123');
@@ -261,7 +261,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase
$request->cookies->set('MOCKSESSID', true);
$event = new FilterResponseEvent(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
$request,
HttpKernelInterface::MASTER_REQUEST,
new Response()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
index 80b2dc41..2a29db70 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/DigestAuthenticationListenerTest.php
@@ -34,12 +34,12 @@ class DigestAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$entryPoint = new DigestAuthenticationEntryPoint($realm, $secret);
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->method('getPassword')->willReturn($password);
$providerKey = 'TheProviderKey';
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->once())
->method('getToken')
@@ -51,12 +51,12 @@ class DigestAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo(new UsernamePasswordToken($user, $password, $providerKey)))
;
- $userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$userProvider->method('loadUserByUsername')->willReturn($user);
$listener = new DigestAuthenticationListener($tokenStorage, $userProvider, $providerKey, $entryPoint);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
index db0a242d..c1f31d7c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
@@ -69,7 +69,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
{
$event = $this->createEvent(new AuthenticationException());
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint->expects($this->once())->method('start')->will($this->returnValue('NOT A RESPONSE'));
$listener = $this->createExceptionListener(null, null, null, $entryPoint);
@@ -98,12 +98,12 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testAccessDeniedExceptionFullFledgedAndWithoutAccessDeniedHandlerAndWithErrorPage(\Exception $exception, \Exception $eventException = null)
{
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$kernel->expects($this->once())->method('handle')->will($this->returnValue(new Response('error')));
$event = $this->createEvent($exception, $kernel);
- $httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
+ $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
$httpUtils->expects($this->once())->method('createRequest')->will($this->returnValue(Request::create('/error')));
$listener = $this->createExceptionListener(null, $this->createTrustResolver(true), $httpUtils, null, '/error');
@@ -120,7 +120,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
{
$event = $this->createEvent($exception);
- $accessDeniedHandler = $this->getMock('Symfony\Component\Security\Http\Authorization\AccessDeniedHandlerInterface');
+ $accessDeniedHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authorization\AccessDeniedHandlerInterface')->getMock();
$accessDeniedHandler->expects($this->once())->method('handle')->will($this->returnValue(new Response('error')));
$listener = $this->createExceptionListener(null, $this->createTrustResolver(true), null, null, null, $accessDeniedHandler);
@@ -137,8 +137,8 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
{
$event = $this->createEvent($exception);
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $tokenStorage->expects($this->once())->method('getToken')->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')));
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $tokenStorage->expects($this->once())->method('getToken')->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
$listener = $this->createExceptionListener($tokenStorage, $this->createTrustResolver(false), null, $this->createEntryPoint());
$listener->onKernelException($event);
@@ -160,7 +160,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
private function createEntryPoint()
{
- $entryPoint = $this->getMock('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface');
+ $entryPoint = $this->getMockBuilder('Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface')->getMock();
$entryPoint->expects($this->once())->method('start')->will($this->returnValue(new Response('OK')));
return $entryPoint;
@@ -168,7 +168,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
private function createTrustResolver($fullFledged)
{
- $trustResolver = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface');
+ $trustResolver = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface')->getMock();
$trustResolver->expects($this->once())->method('isFullFledged')->will($this->returnValue($fullFledged));
return $trustResolver;
@@ -177,7 +177,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
private function createEvent(\Exception $exception, $kernel = null)
{
if (null === $kernel) {
- $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+ $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
}
return new GetResponseForExceptionEvent($kernel, Request::create('/'), HttpKernelInterface::MASTER_REQUEST, $exception);
@@ -186,9 +186,9 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
private function createExceptionListener(TokenStorageInterface $tokenStorage = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null)
{
return new ExceptionListener(
- $tokenStorage ?: $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'),
- $trustResolver ?: $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'),
- $httpUtils ?: $this->getMock('Symfony\Component\Security\Http\HttpUtils'),
+ $tokenStorage ?: $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
+ $trustResolver ?: $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface')->getMock(),
+ $httpUtils ?: $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock(),
'key',
$authenticationEntryPoint,
$errorPage,
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
index 367c810f..8f6db59d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
@@ -172,12 +172,12 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase
private function getTokenManager()
{
- return $this->getMock('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Csrf\CsrfTokenManagerInterface')->getMock();
}
private function getTokenStorage()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
}
private function getGetResponseEvent()
@@ -195,7 +195,7 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase
private function getHandler()
{
- return $this->getMock('Symfony\Component\Security\Http\Logout\LogoutHandlerInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Http\Logout\LogoutHandlerInterface')->getMock();
}
private function getHttpUtils()
@@ -225,11 +225,11 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase
private function getSuccessHandler()
{
- return $this->getMock('Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Http\Logout\LogoutSuccessHandlerInterface')->getMock();
}
private function getToken()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
index cd2f1b87..141b4cc2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -25,7 +25,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
$tokenStorage
->expects($this->once())
->method('getToken')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()))
;
$tokenStorage
@@ -75,7 +75,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
$service
->expects($this->once())
->method('autoLogin')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()))
;
$service
@@ -117,7 +117,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
$service
->expects($this->once())
->method('autoLogin')
- ->will($this->returnValue($this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()))
;
$service
@@ -152,7 +152,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(null))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service
->expects($this->once())
->method('autoLogin')
@@ -191,7 +191,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(null))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service
->expects($this->once())
->method('autoLogin')
@@ -210,14 +210,14 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($token))
;
- $session = $this->getMock('\Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $session = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$session
->expects($this->once())
->method('isStarted')
->will($this->returnValue(true))
;
- $request = $this->getMock('\Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')->getMock();
$request
->expects($this->once())
->method('hasSession')
@@ -256,7 +256,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(null))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service
->expects($this->once())
->method('autoLogin')
@@ -275,7 +275,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($token))
;
- $session = $this->getMock('\Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $session = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$session
->expects($this->once())
->method('isStarted')
@@ -286,7 +286,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->method('migrate')
;
- $request = $this->getMock('\Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request')->getMock();
$request
->expects($this->any())
->method('hasSession')
@@ -319,7 +319,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(null))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service
->expects($this->once())
->method('autoLogin')
@@ -360,12 +360,12 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
protected function getGetResponseEvent()
{
- return $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ return $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
}
protected function getFilterResponseEvent()
{
- return $this->getMock('Symfony\Component\HttpKernel\Event\FilterResponseEvent', array(), array(), '', false);
+ return $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FilterResponseEvent')->disableOriginalConstructor()->getMock();
}
protected function getListener($withDispatcher = false, $catchExceptions = true, $withSessionStrategy = false)
@@ -385,31 +385,31 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
protected function getLogger()
{
- return $this->getMock('Psr\Log\LoggerInterface');
+ return $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
}
protected function getManager()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
}
protected function getService()
{
- return $this->getMock('Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface')->getMock();
}
protected function getTokenStorage()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
}
protected function getDispatcher()
{
- return $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ return $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
}
private function getSessionStrategy()
{
- return $this->getMock('\Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface');
+ return $this->getMockBuilder('\Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
index dad7aadc..985152c7 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -24,9 +24,9 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), $serverVars);
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new RemoteUserAuthenticationListener(
$tokenStorage,
@@ -48,9 +48,9 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
{
$request = new Request(array(), array(), array(), array(), array(), array());
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new RemoteUserAuthenticationListener(
$tokenStorage,
@@ -71,9 +71,9 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), array(
'TheUserKey' => 'TheUser',
));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new RemoteUserAuthenticationListener(
$tokenStorage,
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
index adf91b1c..90ce1e6f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -42,7 +42,7 @@ class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->token))
;
- $simpleAuthenticator = $this->getMock('Symfony\Component\Security\Http\Authentication\SimplePreAuthenticatorInterface');
+ $simpleAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\SimplePreAuthenticatorInterface')->getMock();
$simpleAuthenticator
->expects($this->once())
->method('createToken')
@@ -79,7 +79,7 @@ class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo(null))
;
- $simpleAuthenticator = $this->getMock('Symfony\Component\Security\Http\Authentication\SimplePreAuthenticatorInterface');
+ $simpleAuthenticator = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\SimplePreAuthenticatorInterface')->getMock();
$simpleAuthenticator
->expects($this->once())
->method('createToken')
@@ -99,20 +99,20 @@ class SimplePreAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
->getMock()
;
- $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$this->request = new Request(array(), array(), array(), array(), array(), array());
- $this->event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $this->event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$this->event
->expects($this->any())
->method('getRequest')
->will($this->returnValue($this->request))
;
- $this->logger = $this->getMock('Psr\Log\LoggerInterface');
- $this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $this->token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
+ $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $this->token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
protected function tearDown()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index 28d73e0c..b80f8c60 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -31,13 +31,13 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
- $this->userProvider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
- $this->userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
- $this->accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface');
- $this->request = $this->getMock('Symfony\Component\HttpFoundation\Request');
- $this->request->query = $this->getMock('Symfony\Component\HttpFoundation\ParameterBag');
- $this->request->server = $this->getMock('Symfony\Component\HttpFoundation\ServerBag');
+ $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
+ $this->userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
+ $this->userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
+ $this->accessDecisionManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface')->getMock();
+ $this->request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
+ $this->request->query = $this->getMockBuilder('Symfony\Component\HttpFoundation\ParameterBag')->getMock();
+ $this->request->server = $this->getMockBuilder('Symfony\Component\HttpFoundation\ServerBag')->getMock();
$this->event = $this->getEvent($this->request);
}
@@ -66,7 +66,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testExitUserThrowsAuthenticationExceptionIfOriginalTokenCannotBeFound()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array($this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleInterface')->getMock()));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('_exit'));
@@ -104,8 +104,8 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
public function testExitUserDispatchesEventWithRefreshedUser()
{
- $originalUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $refreshedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $originalUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $refreshedUser = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$this
->userProvider
->expects($this->any())
@@ -145,7 +145,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
->method('all')
->will($this->returnValue(array()));
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher
->expects($this->once())
->method('dispatch')
@@ -201,7 +201,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
->method('getUri')
->willReturn('/');
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher
->expects($this->never())
->method('dispatch')
@@ -216,7 +216,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testSwitchUserIsDisallowed()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
+ $token = $this->getToken(array($this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleInterface')->getMock()));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
$this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba'));
@@ -231,8 +231,8 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
public function testSwitchUser()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $token = $this->getToken(array($this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleInterface')->getMock()));
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->any())->method('getRoles')->will($this->returnValue(array()));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
@@ -261,8 +261,8 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
public function testSwitchUserKeepsOtherQueryStringParameters()
{
- $token = $this->getToken(array($this->getMock('Symfony\Component\Security\Core\Role\RoleInterface')));
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $token = $this->getToken(array($this->getMockBuilder('Symfony\Component\Security\Core\Role\RoleInterface')->getMock()));
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user->expects($this->any())->method('getRoles')->will($this->returnValue(array()));
$this->tokenStorage->expects($this->any())->method('getToken')->will($this->returnValue($token));
@@ -303,7 +303,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
private function getToken(array $roles = array())
{
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token->expects($this->any())
->method('getRoles')
->will($this->returnValue($roles));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
index 66690d97..3e58e69e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -31,9 +31,9 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$request = new Request(array(), array(), array(), array(), array(), $serverVars);
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new X509AuthenticationListener($tokenStorage, $authenticationManager, 'TheProviderKey');
@@ -60,9 +60,9 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
$credentials = 'CN=Sample certificate DN/emailAddress='.$emailAddress;
$request = new Request(array(), array(), array(), array(), array(), array('SSL_CLIENT_S_DN' => $credentials));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new X509AuthenticationListener($tokenStorage, $authenticationManager, 'TheProviderKey');
@@ -88,9 +88,9 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
{
$request = new Request(array(), array(), array(), array(), array(), array());
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new X509AuthenticationListener($tokenStorage, $authenticationManager, 'TheProviderKey');
@@ -108,9 +108,9 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
'TheUserKey' => 'TheUser',
'TheCredentialsKey' => 'TheCredentials',
));
- $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+ $tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
- $authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface');
+ $authenticationManager = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock();
$listener = new X509AuthenticationListener($tokenStorage, $authenticationManager, 'TheProviderKey', 'TheUserKey', 'TheCredentialsKey');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
index 85a57ab8..016c72df 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallMapTest.php
@@ -22,7 +22,7 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
$request = new Request();
- $notMatchingMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $notMatchingMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$notMatchingMatcher
->expects($this->once())
->method('matches')
@@ -30,27 +30,27 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(false))
;
- $map->add($notMatchingMatcher, array($this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface')));
+ $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
- $matchingMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $matchingMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$matchingMatcher
->expects($this->once())
->method('matches')
->with($this->equalTo($request))
->will($this->returnValue(true))
;
- $theListener = $this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface');
- $theException = $this->getMock('Symfony\Component\Security\Http\Firewall\ExceptionListener', array(), array(), '', false);
+ $theListener = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
+ $theException = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ExceptionListener')->disableOriginalConstructor()->getMock();
$map->add($matchingMatcher, array($theListener), $theException);
- $tooLateMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $tooLateMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$tooLateMatcher
->expects($this->never())
->method('matches')
;
- $map->add($tooLateMatcher, array($this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface')));
+ $map->add($tooLateMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
list($listeners, $exception) = $map->getListeners($request);
@@ -64,7 +64,7 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
$request = new Request();
- $notMatchingMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $notMatchingMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$notMatchingMatcher
->expects($this->once())
->method('matches')
@@ -72,20 +72,20 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(false))
;
- $map->add($notMatchingMatcher, array($this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface')));
+ $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
- $theListener = $this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface');
- $theException = $this->getMock('Symfony\Component\Security\Http\Firewall\ExceptionListener', array(), array(), '', false);
+ $theListener = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
+ $theException = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ExceptionListener')->disableOriginalConstructor()->getMock();
$map->add(null, array($theListener), $theException);
- $tooLateMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $tooLateMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$tooLateMatcher
->expects($this->never())
->method('matches')
;
- $map->add($tooLateMatcher, array($this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface')));
+ $map->add($tooLateMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
list($listeners, $exception) = $map->getListeners($request);
@@ -99,7 +99,7 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
$request = new Request();
- $notMatchingMatcher = $this->getMock('Symfony\Component\HttpFoundation\RequestMatcher');
+ $notMatchingMatcher = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestMatcher')->getMock();
$notMatchingMatcher
->expects($this->once())
->method('matches')
@@ -107,7 +107,7 @@ class FirewallMapTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(false))
;
- $map->add($notMatchingMatcher, array($this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface')));
+ $map->add($notMatchingMatcher, array($this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock()));
list($listeners, $exception) = $map->getListeners($request);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php
index 1e0c1ef0..20da3ae3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/FirewallTest.php
@@ -20,18 +20,18 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
{
public function testOnKernelRequestRegistersExceptionListener()
{
- $dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+ $dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
- $listener = $this->getMock('Symfony\Component\Security\Http\Firewall\ExceptionListener', array(), array(), '', false);
+ $listener = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ExceptionListener')->disableOriginalConstructor()->getMock();
$listener
->expects($this->once())
->method('register')
->with($this->equalTo($dispatcher))
;
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false);
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
- $map = $this->getMock('Symfony\Component\Security\Http\FirewallMapInterface');
+ $map = $this->getMockBuilder('Symfony\Component\Security\Http\FirewallMapInterface')->getMock();
$map
->expects($this->once())
->method('getListeners')
@@ -39,7 +39,7 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(array(array(), $listener)))
;
- $event = new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);
+ $event = new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
$firewall = new Firewall($map, $dispatcher);
$firewall->onKernelRequest($event);
@@ -49,59 +49,59 @@ class FirewallTest extends \PHPUnit_Framework_TestCase
{
$response = new Response();
- $first = $this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface');
+ $first = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
$first
->expects($this->once())
->method('handle')
;
- $second = $this->getMock('Symfony\Component\Security\Http\Firewall\ListenerInterface');
+ $second = $this->getMockBuilder('Symfony\Component\Security\Http\Firewall\ListenerInterface')->getMock();
$second
->expects($this->never())
->method('handle')
;
- $map = $this->getMock('Symfony\Component\Security\Http\FirewallMapInterface');
+ $map = $this->getMockBuilder('Symfony\Component\Security\Http\FirewallMapInterface')->getMock();
$map
->expects($this->once())
->method('getListeners')
->will($this->returnValue(array(array($first, $second), null)))
;
- $event = $this->getMock(
- 'Symfony\Component\HttpKernel\Event\GetResponseEvent',
- array('hasResponse'),
- array(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
- $this->getMock('Symfony\Component\HttpFoundation\Request', array(), array(), '', false, false),
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
+ ->setMethods(array('hasResponse'))
+ ->setConstructorArgs(array(
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
+ $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock(),
HttpKernelInterface::MASTER_REQUEST,
- )
- );
+ ))
+ ->getMock()
+ ;
$event
->expects($this->once())
->method('hasResponse')
->will($this->returnValue(true))
;
- $firewall = new Firewall($map, $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'));
+ $firewall = new Firewall($map, $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock());
$firewall->onKernelRequest($event);
}
public function testOnKernelRequestWithSubRequest()
{
- $map = $this->getMock('Symfony\Component\Security\Http\FirewallMapInterface');
+ $map = $this->getMockBuilder('Symfony\Component\Security\Http\FirewallMapInterface')->getMock();
$map
->expects($this->never())
->method('getListeners')
;
$event = new GetResponseEvent(
- $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
- $this->getMock('Symfony\Component\HttpFoundation\Request'),
+ $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(),
+ $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock(),
HttpKernelInterface::SUB_REQUEST
);
- $firewall = new Firewall($map, $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'));
+ $firewall = new Firewall($map, $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock());
$firewall->onKernelRequest($event);
$this->assertFalse($event->hasResponse());
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
index 45a02815..bb432a0c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
@@ -39,7 +39,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCreateRedirectResponseWithRouteName()
{
- $utils = new HttpUtils($urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface'));
+ $utils = new HttpUtils($urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock());
$urlGenerator
->expects($this->any())
@@ -50,7 +50,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
$urlGenerator
->expects($this->any())
->method('getContext')
- ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock()))
;
$response = $utils->createRedirectResponse($this->getRequest(), 'foobar');
@@ -73,7 +73,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCreateRequestWithRouteName()
{
- $utils = new HttpUtils($urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface'));
+ $utils = new HttpUtils($urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock());
$urlGenerator
->expects($this->once())
@@ -83,7 +83,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
$urlGenerator
->expects($this->any())
->method('getContext')
- ->will($this->returnValue($this->getMock('Symfony\Component\Routing\RequestContext')))
+ ->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RequestContext')->getMock()))
;
$subRequest = $utils->createRequest($this->getRequest(), 'foobar');
@@ -93,7 +93,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCreateRequestWithAbsoluteUrl()
{
- $utils = new HttpUtils($this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface'));
+ $utils = new HttpUtils($this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock());
$subRequest = $utils->createRequest($this->getRequest(), 'http://symfony.com/');
$this->assertEquals('/', $subRequest->getPathInfo());
@@ -102,7 +102,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCreateRequestPassesSessionToTheNewRequest()
{
$request = $this->getRequest();
- $request->setSession($session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface'));
+ $request->setSession($session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
$utils = new HttpUtils($this->getUrlGenerator());
$subRequest = $utils->createRequest($request, '/foobar');
@@ -148,7 +148,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCheckRequestPathWithUrlMatcherAndResourceNotFound()
{
- $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
+ $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
->method('match')
@@ -163,7 +163,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCheckRequestPathWithUrlMatcherAndMethodNotAllowed()
{
$request = $this->getRequest();
- $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
->method('matchRequest')
@@ -177,7 +177,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCheckRequestPathWithUrlMatcherAndResourceFoundByUrl()
{
- $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
+ $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
->method('match')
@@ -192,7 +192,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
public function testCheckRequestPathWithUrlMatcherAndResourceFoundByRequest()
{
$request = $this->getRequest();
- $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\RequestMatcherInterface');
+ $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
->method('matchRequest')
@@ -209,7 +209,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
*/
public function testCheckRequestPathWithUrlMatcherLoadingException()
{
- $urlMatcher = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
+ $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
->method('match')
@@ -250,7 +250,7 @@ class HttpUtilsTest extends \PHPUnit_Framework_TestCase
private function getUrlGenerator($generatedUrl = '/foo/bar')
{
- $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
+ $urlGenerator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGeneratorInterface')->getMock();
$urlGenerator
->expects($this->any())
->method('generate')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
index 84745040..300f28dc 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/CookieClearingLogoutHandlerTest.php
@@ -22,7 +22,7 @@ class CookieClearingLogoutHandlerTest extends \PHPUnit_Framework_TestCase
{
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$handler = new CookieClearingLogoutHandler(array('foo' => array('path' => '/foo', 'domain' => 'foo.foo'), 'foo2' => array('path' => null, 'domain' => null)));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php
index 8a94e533..7f20f67b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/DefaultLogoutSuccessHandlerTest.php
@@ -18,10 +18,10 @@ class DefaultLogoutSuccessHandlerTest extends \PHPUnit_Framework_TestCase
{
public function testLogout()
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$response = new Response();
- $httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
+ $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
$httpUtils->expects($this->once())
->method('createRedirectResponse')
->with($request, '/dashboard')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php
index c3429951..6a435d74 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Logout/SessionLogoutHandlerTest.php
@@ -20,9 +20,9 @@ class SessionLogoutHandlerTest extends \PHPUnit_Framework_TestCase
{
$handler = new SessionLogoutHandler();
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$response = new Response();
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\Session', array(), array(), '', false);
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
$request
->expects($this->once())
@@ -35,6 +35,6 @@ class SessionLogoutHandlerTest extends \PHPUnit_Framework_TestCase
->method('invalidate')
;
- $handler->logout($request, $response, $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
+ $handler->logout($request, $response, $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
index 7495398e..84d11e78 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -62,7 +62,7 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->cookies->set('foo', 'foo');
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getRoles')
@@ -90,7 +90,7 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, $options);
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service->logout($request, $response, $token);
$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Cookie', $cookie);
@@ -125,8 +125,8 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
$request = new Request();
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -148,8 +148,8 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => false, 'remember_me_parameter' => 'foo', 'path' => null, 'domain' => null));
$request = new Request();
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -172,8 +172,8 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
$request = new Request();
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -199,8 +199,8 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->request->set('foo', array('bar' => $value));
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -226,8 +226,8 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->request->set('foo', $value);
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -290,7 +290,7 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase
protected function getProvider()
{
- $provider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ $provider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$provider
->expects($this->any())
->method('supportsClass')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index 30cf4a23..6628b5bb 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -60,7 +60,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$tokenValue = 'foovalue',
)));
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('loadTokenBySeries')
@@ -79,7 +79,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('loadTokenBySeries')
@@ -104,7 +104,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$service->setTokenProvider($tokenProvider);
$tokenProvider
@@ -135,7 +135,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('loadTokenBySeries')
@@ -150,7 +150,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
public function testAutoLogin()
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getRoles')
@@ -169,7 +169,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('loadTokenBySeries')
@@ -192,9 +192,9 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', $this->encodeCookie(array('fooseries', 'foovalue')));
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('deleteTokenBySeries')
@@ -218,9 +218,9 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null));
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->never())
->method('deleteTokenBySeries')
@@ -241,9 +241,9 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$request->cookies->set('foo', 'somefoovalue');
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->never())
->method('deleteTokenBySeries')
@@ -271,20 +271,20 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
$request = new Request();
$response = new Response();
- $account = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $account = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$account
->expects($this->once())
->method('getUsername')
->will($this->returnValue('foo'))
;
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->any())
->method('getUser')
->will($this->returnValue($account))
;
- $tokenProvider = $this->getMock('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface');
+ $tokenProvider = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\RememberMe\TokenProviderInterface')->getMock();
$tokenProvider
->expects($this->once())
->method('createNewToken')
@@ -326,7 +326,7 @@ class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_Test
protected function getProvider()
{
- $provider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ $provider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$provider
->expects($this->any())
->method('supportsClass')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
index 23f7df70..0db86e74 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
@@ -83,7 +83,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase
private function getResponse()
{
$response = new Response();
- $response->headers = $this->getMock('Symfony\Component\HttpFoundation\ResponseHeaderBag');
+ $response->headers = $this->getMockBuilder('Symfony\Component\HttpFoundation\ResponseHeaderBag')->getMock();
return $response;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
index ee8a99e3..ce1048e3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -62,7 +62,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->cookies->set('foo', base64_encode('class:'.base64_encode('foouser').':123456789:fooHash'));
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getPassword')
@@ -87,7 +87,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$request->cookies->set('foo', $this->getCookie('fooclass', 'foouser', time() - 1, 'foopass'));
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getPassword')
@@ -112,7 +112,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
*/
public function testAutoLogin($username)
{
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getRoles')
@@ -156,7 +156,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, array('name' => 'foo', 'path' => null, 'domain' => null, 'secure' => true, 'httponly' => false));
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$service->logout($request, $response, $token);
@@ -186,7 +186,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$service = $this->getService(null, array('name' => 'foo', 'always_remember_me' => true, 'path' => null, 'domain' => null));
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$token
->expects($this->once())
->method('getUser')
@@ -208,8 +208,8 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
$request = new Request();
$response = new Response();
- $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
- $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
+ $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
+ $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$user
->expects($this->once())
->method('getPassword')
@@ -272,7 +272,7 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
protected function getProvider()
{
- $provider = $this->getMock('Symfony\Component\Security\Core\User\UserProviderInterface');
+ $provider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$provider
->expects($this->any())
->method('supportsClass')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
index a1f960fd..2d540748 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -39,7 +39,7 @@ class SessionAuthenticationStrategyTest extends \PHPUnit_Framework_TestCase
public function testSessionIsMigrated()
{
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$session->expects($this->once())->method('migrate')->with($this->equalTo(true));
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::MIGRATE);
@@ -48,7 +48,7 @@ class SessionAuthenticationStrategyTest extends \PHPUnit_Framework_TestCase
public function testSessionIsInvalidated()
{
- $session = $this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface');
+ $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock();
$session->expects($this->once())->method('invalidate');
$strategy = new SessionAuthenticationStrategy(SessionAuthenticationStrategy::INVALIDATE);
@@ -57,7 +57,7 @@ class SessionAuthenticationStrategyTest extends \PHPUnit_Framework_TestCase
private function getRequest($session = null)
{
- $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+ $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
if (null !== $session) {
$request->expects($this->any())->method('getSession')->will($this->returnValue($session));
@@ -68,6 +68,6 @@ class SessionAuthenticationStrategyTest extends \PHPUnit_Framework_TestCase
private function getToken()
{
- return $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+ return $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
index eca14d3c..22ba421a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Security/Tests/Http/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
@@ -24,16 +24,16 @@ class UsernamePasswordFormAuthenticationListenerTest extends \PHPUnit_Framework_
public function testHandleWhenUsernameLength($username, $ok)
{
$request = Request::create('/login_check', 'POST', array('_username' => $username));
- $request->setSession($this->getMock('Symfony\Component\HttpFoundation\Session\SessionInterface'));
+ $request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
- $httpUtils = $this->getMock('Symfony\Component\Security\Http\HttpUtils');
+ $httpUtils = $this->getMockBuilder('Symfony\Component\Security\Http\HttpUtils')->getMock();
$httpUtils
->expects($this->any())
->method('checkRequestPath')
->will($this->returnValue(true))
;
- $failureHandler = $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface');
+ $failureHandler = $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface')->getMock();
$failureHandler
->expects($ok ? $this->never() : $this->once())
->method('onAuthenticationFailure')
@@ -48,17 +48,17 @@ class UsernamePasswordFormAuthenticationListenerTest extends \PHPUnit_Framework_
;
$listener = new UsernamePasswordFormAuthenticationListener(
- $this->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
$authenticationManager,
- $this->getMock('Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface')->getMock(),
$httpUtils,
'TheProviderKey',
- $this->getMock('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface'),
+ $this->getMockBuilder('Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface')->getMock(),
$failureHandler,
array('require_previous_session' => false)
);
- $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseEvent', array(), array(), '', false);
+ $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')->disableOriginalConstructor()->getMock();
$event
->expects($this->any())
->method('getRequest')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
index 69fd8067..1f41948d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -30,8 +30,8 @@ class MaxDepth
public function __construct(array $data)
{
- if (!isset($data['value']) || !$data['value']) {
- throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
+ if (!isset($data['value'])) {
+ throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', get_class($this)));
}
if (!is_int($data['value']) || $data['value'] <= 0) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index e891bb51..2b3433c5 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Normalizer;
use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Serializer\Exception\CircularReferenceException;
use Symfony\Component\Serializer\Exception\LogicException;
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -260,6 +261,16 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
}
}
+ // JSON only has a Number type corresponding to both int and float PHP types.
+ // PHP's json_encode, JavaScript's JSON.stringify, Go's json.Marshal as well as most other JSON encoders convert
+ // floating-point numbers like 12.0 to 12 (the decimal part is dropped when possible).
+ // PHP's json_decode automatically converts Numbers without a decimal part to integers.
+ // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
+ // a float is expected.
+ if (Type::BUILTIN_TYPE_FLOAT === $builtinType && is_int($data) && false !== strpos($format, JsonEncoder::FORMAT)) {
+ return (float) $data;
+ }
+
if (call_user_func('is_'.$builtinType, $data)) {
return $data;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
index 5594cb5f..d281c1d2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
@@ -20,26 +20,32 @@ class MaxDepthTest extends \PHPUnit_Framework_TestCase
{
/**
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+ * @expectedExceptionMessage Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" should be set.
*/
public function testNotSetMaxDepthParameter()
{
new MaxDepth(array());
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
- public function testEmptyMaxDepthParameter()
+ public function provideInvalidValues()
{
- new MaxDepth(array('value' => ''));
+ return array(
+ array(''),
+ array('foo'),
+ array('1'),
+ array(0),
+ );
}
/**
+ * @dataProvider provideInvalidValues
+ *
* @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
+ * @expectedExceptionMessage Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" must be a positive integer.
*/
- public function testNotAnIntMaxDepthParameter()
+ public function testNotAnIntMaxDepthParameter($value)
{
- new MaxDepth(array('value' => 'foo'));
+ new MaxDepth(array('value' => $value));
}
public function testMaxDepthParameters()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
index c87ab21b..7818aeaf 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
@@ -61,7 +61,7 @@ class JsonDecodeTest extends \PHPUnit_Framework_TestCase
*/
public function testDecodeWithException($value)
{
- $this->decode->decode($value, JsonEncoder::FORMAT);
+ $this->decode->decode($value, JsonEncoder::FORMAT);
}
public function decodeProviderException()
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
index d255b21d..291c0f09 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
@@ -54,6 +54,6 @@ class JsonEncodeTest extends \PHPUnit_Framework_TestCase
*/
public function testEncodeWithError()
{
- $this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
+ $this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
index 629c17b7..9ce3d020 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/ClassMetadataTest.php
@@ -28,10 +28,10 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
{
$classMetadata = new ClassMetadata('c');
- $a1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $a1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$a1->method('getName')->willReturn('a1');
- $a2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $a2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$a2->method('getName')->willReturn('a2');
$classMetadata->addAttributeMetadata($a1);
@@ -45,11 +45,11 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
$classMetadata1 = new ClassMetadata('c1');
$classMetadata2 = new ClassMetadata('c2');
- $ac1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $ac1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$ac1->method('getName')->willReturn('a1');
$ac1->method('getGroups')->willReturn(array('a', 'b'));
- $ac2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $ac2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$ac2->method('getName')->willReturn('a1');
$ac2->method('getGroups')->willReturn(array('b', 'c'));
@@ -67,10 +67,10 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
{
$classMetadata = new ClassMetadata('a');
- $a1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $a1 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$a1->method('getName')->willReturn('b1');
- $a2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+ $a2 = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface')->getMock();
$a2->method('getName')->willReturn('b2');
$classMetadata->addAttributeMetadata($a1);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
index e6b9a60d..01888dc4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
@@ -26,7 +26,7 @@ class CacheMetadataFactoryTest extends \PHPUnit_Framework_TestCase
{
$metadata = new ClassMetadata(Dummy::class);
- $decorated = $this->getMock(ClassMetadataFactoryInterface::class);
+ $decorated = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
$decorated
->expects($this->once())
->method('getMetadataFor')
@@ -42,7 +42,7 @@ class CacheMetadataFactoryTest extends \PHPUnit_Framework_TestCase
public function testHasMetadataFor()
{
- $decorated = $this->getMock(ClassMetadataFactoryInterface::class);
+ $decorated = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
$decorated
->expects($this->once())
->method('hasMetadataFor')
@@ -59,7 +59,7 @@ class CacheMetadataFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testInvalidClassThrowsException()
{
- $decorated = $this->getMock(ClassMetadataFactoryInterface::class);
+ $decorated = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
$factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
$factory->getMetadataFor('Not\Exist');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
index a237c323..1219da68 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
@@ -50,7 +50,7 @@ class ClassMetadataFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCacheExists()
{
- $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+ $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
$cache
->expects($this->once())
->method('fetch')
@@ -66,7 +66,7 @@ class ClassMetadataFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCacheNotExists()
{
- $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+ $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
$cache->method('fetch')->will($this->returnValue(false));
$cache->method('save');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
index 640fca1e..d2fb021d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
@@ -31,8 +31,8 @@ class AbstractNormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $loader = $this->getMock('Symfony\Component\Serializer\Mapping\Loader\LoaderChain', array(), array(array()));
- $this->classMetadata = $this->getMock('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory', array(), array($loader));
+ $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs(array(array()))->getMock();
+ $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs(array($loader))->getMock();
$this->normalizer = new AbstractNormalizerDummy($this->classMetadata);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
index 23014f30..5edb2235 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
@@ -28,7 +28,7 @@ class ArrayDenormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serializer = $this->getMock('Symfony\Component\Serializer\Serializer');
+ $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')->getMock();
$this->denormalizer = new ArrayDenormalizer();
$this->denormalizer->setSerializer($this->serializer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index 959e2dbf..0e697b4b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -37,7 +37,7 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serializer = $this->getMock(__NAMESPACE__.'\SerializerNormalizer');
+ $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\SerializerNormalizer')->getMock();
$this->normalizer = new GetSetMethodNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
@@ -394,7 +394,7 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
*/
public function testUnableToNormalizeObjectAttribute()
{
- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
$obj = new GetSetDummy();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
index 2ef6eaa0..818e9c8b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
@@ -33,7 +33,7 @@ class JsonSerializableNormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serializer = $this->getMock(JsonSerializerNormalizer::class);
+ $this->serializer = $this->getMockBuilder(JsonSerializerNormalizer::class)->getMock();
$this->normalizer = new JsonSerializableNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index e1d3a905..0b016b82 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -45,7 +45,7 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serializer = $this->getMock(__NAMESPACE__.'\ObjectSerializerNormalizer');
+ $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\ObjectSerializerNormalizer')->getMock();
$this->normalizer = new ObjectNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
@@ -437,7 +437,7 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase
*/
public function testUnableToNormalizeObjectAttribute()
{
- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
$obj = new ObjectDummy();
@@ -580,11 +580,21 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase
'inners' => array(array('foo' => 1), array('foo' => 2)),
), ObjectOuter::class);
- $this->assertEquals('foo', $obj->getInner()->foo);
- $this->assertEquals('bar', $obj->getInner()->bar);
- $this->assertEquals('1988-01-21', $obj->getDate()->format('Y-m-d'));
- $this->assertEquals(1, $obj->getInners()[0]->foo);
- $this->assertEquals(2, $obj->getInners()[1]->foo);
+ $this->assertSame('foo', $obj->getInner()->foo);
+ $this->assertSame('bar', $obj->getInner()->bar);
+ $this->assertSame('1988-01-21', $obj->getDate()->format('Y-m-d'));
+ $this->assertSame(1, $obj->getInners()[0]->foo);
+ $this->assertSame(2, $obj->getInners()[1]->foo);
+ }
+
+ public function testAcceptJsonNumber()
+ {
+ $extractor = new PropertyInfoExtractor(array(), array(new PhpDocExtractor(), new ReflectionExtractor()));
+ $normalizer = new ObjectNormalizer(null, null, null, $extractor);
+ $serializer = new Serializer(array(new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer));
+
+ $this->assertSame(10.0, $serializer->denormalize(array('number' => 10), JsonNumber::class, 'json')->number);
+ $this->assertSame(10.0, $serializer->denormalize(array('number' => 10), JsonNumber::class, 'jsonld')->number);
}
/**
@@ -892,3 +902,11 @@ class DummyWithConstructorInexistingObject
{
}
}
+
+class JsonNumber
+{
+ /**
+ * @var float
+ */
+ public $number;
+}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 9da80e36..5ac378a1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -36,7 +36,7 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+ $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer = new PropertyNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
@@ -353,7 +353,7 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
*/
public function testUnableToNormalizeObjectAttribute()
{
- $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+ $serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
$obj = new PropertyDummy();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index ff7820c0..2a6e009d 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -45,7 +45,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testNormalizeNoMatch()
{
- $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+ $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
$serializer->normalize(new \stdClass(), 'xml');
}
@@ -77,7 +77,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
*/
public function testDenormalizeNoMatch()
{
- $serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
+ $serializer = new Serializer(array($this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()));
$serializer->denormalize('foo', 'stdClass');
}
@@ -102,14 +102,14 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
public function testNormalizeWithSupportOnData()
{
- $normalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+ $normalizer1 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\NormalizerInterface')->getMock();
$normalizer1->method('supportsNormalization')
->willReturnCallback(function ($data, $format) {
return isset($data->test);
});
$normalizer1->method('normalize')->willReturn('test1');
- $normalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
+ $normalizer2 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\NormalizerInterface')->getMock();
$normalizer2->method('supportsNormalization')
->willReturn(true);
$normalizer2->method('normalize')->willReturn('test2');
@@ -125,14 +125,14 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
public function testDenormalizeWithSupportOnData()
{
- $denormalizer1 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+ $denormalizer1 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\DenormalizerInterface')->getMock();
$denormalizer1->method('supportsDenormalization')
->willReturnCallback(function ($data, $type, $format) {
return isset($data['test1']);
});
$denormalizer1->method('denormalize')->willReturn('test1');
- $denormalizer2 = $this->getMock('Symfony\Component\Serializer\Normalizer\DenormalizerInterface');
+ $denormalizer2 = $this->getMockBuilder('Symfony\Component\Serializer\Normalizer\DenormalizerInterface')->getMock();
$denormalizer2->method('supportsDenormalization')
->willReturn(true);
$denormalizer2->method('denormalize')->willReturn('test2');
@@ -319,7 +319,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
public function testNormalizerAware()
{
- $normalizerAware = $this->getMock(NormalizerAwareInterface::class);
+ $normalizerAware = $this->getMockBuilder(NormalizerAwareInterface::class)->getMock();
$normalizerAware->expects($this->once())
->method('setNormalizer')
->with($this->isInstanceOf(NormalizerInterface::class));
@@ -329,7 +329,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
public function testDenormalizerAware()
{
- $denormalizerAware = $this->getMock(DenormalizerAwareInterface::class);
+ $denormalizerAware = $this->getMockBuilder(DenormalizerAwareInterface::class)->getMock();
$denormalizerAware->expects($this->once())
->method('setDenormalizer')
->with($this->isInstanceOf(DenormalizerInterface::class));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json b/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json
index 8bbb2b18..d7dbfc65 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Component/Serializer/composer.json
@@ -31,6 +31,7 @@
},
"conflict": {
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
+ "symfony/property-info": "<3.1",
"symfony/yaml": "<3.1"
},
"suggest": {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php
index fb416efe..2337e031 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Section.php
@@ -53,7 +53,7 @@ class Section
*
* @param string $id The child section identifier
*
- * @return Section|null The child section or null when none found
+ * @return self|null The child section or null when none found
*/
public function get($id)
{
@@ -69,7 +69,7 @@ class Section
*
* @param string|null $id null to create a new section, the identifier to re-open an existing one
*
- * @return Section A child section
+ * @return self
*/
public function open($id)
{
@@ -93,7 +93,7 @@ class Section
*
* @param string $id The session identifier
*
- * @return Section The current section
+ * @return $this
*/
public function setId($id)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php
index 44f18d5e..8ad93165 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/Stopwatch.php
@@ -90,7 +90,7 @@ class Stopwatch
* @param string $name The event name
* @param string $category The event category
*
- * @return StopwatchEvent A StopwatchEvent instance
+ * @return StopwatchEvent
*/
public function start($name, $category = null)
{
@@ -114,7 +114,7 @@ class Stopwatch
*
* @param string $name The event name
*
- * @return StopwatchEvent A StopwatchEvent instance
+ * @return StopwatchEvent
*/
public function stop($name)
{
@@ -126,7 +126,7 @@ class Stopwatch
*
* @param string $name The event name
*
- * @return StopwatchEvent A StopwatchEvent instance
+ * @return StopwatchEvent
*/
public function lap($name)
{
@@ -138,7 +138,7 @@ class Stopwatch
*
* @param string $name The event name
*
- * @return StopwatchEvent A StopwatchEvent instance
+ * @return StopwatchEvent
*/
public function getEvent($name)
{
@@ -150,7 +150,7 @@ class Stopwatch
*
* @param string $id A section identifier
*
- * @return StopwatchEvent[] An array of StopwatchEvent instances
+ * @return StopwatchEvent[]
*/
public function getSectionEvents($id)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php
index 957a5d0d..16a30db2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -75,7 +75,7 @@ class StopwatchEvent
/**
* Starts a new event period.
*
- * @return StopwatchEvent The event
+ * @return $this
*/
public function start()
{
@@ -87,7 +87,7 @@ class StopwatchEvent
/**
* Stops the last started event period.
*
- * @return StopwatchEvent The event
+ * @return $this
*
* @throws \LogicException When stop() is called without a matching call to start()
*/
@@ -115,7 +115,7 @@ class StopwatchEvent
/**
* Stops the current period and then starts a new one.
*
- * @return StopwatchEvent The event
+ * @return $this
*/
public function lap()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php
index c687c535..45d9421f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/TemplateReferenceInterface.php
@@ -31,7 +31,7 @@ interface TemplateReferenceInterface
* @param string $name The parameter name
* @param string $value The parameter value
*
- * @return TemplateReferenceInterface The TemplateReferenceInterface instance
+ * @return $this
*
* @throws \InvalidArgumentException if the parameter name is not supported
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
index e9cb5fc4..bf82ed51 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
@@ -126,7 +126,7 @@ class DelegatingEngineTest extends \PHPUnit_Framework_TestCase
private function getEngineMock($template, $supports)
{
- $engine = $this->getMock('Symfony\Component\Templating\EngineInterface');
+ $engine = $this->getMockBuilder('Symfony\Component\Templating\EngineInterface')->getMock();
$engine->expects($this->once())
->method('supports')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
index 01896c2e..344f3d07 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
@@ -34,7 +34,7 @@ class CacheLoaderTest extends \PHPUnit_Framework_TestCase
$loader = new ProjectTemplateLoader($varLoader = new ProjectTemplateLoaderVar(), $dir);
$this->assertFalse($loader->load(new TemplateReference('foo', 'php')), '->load() returns false if the embed loader is not able to load the template');
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger
->expects($this->once())
->method('debug')
@@ -42,7 +42,7 @@ class CacheLoaderTest extends \PHPUnit_Framework_TestCase
$loader->setLogger($logger);
$loader->load(new TemplateReference('index'));
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger
->expects($this->once())
->method('debug')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
index 939d6753..b7e11979 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/FilesystemLoaderTest.php
@@ -58,7 +58,7 @@ class FilesystemLoaderTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Symfony\Component\Templating\Storage\FileStorage', $storage, '->load() returns a FileStorage if you pass a relative template that exists');
$this->assertEquals($path.'/foo.php', (string) $storage, '->load() returns a FileStorage pointing to the absolute path of the template');
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->exactly(2))->method('debug');
$loader = new ProjectTemplateLoader2($pathPattern);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
index d198bdda..de2e9921 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
@@ -19,7 +19,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
public function testGetSetLogger()
{
$loader = new ProjectTemplateLoader4();
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$loader->setLogger($logger);
$this->assertSame($logger, $loader->getLogger(), '->setLogger() sets the logger instance');
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php
index b1b516dc..40054f05 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/MessageCatalogueInterface.php
@@ -105,7 +105,7 @@ interface MessageCatalogueInterface
*
* The two catalogues must have the same locale.
*
- * @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
+ * @param self $catalogue
*/
public function addCatalogue(MessageCatalogueInterface $catalogue);
@@ -115,14 +115,14 @@ interface MessageCatalogueInterface
*
* This is used to provide default translations when they do not exist for the current locale.
*
- * @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
+ * @param self $catalogue
*/
public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
/**
* Gets the fallback catalogue.
*
- * @return MessageCatalogueInterface|null A MessageCatalogueInterface instance or null when no fallback has been set
+ * @return self|null A MessageCatalogueInterface instance or null when no fallback has been set
*/
public function getFallbackCatalogue();
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
index 2b4b163a..4fcabaf2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
@@ -26,7 +26,7 @@ class FileDumperTest extends \PHPUnit_Framework_TestCase
$dumper = new ConcreteFileDumper();
$dumper->dump($catalogue, array('path' => $tempDir));
- $this->assertTrue(file_exists($tempDir.'/messages.en.concrete'));
+ $this->assertFileExists($tempDir.'/messages.en.concrete');
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
index 9f3e849b..66e9d587 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/LoggingTranslatorTest.php
@@ -19,7 +19,7 @@ class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
{
public function testTransWithNoTranslationIsLogged()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->exactly(2))
->method('warning')
->with('Translation not found.')
@@ -33,7 +33,7 @@ class LoggingTranslatorTest extends \PHPUnit_Framework_TestCase
public function testTransChoiceFallbackIsLogged()
{
- $logger = $this->getMock('Psr\Log\LoggerInterface');
+ $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
$logger->expects($this->once())
->method('debug')
->with('Translation use fallback catalogue.')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
index e369e2fd..217670f8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@@ -82,10 +82,10 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
public function testAddCatalogue()
{
- $r = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r->expects($this->any())->method('__toString')->will($this->returnValue('r'));
- $r1 = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r1 = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r1->expects($this->any())->method('__toString')->will($this->returnValue('r1'));
$catalogue = new MessageCatalogue('en', array('domain1' => array('foo' => 'foo'), 'domain2' => array('bar' => 'bar')));
@@ -104,13 +104,13 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
public function testAddFallbackCatalogue()
{
- $r = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r->expects($this->any())->method('__toString')->will($this->returnValue('r'));
- $r1 = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r1 = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r1->expects($this->any())->method('__toString')->will($this->returnValue('r1'));
- $r2 = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r2 = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r2->expects($this->any())->method('__toString')->will($this->returnValue('r2'));
$catalogue = new MessageCatalogue('fr_FR', array('domain1' => array('foo' => 'foo'), 'domain2' => array('bar' => 'bar')));
@@ -169,11 +169,11 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
public function testGetAddResource()
{
$catalogue = new MessageCatalogue('en');
- $r = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r->expects($this->any())->method('__toString')->will($this->returnValue('r'));
$catalogue->addResource($r);
$catalogue->addResource($r);
- $r1 = $this->getMock('Symfony\Component\Config\Resource\ResourceInterface');
+ $r1 = $this->getMockBuilder('Symfony\Component\Config\Resource\ResourceInterface')->getMock();
$r1->expects($this->any())->method('__toString')->will($this->returnValue('r1'));
$catalogue->addResource($r1);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
index 75093580..3726ccfd 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
@@ -95,7 +95,7 @@ class TranslatorCacheTest extends \PHPUnit_Framework_TestCase
$catalogue->addResource(new StaleResource()); // better use a helper class than a mock, because it gets serialized in the cache and re-loaded
/** @var LoaderInterface|\PHPUnit_Framework_MockObject_MockObject $loader */
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$loader
->expects($this->exactly(2))
->method('load')
@@ -228,8 +228,8 @@ class TranslatorCacheTest extends \PHPUnit_Framework_TestCase
public function testRefreshCacheWhenResourcesAreNoLongerFresh()
{
- $resource = $this->getMock('Symfony\Component\Config\Resource\SelfCheckingResourceInterface');
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $resource = $this->getMockBuilder('Symfony\Component\Config\Resource\SelfCheckingResourceInterface')->getMock();
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$resource->method('isFresh')->will($this->returnValue(false));
$loader
->expects($this->exactly(2))
@@ -272,7 +272,7 @@ class TranslatorCacheTest extends \PHPUnit_Framework_TestCase
*/
private function createFailingLoader()
{
- $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
$loader
->expects($this->never())
->method('load');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
index f7a8a83d..041a8367 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php
@@ -19,7 +19,7 @@ class TranslationWriterTest extends \PHPUnit_Framework_TestCase
{
public function testWriteTranslations()
{
- $dumper = $this->getMock('Symfony\Component\Translation\Dumper\DumperInterface');
+ $dumper = $this->getMockBuilder('Symfony\Component\Translation\Dumper\DumperInterface')->getMock();
$dumper
->expects($this->once())
->method('dump');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php b/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php
index 60a55e9d..9c0a420a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -62,7 +62,7 @@ class ArrayConverter
* $tree['foo'] was string before we found array {bar: test2}.
* Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2';
*/
- $elem = &$elem[ implode('.', array_slice($parts, $i)) ];
+ $elem = &$elem[implode('.', array_slice($parts, $i))];
break;
}
$parentOfElem = &$elem;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php
index f476713c..d2188071 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Constraints/BicValidator.php
@@ -17,7 +17,7 @@ use Symfony\Component\Validator\ConstraintValidator;
/**
* @author Michael Hirschler <michael.vhirsch@gmail.com>
*
- * @link https://en.wikipedia.org/wiki/ISO_9362#Structure
+ * @see https://en.wikipedia.org/wiki/ISO_9362#Structure
*/
class BicValidator extends ConstraintValidator
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
index 2819ce15..2f19a3fe 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -219,7 +219,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
* @param string $property The name of the property
* @param Constraint $constraint The constraint
*
- * @return ClassMetadata This object
+ * @return $this
*/
public function addPropertyConstraint($property, Constraint $constraint)
{
@@ -240,7 +240,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
* @param string $property
* @param Constraint[] $constraints
*
- * @return ClassMetadata
+ * @return $this
*/
public function addPropertyConstraints($property, array $constraints)
{
@@ -260,7 +260,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
* @param string $property The name of the property
* @param Constraint $constraint The constraint
*
- * @return ClassMetadata This object
+ * @return $this
*/
public function addGetterConstraint($property, Constraint $constraint)
{
@@ -281,7 +281,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
* @param string $property
* @param Constraint[] $constraints
*
- * @return ClassMetadata
+ * @return $this
*/
public function addGetterConstraints($property, array $constraints)
{
@@ -304,11 +304,18 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
}
foreach ($source->getConstrainedProperties() as $property) {
+ if ($this->hasPropertyMetadata($property)) {
+ continue;
+ }
+
foreach ($source->getPropertyMetadata($property) as $member) {
$member = clone $member;
foreach ($member->getConstraints() as $constraint) {
- $member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint;
+ if (in_array($constraint::DEFAULT_GROUP, $constraint->groups, true)) {
+ $member->constraintsByGroup[$this->getDefaultGroup()][] = $constraint;
+ }
+
$constraint->addImplicitGroupName($this->getDefaultGroup());
}
@@ -360,7 +367,7 @@ class ClassMetadata extends GenericMetadata implements ClassMetadataInterface
*
* @param array $groupSequence An array of group names
*
- * @return ClassMetadata
+ * @return $this
*
* @throws GroupDefinitionException
*/
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index f5894f49..79ad1f22 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -99,8 +99,11 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
return $this->loadedClasses[$class];
}
- if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
- return $this->loadedClasses[$class];
+ if (null !== $this->cache && false !== ($metadata = $this->cache->read($class))) {
+ // Include constraints from the parent class
+ $this->mergeConstraints($metadata);
+
+ return $this->loadedClasses[$class] = $metadata;
}
if (!class_exists($class) && !interface_exists($class)) {
@@ -109,6 +112,22 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
$metadata = new ClassMetadata($class);
+ if (null !== $this->loader) {
+ $this->loader->loadClassMetadata($metadata);
+ }
+
+ if (null !== $this->cache) {
+ $this->cache->write($metadata);
+ }
+
+ // Include constraints from the parent class
+ $this->mergeConstraints($metadata);
+
+ return $this->loadedClasses[$class] = $metadata;
+ }
+
+ private function mergeConstraints(ClassMetadata $metadata)
+ {
// Include constraints from the parent class
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
@@ -139,16 +158,6 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
}
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
}
-
- if (null !== $this->loader) {
- $this->loader->loadClassMetadata($metadata);
- }
-
- if (null !== $this->cache) {
- $this->cache->write($metadata);
- }
-
- return $this->loadedClasses[$class] = $metadata;
}
/**
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
index 147c021b..ff1cb6d3 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/GenericMetadata.php
@@ -116,7 +116,7 @@ class GenericMetadata implements MetadataInterface
*
* @param Constraint $constraint The constraint to add
*
- * @return GenericMetadata This object
+ * @return $this
*
* @throws ConstraintDefinitionException When trying to add the
* {@link Traverse} constraint
@@ -157,7 +157,7 @@ class GenericMetadata implements MetadataInterface
*
* @param Constraint[] $constraints The constraints to add
*
- * @return GenericMetadata This object
+ * @return $this
*/
public function addConstraints(array $constraints)
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
index f1ee7844..6548c5ae 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
@@ -86,7 +86,7 @@ class XmlFileLoader extends FileLoader
$options = array();
}
} elseif (strlen((string) $node) > 0) {
- $options = trim($node);
+ $options = XmlUtils::phpize(trim($node));
} else {
$options = null;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
index 541ebaa0..192b992f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>Es wurde kein temporärer Ordner in der php.ini konfiguriert.</target>
+ <target>Es wurde kein temporärer Ordner in der php.ini konfiguriert oder der temporäre Ordner existiert nicht.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
index ec072eb7..2a5c97d8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>No temporary folder was configured in php.ini.</target>
+ <target>No temporary folder was configured in php.ini, or the configured folder does not exist.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf
index a11e825c..8c62d899 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf
@@ -278,6 +278,42 @@
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Ova vrijednost ne bi trebala biti {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
+ <trans-unit id="73">
+ <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
+ <target>Omjer slike je prevelik ({{ ratio }}). Dozvoljeni maksimalni omjer je {{ max_ratio }}.</target>
+ </trans-unit>
+ <trans-unit id="74">
+ <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
+ <target>Omjer slike je premali ({{ ratio }}). Minimalni očekivani omjer je {{ min_ratio }}.</target>
+ </trans-unit>
+ <trans-unit id="75">
+ <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
+ <target>Slika je kvadratnog oblika ({{ width }}x{{ height }}px). Kvadratne slike nisu dozvoljene.</target>
+ </trans-unit>
+ <trans-unit id="76">
+ <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
+ <target>Slika je orijentirana horizontalno ({{ width }}x{{ height }}px). Horizontalno orijentirane slike nisu dozvoljene.</target>
+ </trans-unit>
+ <trans-unit id="77">
+ <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
+ <target>Slika je orijentirana vertikalno ({{ width }}x{{ height }}px). Vertikalno orijentirane slike nisu dozvoljene.</target>
+ </trans-unit>
+ <trans-unit id="78">
+ <source>An empty file is not allowed.</source>
+ <target>Prazna datoteka nije dozvoljena.</target>
+ </trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>Poslužitelj nije mogao biti razriješen.</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Znakovne oznake vrijednosti ne odgovaraju očekivanom {{ charset }} skupu.</target>
+ </trans-unit>
+ <trans-unit id="81">
+ <source>This is not a valid Business Identifier Code (BIC).</source>
+ <target>Ovo nije validan poslovni identifikacijski broj (BIC).</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf
index c7061470..ce8db486 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.id.xlf
@@ -310,6 +310,10 @@
<source>This value does not match the expected {{ charset }} charset.</source>
<target>Nilai ini tidak memenuhi set karakter {{ charset }} yang diharapkan.</target>
</trans-unit>
+ <trans-unit id="81">
+ <source>This is not a valid Business Identifier Code (BIC).</source>
+ <target>Ini bukan Business Identifier Code (BIC) yang sah.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
index f803628e..e81141f0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>Er is geen tijdelijke map geconfigureerd in php.ini.</target>
+ <target>Er is geen tijdelijke map geconfigureerd in php.ini, of de gespecificeerde map bestaat niet.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf
index 5a934765..25057653 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.no.xlf
@@ -12,11 +12,11 @@
</trans-unit>
<trans-unit id="3">
<source>This value should be of type {{ type }}.</source>
- <target>Verdien må være av typen {{ type }}.</target>
+ <target>Verdien skal ha typen {{ type }}.</target>
</trans-unit>
<trans-unit id="4">
<source>This value should be blank.</source>
- <target>Verdien må være blank.</target>
+ <target>Verdien skal være blank.</target>
</trans-unit>
<trans-unit id="5">
<source>The value you selected is not a valid choice.</source>
@@ -88,19 +88,19 @@
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
- <target>Verdien må ikke være blank.</target>
+ <target>Verdien kan ikke være blank.</target>
</trans-unit>
<trans-unit id="23">
<source>This value should not be null.</source>
- <target>Verdien må ikke være tom (null).</target>
+ <target>Verdien kan ikke være tom (null).</target>
</trans-unit>
<trans-unit id="24">
<source>This value should be null.</source>
- <target>Verdien må være tom (null).</target>
+ <target>Verdien skal være tom (null).</target>
</trans-unit>
<trans-unit id="25">
<source>This value is not valid.</source>
- <target>Verdien er ikke gyldig.</target>
+ <target>Verdien er ugyldig.</target>
</trans-unit>
<trans-unit id="26">
<source>This value is not a valid time.</source>
@@ -112,7 +112,7 @@
</trans-unit>
<trans-unit id="31">
<source>The two values should be equal.</source>
- <target>Verdiene må være identiske.</target>
+ <target>Verdiene skal være identiske.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
@@ -128,7 +128,7 @@
</trans-unit>
<trans-unit id="35">
<source>This value should be a valid number.</source>
- <target>Verdien må være et gyldig tall.</target>
+ <target>Verdien skal være et gyldig tall.</target>
</trans-unit>
<trans-unit id="36">
<source>This file is not a valid image.</source>
@@ -176,11 +176,11 @@
</trans-unit>
<trans-unit id="47">
<source>This value should be the user's current password.</source>
- <target>Verdien må være brukerens sitt nåværende passord.</target>
+ <target>Verdien skal være brukerens sitt nåværende passord.</target>
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
- <target>Verdien må være nøyaktig {{ limit }} tegn.</target>
+ <target>Verdien skal være nøyaktig {{ limit }} tegn.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
@@ -220,11 +220,11 @@
</trans-unit>
<trans-unit id="58">
<source>Unsupported card type or invalid card number.</source>
- <target>Korttypen er ikke støttet eller ugyldig kortnummer.</target>
+ <target>Korttypen er ikke støttet eller kortnummeret er ugyldig.</target>
</trans-unit>
<trans-unit id="59">
<source>This is not a valid International Bank Account Number (IBAN).</source>
- <target>Dette er ikke en gyldig IBAN.</target>
+ <target>Dette er ikke et gyldig IBAN-nummer.</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
@@ -248,43 +248,43 @@
</trans-unit>
<trans-unit id="65">
<source>This value should be equal to {{ compared_value }}.</source>
- <target>Verdien må være lik {{ compared_value }}.</target>
+ <target>Verdien skal være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="66">
<source>This value should be greater than {{ compared_value }}.</source>
- <target>Verdien må være større enn {{ compared_value }}.</target>
+ <target>Verdien skal være større enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="67">
<source>This value should be greater than or equal to {{ compared_value }}.</source>
- <target>Verdien må være større enn eller lik {{ compared_value }}.</target>
+ <target>Verdien skal være større enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="68">
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
- <target>Verdien må være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
+ <target>Verdien skal være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="69">
<source>This value should be less than {{ compared_value }}.</source>
- <target>Verdien må være mindre enn {{ compared_value }}.</target>
+ <target>Verdien skal være mindre enn {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="70">
<source>This value should be less than or equal to {{ compared_value }}.</source>
- <target>Verdien må være mindre enn eller lik {{ compared_value }}.</target>
+ <target>Verdien skal være mindre enn eller lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="71">
<source>This value should not be equal to {{ compared_value }}.</source>
- <target>Verdien må ikke være lik {{ compared_value }}.</target>
+ <target>Verdien skal ikke være lik {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
- <target>Verdien må ikke være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
+ <target>Verdien skal ikke være identisk med {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
- <target>Bildeforholdet er for stort ({{ ratio }}). Tillatt maksimumsbildeforhold er {{ max_ratio }}.</target>
+ <target>Bildeforholdet er for stort ({{ ratio }}). Tillatt bildeforhold er maks {{ max_ratio }}.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
- <target>Bildeforholdet er for lite ({{ ratio }}). Forventet maksimumsbildeforhold er {{ min_ratio }}.</target>
+ <target>Bildeforholdet er for lite ({{ ratio }}). Forventet bildeforhold er minst {{ min_ratio }}.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
index c40f76ee..d364eba9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf
@@ -36,11 +36,11 @@
</trans-unit>
<trans-unit id="9">
<source>This field was not expected.</source>
- <target>To pole nie spodziewano.</target>
+ <target>Tego pola się nie spodziewano.</target>
</trans-unit>
<trans-unit id="10">
<source>This field is missing.</source>
- <target>To pole jest chybianie.</target>
+ <target>Tego pola brakuje.</target>
</trans-unit>
<trans-unit id="11">
<source>This value is not a valid date.</source>
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>Nie skonfigurowano folderu tymczasowego w php.ini.</target>
+ <target>Nie skonfigurowano folderu tymczasowego w php.ini, lub skonfigurowany folder nie istnieje.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
index d8b1e3d6..30ec8f22 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -123,7 +123,7 @@ class EmailValidatorTest extends ConstraintValidatorTestCase
}
/**
- * @link https://github.com/egulias/EmailValidator/blob/1.2.8/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
+ * @see https://github.com/egulias/EmailValidator/blob/1.2.8/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
*/
public function getInvalidEmailsForStrictChecks()
{
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
index d7bc671a..e4316243 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
@@ -218,7 +218,7 @@ class ExpressionValidatorTest extends ConstraintValidatorTestCase
'expression' => 'false',
));
- $expressionLanguage = $this->getMock('Symfony\Component\ExpressionLanguage\ExpressionLanguage');
+ $expressionLanguage = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ExpressionLanguage')->getMock();
$used = false;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index 34c62445..99b15aa9 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Mapping;
use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\GreaterThan;
use Symfony\Component\Validator\Constraints\Valid;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
@@ -134,6 +135,7 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
{
$parent = new ClassMetadata(self::PARENTCLASS);
$parent->addPropertyConstraint('firstName', new ConstraintA());
+ $parent->addPropertyConstraint('firstName', new ConstraintB(array('groups' => 'foo')));
$this->metadata->mergeConstraints($parent);
$this->metadata->addPropertyConstraint('firstName', new ConstraintA());
@@ -147,9 +149,13 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
'Default',
'Entity',
)));
+ $constraintB = new ConstraintB(array(
+ 'groups' => array('foo'),
+ ));
$constraints = array(
$constraintA1,
+ $constraintB,
$constraintA2,
);
@@ -165,6 +171,9 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
$constraintA1,
$constraintA2,
),
+ 'foo' => array(
+ $constraintB,
+ ),
);
$members = $this->metadata->getPropertyMetadata('firstName');
@@ -295,4 +304,29 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
{
$this->assertCount(0, $this->metadata->getPropertyMetadata('foo'), '->getPropertyMetadata() returns an empty collection if no metadata is configured for the given property');
}
+
+ public function testMergeDoesOverrideConstraintsFromParentClassIfPropertyIsOverriddenInChildClass()
+ {
+ $parentMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ParentClass');
+ $parentMetadata->addPropertyConstraint('example', new GreaterThan(0));
+
+ $childMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ChildClass');
+ $childMetadata->addPropertyConstraint('example', new GreaterThan(1));
+ $childMetadata->mergeConstraints($parentMetadata);
+
+ $expectedMetadata = new ClassMetadata('\Symfony\Component\Validator\Tests\Mapping\ChildClass');
+ $expectedMetadata->addPropertyConstraint('example', new GreaterThan(1));
+
+ $this->assertEquals($expectedMetadata, $childMetadata);
+ }
+}
+
+class ParentClass
+{
+ public $example = 0;
+}
+
+class ChildClass extends ParentClass
+{
+ public $example = 1; // overrides parent property of same name
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index c1aaa9f8..96967441 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Mapping\Factory;
+use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
@@ -30,8 +31,8 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
$metadata = $factory->getMetadataFor(self::PARENT_CLASS);
$constraints = array(
- new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
+ new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
);
$this->assertEquals($constraints, $metadata->getConstraints());
@@ -45,8 +46,6 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
$constraints = array(
new ConstraintA(array('groups' => array(
'Default',
- 'EntityInterfaceA',
- 'EntityParent',
'Entity',
))),
new ConstraintA(array('groups' => array(
@@ -56,8 +55,8 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
))),
new ConstraintA(array('groups' => array(
'Default',
- 'EntityParentInterface',
- 'EntityInterfaceB',
+ 'EntityInterfaceA',
+ 'EntityParent',
'Entity',
))),
new ConstraintA(array('groups' => array(
@@ -67,6 +66,8 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
))),
new ConstraintA(array('groups' => array(
'Default',
+ 'EntityParentInterface',
+ 'EntityInterfaceB',
'Entity',
))),
);
@@ -76,12 +77,12 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
public function testWriteMetadataToCache()
{
- $cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
+ $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
$factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
$parentClassConstraints = array(
- new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
new ConstraintA(array('groups' => array('Default', 'EntityParent'))),
+ new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA', 'EntityParent'))),
);
$interfaceAConstraints = array(
new ConstraintA(array('groups' => array('Default', 'EntityInterfaceA'))),
@@ -115,24 +116,58 @@ class LazyLoadingMetadataFactoryTest extends \PHPUnit_Framework_TestCase
public function testReadMetadataFromCache()
{
- $loader = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
- $cache = $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface');
+ $loader = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
+ $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
$factory = new LazyLoadingMetadataFactory($loader, $cache);
$metadata = new ClassMetadata(self::PARENT_CLASS);
$metadata->addConstraint(new ConstraintA());
+ $parentClass = self::PARENT_CLASS;
+ $interfaceClass = self::INTERFACE_A_CLASS;
+
$loader->expects($this->never())
->method('loadClassMetadata');
$cache->expects($this->never())
->method('has');
- $cache->expects($this->once())
+ $cache->expects($this->exactly(2))
->method('read')
- ->will($this->returnValue($metadata));
+ ->withConsecutive(
+ array(self::PARENT_CLASS),
+ array(self::INTERFACE_A_CLASS)
+ )
+ ->willReturnCallback(function ($name) use ($metadata, $parentClass, $interfaceClass) {
+ if ($parentClass == $name) {
+ return $metadata;
+ }
+
+ return new ClassMetadata($interfaceClass);
+ });
$this->assertEquals($metadata, $factory->getMetadataFor(self::PARENT_CLASS));
}
+
+ public function testMetadataCacheWithRuntimeConstraint()
+ {
+ $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
+ $factory = new LazyLoadingMetadataFactory(new TestLoader(), $cache);
+
+ $cache
+ ->expects($this->any())
+ ->method('write')
+ ->will($this->returnCallback(function ($metadata) { serialize($metadata); }))
+ ;
+
+ $cache->expects($this->any())
+ ->method('read')
+ ->will($this->returnValue(false));
+
+ $metadata = $factory->getMetadataFor(self::PARENT_CLASS);
+ $metadata->addConstraint(new Callback(function () {}));
+
+ $metadata = $factory->getMetadataFor(self::CLASS_NAME);
+ }
}
class TestLoader implements LoaderInterface
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
index 09e6e449..c131f28a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/FilesLoaderTest.php
@@ -43,6 +43,6 @@ class FilesLoaderTest extends \PHPUnit_Framework_TestCase
public function getFileLoader()
{
- return $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ return $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
index 647a568c..c0a46cb0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php
@@ -20,12 +20,12 @@ class LoaderChainTest extends \PHPUnit_Framework_TestCase
{
$metadata = new ClassMetadata('\stdClass');
- $loader1 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader1->expects($this->once())
->method('loadClassMetadata')
->with($this->equalTo($metadata));
- $loader2 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader2->expects($this->once())
->method('loadClassMetadata')
->with($this->equalTo($metadata));
@@ -42,12 +42,12 @@ class LoaderChainTest extends \PHPUnit_Framework_TestCase
{
$metadata = new ClassMetadata('\stdClass');
- $loader1 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader1->expects($this->any())
->method('loadClassMetadata')
->will($this->returnValue(true));
- $loader2 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader2->expects($this->any())
->method('loadClassMetadata')
->will($this->returnValue(false));
@@ -64,12 +64,12 @@ class LoaderChainTest extends \PHPUnit_Framework_TestCase
{
$metadata = new ClassMetadata('\stdClass');
- $loader1 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader1->expects($this->any())
->method('loadClassMetadata')
->will($this->returnValue(false));
- $loader2 = $this->getMock('Symfony\Component\Validator\Mapping\Loader\LoaderInterface');
+ $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$loader2->expects($this->any())
->method('loadClassMetadata')
->will($this->returnValue(false));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
index e6326b9a..2053e248 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -19,6 +19,7 @@ use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\Constraints\Range;
use Symfony\Component\Validator\Constraints\Regex;
use Symfony\Component\Validator\Constraints\IsTrue;
+use Symfony\Component\Validator\Constraints\Traverse;
use Symfony\Component\Validator\Exception\MappingException;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Loader\XmlFileLoader;
@@ -57,6 +58,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
$expected->addConstraint(new Callback('validateMe'));
$expected->addConstraint(new Callback('validateMeStatic'));
$expected->addConstraint(new Callback(array('Symfony\Component\Validator\Tests\Fixtures\CallbackClass', 'callback')));
+ $expected->addConstraint(new Traverse(false));
$expected->addPropertyConstraint('firstName', new NotNull());
$expected->addPropertyConstraint('firstName', new Range(array('min' => 3)));
$expected->addPropertyConstraint('firstName', new Choice(array('A', 'B')));
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml
index 689184ec..b1426cf4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml
@@ -31,6 +31,11 @@
<value>callback</value>
</constraint>
+ <!-- Traverse with boolean default option -->
+ <constraint name="Traverse">
+ false
+ </constraint>
+
<!-- PROPERTY CONSTRAINTS -->
<property name="firstName">
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
index 905cf00a..77a7cc6c 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
@@ -603,8 +603,8 @@ abstract class AbstractTest extends AbstractValidatorTest
$entity->initialized = false;
// prepare initializers that set "initialized" to true
- $initializer1 = $this->getMock('Symfony\\Component\\Validator\\ObjectInitializerInterface');
- $initializer2 = $this->getMock('Symfony\\Component\\Validator\\ObjectInitializerInterface');
+ $initializer1 = $this->getMockBuilder('Symfony\\Component\\Validator\\ObjectInitializerInterface')->getMock();
+ $initializer2 = $this->getMockBuilder('Symfony\\Component\\Validator\\ObjectInitializerInterface')->getMock();
$initializer1->expects($this->once())
->method('initialize')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
index cd77e948..9e0afe06 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -42,7 +42,7 @@ class RecursiveValidatorTest extends AbstractTest
$childB->name = 'fake';
$entity->childA = array($childA);
$entity->childB = array($childB);
- $validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+ $validatorContext = $this->getMockBuilder('Symfony\Component\Validator\Validator\ContextualValidatorInterface')->getMock();
$validatorContext
->expects($this->once())
->method('validate')
@@ -76,7 +76,7 @@ class RecursiveValidatorTest extends AbstractTest
$entity->childA = array($childA);
$entity->childB = array($childB);
- $validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+ $validatorContext = $this->getMockBuilder('Symfony\Component\Validator\Validator\ContextualValidatorInterface')->getMock();
$validatorContext
->expects($this->once())
->method('validate')
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
index fbc86315..d41a7919 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
@@ -34,7 +34,7 @@ class ValidatorBuilderTest extends \PHPUnit_Framework_TestCase
public function testAddObjectInitializer()
{
$this->assertSame($this->builder, $this->builder->addObjectInitializer(
- $this->getMock('Symfony\Component\Validator\ObjectInitializerInterface')
+ $this->getMockBuilder('Symfony\Component\Validator\ObjectInitializerInterface')->getMock()
));
}
@@ -86,21 +86,21 @@ class ValidatorBuilderTest extends \PHPUnit_Framework_TestCase
public function testSetMetadataCache()
{
$this->assertSame($this->builder, $this->builder->setMetadataCache(
- $this->getMock('Symfony\Component\Validator\Mapping\Cache\CacheInterface'))
+ $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock())
);
}
public function testSetConstraintValidatorFactory()
{
$this->assertSame($this->builder, $this->builder->setConstraintValidatorFactory(
- $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface'))
+ $this->getMockBuilder('Symfony\Component\Validator\ConstraintValidatorFactoryInterface')->getMock())
);
}
public function testSetTranslator()
{
$this->assertSame($this->builder, $this->builder->setTranslator(
- $this->getMock('Symfony\Component\Translation\TranslatorInterface'))
+ $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock())
);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php
index 7d7ebe73..1cc96c83 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/ContextualValidatorInterface.php
@@ -29,7 +29,7 @@ interface ContextualValidatorInterface
*
* @param string $path The path to append
*
- * @return ContextualValidatorInterface This validator
+ * @return $this
*/
public function atPath($path);
@@ -46,7 +46,7 @@ interface ContextualValidatorInterface
* validate. If none is given,
* "Default" is assumed
*
- * @return ContextualValidatorInterface This validator
+ * @return $this
*/
public function validate($value, $constraints = null, $groups = null);
@@ -59,7 +59,7 @@ interface ContextualValidatorInterface
* @param array|null $groups The validation groups to validate. If
* none is given, "Default" is assumed
*
- * @return ContextualValidatorInterface This validator
+ * @return $this
*/
public function validateProperty($object, $propertyName, $groups = null);
@@ -74,7 +74,7 @@ interface ContextualValidatorInterface
* @param array|null $groups The validation groups to validate. If
* none is given, "Default" is assumed
*
- * @return ContextualValidatorInterface This validator
+ * @return $this
*/
public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index a57a5919..838d12b4 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -720,9 +720,7 @@ class RecursiveContextualValidator implements ContextualValidatorInterface
// The $cascadedGroups property is set, if the "Default" group is
// overridden by a group sequence
// See validateClassNode()
- $cascadedGroups = count($cascadedGroups) > 0
- ? $cascadedGroups
- : $groups;
+ $cascadedGroups = null !== $cascadedGroups && count($cascadedGroups) > 0 ? $cascadedGroups : $groups;
if (is_array($value)) {
// Arrays are always traversed, independent of the specified
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
index cd2f8757..e4bd1040 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/ValidatorBuilderInterface.php
@@ -29,7 +29,7 @@ interface ValidatorBuilderInterface
*
* @param ObjectInitializerInterface $initializer The initializer
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addObjectInitializer(ObjectInitializerInterface $initializer);
@@ -38,7 +38,7 @@ interface ValidatorBuilderInterface
*
* @param array $initializers The initializer
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addObjectInitializers(array $initializers);
@@ -47,7 +47,7 @@ interface ValidatorBuilderInterface
*
* @param string $path The path to the mapping file
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addXmlMapping($path);
@@ -56,7 +56,7 @@ interface ValidatorBuilderInterface
*
* @param array $paths The paths to the mapping files
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addXmlMappings(array $paths);
@@ -65,7 +65,7 @@ interface ValidatorBuilderInterface
*
* @param string $path The path to the mapping file
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addYamlMapping($path);
@@ -74,7 +74,7 @@ interface ValidatorBuilderInterface
*
* @param array $paths The paths to the mapping files
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addYamlMappings(array $paths);
@@ -83,7 +83,7 @@ interface ValidatorBuilderInterface
*
* @param string $methodName The name of the method
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addMethodMapping($methodName);
@@ -92,7 +92,7 @@ interface ValidatorBuilderInterface
*
* @param array $methodNames The names of the methods
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function addMethodMappings(array $methodNames);
@@ -101,14 +101,14 @@ interface ValidatorBuilderInterface
*
* @param Reader $annotationReader The annotation reader to be used
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function enableAnnotationMapping(Reader $annotationReader = null);
/**
* Disables annotation based constraint mapping.
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function disableAnnotationMapping();
@@ -117,7 +117,7 @@ interface ValidatorBuilderInterface
*
* @param MetadataFactoryInterface $metadataFactory The metadata factory
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function setMetadataFactory(MetadataFactoryInterface $metadataFactory);
@@ -126,7 +126,7 @@ interface ValidatorBuilderInterface
*
* @param CacheInterface $cache The cache instance
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function setMetadataCache(CacheInterface $cache);
@@ -135,7 +135,7 @@ interface ValidatorBuilderInterface
*
* @param ConstraintValidatorFactoryInterface $validatorFactory The validator factory
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory);
@@ -144,7 +144,7 @@ interface ValidatorBuilderInterface
*
* @param TranslatorInterface $translator The translator instance
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function setTranslator(TranslatorInterface $translator);
@@ -157,7 +157,7 @@ interface ValidatorBuilderInterface
*
* @param string $translationDomain The translation domain of the violation messages
*
- * @return ValidatorBuilderInterface The builder object
+ * @return $this
*/
public function setTranslationDomain($translationDomain);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php b/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
index 60a654f7..811b4842 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilderInterface.php
@@ -31,7 +31,7 @@ interface ConstraintViolationBuilderInterface
*
* @param string $path The property path
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function atPath($path);
@@ -41,7 +41,7 @@ interface ConstraintViolationBuilderInterface
* @param string $key The name of the parameter
* @param string $value The value to be inserted in the parameter's place
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function setParameter($key, $value);
@@ -52,7 +52,7 @@ interface ConstraintViolationBuilderInterface
* the values to be inserted in their place as
* values
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function setParameters(array $parameters);
@@ -62,7 +62,7 @@ interface ConstraintViolationBuilderInterface
*
* @param string $translationDomain The translation domain
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*
* @see \Symfony\Component\Translation\TranslatorInterface
*/
@@ -73,7 +73,7 @@ interface ConstraintViolationBuilderInterface
*
* @param mixed $invalidValue The invalid value
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function setInvalidValue($invalidValue);
@@ -83,7 +83,7 @@ interface ConstraintViolationBuilderInterface
*
* @param int $number The number for determining the plural form
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*
* @see \Symfony\Component\Translation\TranslatorInterface::transChoice()
*/
@@ -94,7 +94,7 @@ interface ConstraintViolationBuilderInterface
*
* @param string|null $code The violation code
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function setCode($code);
@@ -103,7 +103,7 @@ interface ConstraintViolationBuilderInterface
*
* @param mixed $cause The cause of the violation
*
- * @return ConstraintViolationBuilderInterface This builder
+ * @return $this
*/
public function setCause($cause);
diff --git a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
index 7456fe7e..35053134 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -170,12 +170,12 @@ class ReflectionCaster
foreach ($c->getParameters() as $v) {
$k = '$'.$v->name;
- if ($v->isPassedByReference()) {
- $k = '&'.$k;
- }
if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
$k = '...'.$k;
}
+ if ($v->isPassedByReference()) {
+ $k = '&'.$k;
+ }
$a[$prefix.'parameters'][$k] = $v;
}
if (isset($a[$prefix.'parameters'])) {
diff --git a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
index 35d05992..bc9cb115 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
@@ -41,7 +41,9 @@ class ResourceCaster
public static function castStream($stream, array $a, Stub $stub, $isNested)
{
$a = stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
- $a['uri'] = new LinkStub($a['uri']);
+ if (isset($a['uri'])) {
+ $a['uri'] = new LinkStub($a['uri']);
+ }
return $a;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php
index 1c6dd0df..22fd2fd1 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -256,7 +256,7 @@ class Data
$cursor->hashCut = $hashCut;
foreach ($children as $key => $child) {
$cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
- $cursor->hashKey = $dumpKeys ? $key : null;
+ $cursor->hashKey = $dumpKeys ? $key : null;
$this->dumpItem($dumper, $cursor, $refs, $child);
if (++$cursor->hashIndex === $this->maxItemsPerDepth || $cursor->stop) {
$parentCursor->stop = true;
diff --git a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE
index 39fa189d..207646a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
index f43c4d4f..57aec83e 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -160,7 +160,7 @@ EODUMP;
-<span class=sf-dump-private title="Private property defined in class: `Exception`">trace</span>: {<samp>
<span class=sf-dump-meta title="%sExceptionCasterTest.php
Stack level %d."><span class=sf-dump-ellipsis>%sVarDumper%eTests</span>%eCaster%eExceptionCasterTest.php</span>: <span class=sf-dump-num>26</span>
- …12
+ …%d
</samp>}
</samp>}
</bar>
diff --git a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
index 13629e9f..dd479670 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -289,7 +289,7 @@ stream resource {@{$ref}
%sTemplate.php:%d: {
: try {
: \$this->display(\$context);
- : } catch (Exception \$e) {
+ : } catch (%s \$e) {
}
%sCliDumperTest.php:{$line}: {
: }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE
index 39fa189d..207646a0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Fabien Potencier
+Copyright (c) 2014-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
index 30d2551f..e75ebaf8 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
@@ -2,7 +2,9 @@
namespace Symfony\Component\Workflow\Tests\Validator;
+use Symfony\Component\Workflow\Definition;
use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;
+use Symfony\Component\Workflow\Transition;
use Symfony\Component\Workflow\Validator\WorkflowValidator;
class WorkflowValidatorTest extends \PHPUnit_Framework_TestCase
@@ -26,4 +28,36 @@ class WorkflowValidatorTest extends \PHPUnit_Framework_TestCase
(new WorkflowValidator(true))->validate($definition, 'foo');
}
+
+ /**
+ * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
+ * @expectedExceptionMessage All transitions for a place must have an unique name. Multiple transitions named "t1" where found for place "a" in workflow "foo".
+ */
+ public function testWorkflowWithInvalidNames()
+ {
+ $places = range('a', 'c');
+
+ $transitions = array();
+ $transitions[] = new Transition('t0', 'c', 'b');
+ $transitions[] = new Transition('t1', 'a', 'b');
+ $transitions[] = new Transition('t1', 'a', 'c');
+
+ $definition = new Definition($places, $transitions);
+
+ (new WorkflowValidator())->validate($definition, 'foo');
+ }
+
+ public function testSameTransitionNameButNotSamePlace()
+ {
+ $places = range('a', 'd');
+
+ $transitions = array();
+ $transitions[] = new Transition('t1', 'a', 'b');
+ $transitions[] = new Transition('t1', 'b', 'c');
+ $transitions[] = new Transition('t1', 'd', 'c');
+
+ $definition = new Definition($places, $transitions);
+
+ (new WorkflowValidator())->validate($definition, 'foo');
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
index 5e8db290..3084be57 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowBuilderTrait.php
@@ -49,6 +49,34 @@ trait WorkflowBuilderTrait
// +---+ +----+ +---+ +----+ +---+
}
+ private function createWorkflowWithSameNameTransition()
+ {
+ $places = range('a', 'c');
+
+ $transitions = array();
+ $transitions[] = new Transition('a_to_bc', 'a', array('b', 'c'));
+ $transitions[] = new Transition('b_to_c', 'b', 'c');
+ $transitions[] = new Transition('to_a', 'b', 'a');
+ $transitions[] = new Transition('to_a', 'c', 'a');
+
+ return new Definition($places, $transitions);
+
+ // The graph looks like:
+ // +------------------------------------------------------------+
+ // | |
+ // | |
+ // | +----------------------------------------+ |
+ // v | v |
+ // +---+ +---------+ +---+ +--------+ +---+ +------+
+ // | a | --> | a_to_bc | --> | b | --> | b_to_c | --> | c | --> | to_a | -+
+ // +---+ +---------+ +---+ +--------+ +---+ +------+ |
+ // ^ | ^ |
+ // | +----------------------------------+ |
+ // | |
+ // | |
+ // +--------------------------------------------------------------------+
+ }
+
private function createComplexStateMachineDefinition()
{
$places = array('a', 'b', 'c', 'd');
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index cb5256f4..1766e66f 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -48,7 +48,7 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
public function testGetMarkingWithImpossiblePlace()
{
$subject = new \stdClass();
- $subject->marking = array('nope' => true);
+ $subject->marking = array('nope' => 1);
$workflow = new Workflow(new Definition(array(), array()), new MultipleStateMarkingStore());
$workflow->getMarking($subject);
@@ -83,10 +83,6 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($marking->has('c'));
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Transition "foobar" does not exist for workflow "unnamed".
- */
public function testCanWithUnexistingTransition()
{
$definition = $this->createComplexWorkflowDefinition();
@@ -94,7 +90,7 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
$subject->marking = null;
$workflow = new Workflow($definition, new MultipleStateMarkingStore());
- $workflow->can($subject, 'foobar');
+ $this->assertFalse($workflow->can($subject, 'foobar'));
}
public function testCan()
@@ -136,6 +132,23 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
$workflow->apply($subject, 't2');
}
+ public function testCanWithSameNameTransition()
+ {
+ $definition = $this->createWorkflowWithSameNameTransition();
+ $workflow = new Workflow($definition, new MultipleStateMarkingStore());
+
+ $subject = new \stdClass();
+ $subject->marking = null;
+ $this->assertTrue($workflow->can($subject, 'a_to_bc'));
+ $this->assertFalse($workflow->can($subject, 'b_to_c'));
+ $this->assertFalse($workflow->can($subject, 'to_a'));
+
+ $subject->marking = array('b' => 1);
+ $this->assertFalse($workflow->can($subject, 'a_to_bc'));
+ $this->assertTrue($workflow->can($subject, 'b_to_c'));
+ $this->assertTrue($workflow->can($subject, 'to_a'));
+ }
+
public function testApply()
{
$definition = $this->createComplexWorkflowDefinition();
@@ -151,6 +164,59 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($marking->has('c'));
}
+ public function testApplyWithSameNameTransition()
+ {
+ $subject = new \stdClass();
+ $subject->marking = null;
+ $definition = $this->createWorkflowWithSameNameTransition();
+ $workflow = new Workflow($definition, new MultipleStateMarkingStore());
+
+ $marking = $workflow->apply($subject, 'a_to_bc');
+
+ $this->assertFalse($marking->has('a'));
+ $this->assertTrue($marking->has('b'));
+ $this->assertTrue($marking->has('c'));
+
+ $marking = $workflow->apply($subject, 'to_a');
+
+ $this->assertTrue($marking->has('a'));
+ $this->assertFalse($marking->has('b'));
+ $this->assertFalse($marking->has('c'));
+
+ $marking = $workflow->apply($subject, 'a_to_bc');
+ $marking = $workflow->apply($subject, 'b_to_c');
+
+ $this->assertFalse($marking->has('a'));
+ $this->assertFalse($marking->has('b'));
+ $this->assertTrue($marking->has('c'));
+
+ $marking = $workflow->apply($subject, 'to_a');
+
+ $this->assertTrue($marking->has('a'));
+ $this->assertFalse($marking->has('b'));
+ $this->assertFalse($marking->has('c'));
+ }
+
+ public function testApplyWithSameNameTransition2()
+ {
+ $subject = new \stdClass();
+ $subject->marking = array('a' => 1, 'b' => 1);
+
+ $places = range('a', 'd');
+ $transitions = array();
+ $transitions[] = new Transition('t', 'a', 'c');
+ $transitions[] = new Transition('t', 'b', 'd');
+ $definition = new Definition($places, $transitions);
+ $workflow = new Workflow($definition, new MultipleStateMarkingStore());
+
+ $marking = $workflow->apply($subject, 't');
+
+ $this->assertFalse($marking->has('a'));
+ $this->assertFalse($marking->has('b'));
+ $this->assertTrue($marking->has('c'));
+ $this->assertTrue($marking->has('d'));
+ }
+
public function testApplyWithEventDispatcher()
{
$definition = $this->createComplexWorkflowDefinition();
@@ -198,17 +264,36 @@ class WorkflowTest extends \PHPUnit_Framework_TestCase
$this->assertEmpty($workflow->getEnabledTransitions($subject));
- $subject->marking = array('d' => true);
+ $subject->marking = array('d' => 1);
$transitions = $workflow->getEnabledTransitions($subject);
$this->assertCount(2, $transitions);
$this->assertSame('t3', $transitions[0]->getName());
$this->assertSame('t4', $transitions[1]->getName());
- $subject->marking = array('c' => true, 'e' => true);
+ $subject->marking = array('c' => 1, 'e' => 1);
$transitions = $workflow->getEnabledTransitions($subject);
$this->assertCount(1, $transitions);
$this->assertSame('t5', $transitions[0]->getName());
}
+
+ public function testGetEnabledTransitionsWithSameNameTransition()
+ {
+ $definition = $this->createWorkflowWithSameNameTransition();
+ $subject = new \stdClass();
+ $subject->marking = null;
+ $workflow = new Workflow($definition, new MultipleStateMarkingStore());
+
+ $transitions = $workflow->getEnabledTransitions($subject);
+ $this->assertCount(1, $transitions);
+ $this->assertSame('a_to_bc', $transitions[0]->getName());
+
+ $subject->marking = array('b' => 1, 'c' => 1);
+ $transitions = $workflow->getEnabledTransitions($subject);
+ $this->assertCount(3, $transitions);
+ $this->assertSame('b_to_c', $transitions[0]->getName());
+ $this->assertSame('to_a', $transitions[1]->getName());
+ $this->assertSame('to_a', $transitions[2]->getName());
+ }
}
class EventDispatcherMock implements \Symfony\Component\EventDispatcher\EventDispatcherInterface
@@ -223,21 +308,27 @@ class EventDispatcherMock implements \Symfony\Component\EventDispatcher\EventDis
public function addListener($eventName, $listener, $priority = 0)
{
}
+
public function addSubscriber(\Symfony\Component\EventDispatcher\EventSubscriberInterface $subscriber)
{
}
+
public function removeListener($eventName, $listener)
{
}
+
public function removeSubscriber(\Symfony\Component\EventDispatcher\EventSubscriberInterface $subscriber)
{
}
+
public function getListeners($eventName = null)
{
}
+
public function getListenerPriority($eventName, $listener)
{
}
+
public function hasListeners($eventName = null)
{
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
index cd31e1fb..27bd06f0 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Validator/WorkflowValidator.php
@@ -31,6 +31,17 @@ class WorkflowValidator implements DefinitionValidatorInterface
public function validate(Definition $definition, $name)
{
+ // Make sure all transitions for one place has unique name.
+ $places = array_fill_keys($definition->getPlaces(), array());
+ foreach ($definition->getTransitions() as $transition) {
+ foreach ($transition->getFroms() as $from) {
+ if (in_array($transition->getName(), $places[$from])) {
+ throw new InvalidDefinitionException(sprintf('All transitions for a place must have an unique name. Multiple transitions named "%s" where found for place "%s" in workflow "%s".', $transition->getName(), $from, $name));
+ }
+ $places[$from][] = $transition->getName();
+ }
+ }
+
if (!$this->singlePlace) {
return;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php
index b66cc85f..8fc64e97 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/Workflow.php
@@ -89,15 +89,18 @@ class Workflow
* @param string $transitionName A transition
*
* @return bool true if the transition is enabled
- *
- * @throws LogicException If the transition does not exist
*/
public function can($subject, $transitionName)
{
- $transitions = $this->getTransitions($transitionName);
- $marking = $this->getMarking($subject);
+ $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));
+
+ foreach ($transitions as $transition) {
+ if ($transitionName === $transition->getName()) {
+ return true;
+ }
+ }
- return null !== $this->getTransitionForSubject($subject, $marking, $transitions);
+ return false;
}
/**
@@ -113,22 +116,36 @@ class Workflow
*/
public function apply($subject, $transitionName)
{
- $transitions = $this->getTransitions($transitionName);
- $marking = $this->getMarking($subject);
+ $transitions = $this->getEnabledTransitions($subject, $this->getMarking($subject));
- if (null === $transition = $this->getTransitionForSubject($subject, $marking, $transitions)) {
- throw new LogicException(sprintf('Unable to apply transition "%s" for workflow "%s".', $transitionName, $this->name));
- }
+ // We can shortcut the getMarking method in order to boost performance,
+ // since the "getEnabledTransitions" method already checks the Marking
+ // state
+ $marking = $this->markingStore->getMarking($subject);
- $this->leave($subject, $transition, $marking);
+ $applied = false;
- $this->transition($subject, $transition, $marking);
+ foreach ($transitions as $transition) {
+ if ($transitionName !== $transition->getName()) {
+ continue;
+ }
- $this->enter($subject, $transition, $marking);
+ $applied = true;
- $this->markingStore->setMarking($subject, $marking);
+ $this->leave($subject, $transition, $marking);
- $this->announce($subject, $transition, $marking);
+ $this->transition($subject, $transition, $marking);
+
+ $this->enter($subject, $transition, $marking);
+
+ $this->markingStore->setMarking($subject, $marking);
+
+ $this->announce($subject, $transition, $marking);
+ }
+
+ if (!$applied) {
+ throw new LogicException(sprintf('Unable to apply transition "%s" for workflow "%s".', $transitionName, $this->name));
+ }
return $marking;
}
@@ -146,7 +163,7 @@ class Workflow
$marking = $this->getMarking($subject);
foreach ($this->definition->getTransitions() as $transition) {
- if (null !== $this->getTransitionForSubject($subject, $marking, array($transition))) {
+ if ($this->doCan($subject, $marking, $transition)) {
$enabled[] = $transition;
}
}
@@ -167,6 +184,21 @@ class Workflow
return $this->definition;
}
+ private function doCan($subject, Marking $marking, Transition $transition)
+ {
+ foreach ($transition->getFroms() as $place) {
+ if (!$marking->has($place)) {
+ return false;
+ }
+ }
+
+ if (true === $this->guardTransition($subject, $marking, $transition)) {
+ return false;
+ }
+
+ return true;
+ }
+
/**
* @param object $subject
* @param Marking $marking
@@ -246,56 +278,8 @@ class Workflow
$event = new Event($subject, $marking, $initialTransition);
- foreach ($this->definition->getTransitions() as $transition) {
- if (null !== $this->getTransitionForSubject($subject, $marking, array($transition))) {
- $this->dispatcher->dispatch(sprintf('workflow.%s.announce.%s', $this->name, $transition->getName()), $event);
- }
- }
- }
-
- /**
- * @param $transitionName
- *
- * @return Transition[]
- */
- private function getTransitions($transitionName)
- {
- $transitions = $this->definition->getTransitions();
-
- $transitions = array_filter($transitions, function (Transition $transition) use ($transitionName) {
- return $transitionName === $transition->getName();
- });
-
- if (!$transitions) {
- throw new LogicException(sprintf('Transition "%s" does not exist for workflow "%s".', $transitionName, $this->name));
- }
-
- return $transitions;
- }
-
- /**
- * Return the first Transition in $transitions that is valid for the
- * $subject and $marking. null is returned when you cannot do any Transition
- * in $transitions on the $subject.
- *
- * @param object $subject
- * @param Marking $marking
- * @param Transition[] $transitions
- *
- * @return Transition|null
- */
- private function getTransitionForSubject($subject, Marking $marking, array $transitions)
- {
- foreach ($transitions as $transition) {
- foreach ($transition->getFroms() as $place) {
- if (!$marking->has($place)) {
- continue 2;
- }
- }
-
- if (true !== $this->guardTransition($subject, $marking, $transition)) {
- return $transition;
- }
+ foreach ($this->getEnabledTransitions($subject) as $transition) {
+ $this->dispatcher->dispatch(sprintf('workflow.%s.announce.%s', $this->name, $transition->getName()), $event);
}
}
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json b/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json
index b2363abe..b30d5009 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json
+++ b/vendor/symfony/symfony/src/Symfony/Component/Workflow/composer.json
@@ -25,8 +25,7 @@
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1|~3.0",
- "twig/twig": "~1.14"
+ "symfony/event-dispatcher": "~2.1|~3.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Workflow\\": "" }
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php
index 8ad3b1e1..8f846b2b 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Inline.php
@@ -23,7 +23,7 @@ use Symfony\Component\Yaml\Exception\DumpException;
*/
class Inline
{
- const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+ const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
public static $parsedLineNumber;
@@ -463,7 +463,7 @@ class Inline
break;
}
- if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', '[', ']', '{', '}'), true)) {
+ if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {
@trigger_error('Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE b/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE
index 12a74531..17d16a13 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE
+++ b/vendor/symfony/symfony/src/Symfony/Component/Yaml/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2016 Fabien Potencier
+Copyright (c) 2004-2017 Fabien Potencier
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/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php
index cb886ada..f44625a2 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Parser.php
@@ -462,7 +462,7 @@ class Parser
$previousLineIndentation = $indent;
- if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
+ if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
$this->moveToPreviousLine();
break;
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 355deb45..137ef570 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -676,4 +676,14 @@ class InlineTest extends \PHPUnit_Framework_TestCase
{
Inline::parse('{this, is not, supported}');
}
+
+ public function testVeryLongQuotedStrings()
+ {
+ $longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);
+
+ $yamlString = Inline::dump(array('longStringWithQuotes' => $longStringWithQuotes));
+ $arrayFromYaml = Inline::parse($yamlString);
+
+ $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
+ }
}
diff --git a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php
index f2498d1b..0e4fb14a 100644
--- a/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/vendor/symfony/symfony/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -210,6 +210,22 @@ EOF;
);
$tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
+ $yaml = <<<'EOF'
+foo:
+- bar: |
+ one
+
+ two
+EOF;
+ $expected = array(
+ 'foo' => array(
+ array(
+ 'bar' => "one\n\ntwo",
+ ),
+ ),
+ );
+ $tests['Literal block chomping clip with embedded blank line inside unindented collection'] = array($expected, $yaml);
+
$yaml = <<<'EOF'
foo: |
one
diff --git a/vendor/twig/twig/.travis.yml b/vendor/twig/twig/.travis.yml
index 41b7510b..98a9fe68 100644
--- a/vendor/twig/twig/.travis.yml
+++ b/vendor/twig/twig/.travis.yml
@@ -7,38 +7,20 @@ cache:
- vendor
- $HOME/.composer/cache/files
-php:
- - 5.2
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - 7.0
- - 7.1
- - hhvm
-
-env:
- - TWIG_EXT=no
- - TWIG_EXT=yes
+matrix:
+ include:
+ - php: hhvm-stable
+ sudo: required
+ dist: trusty
+ - php: 7.0
+ - php: 7.1
+ allow_failures:
+ - php: hhvm-stable
+ fast_finish: true
before_install:
- if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
+ - if [[ $TRAVIS_PHP_VERSION = hhvm* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
install:
- # Composer is not available on PHP 5.2
- - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer install; fi
-
-before_script:
- - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
- - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
- - if [ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]; then sed -i.bak "s|vendor/autoload.php|test/bootstrap.php|" phpunit.xml.dist; fi
-
-matrix:
- fast_finish: true
- exclude:
- - php: hhvm
- env: TWIG_EXT=yes
- - php: 7.0
- env: TWIG_EXT=yes
- - php: 7.1
- env: TWIG_EXT=yes
+ - travis_retry composer install
diff --git a/vendor/twig/twig/LICENSE b/vendor/twig/twig/LICENSE
index cc74f810..b6e17a1a 100644
--- a/vendor/twig/twig/LICENSE
+++ b/vendor/twig/twig/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2016 by the Twig Team.
+Copyright (c) 2009-2017 by the Twig Team.
Some rights reserved.
diff --git a/vendor/twig/twig/composer.json b/vendor/twig/twig/composer.json
index c0ff2e28..2cd1f1ac 100644
--- a/vendor/twig/twig/composer.json
+++ b/vendor/twig/twig/composer.json
@@ -27,10 +27,11 @@
"forum": "https://groups.google.com/forum/#!forum/twig-users"
},
"require": {
- "php": ">=5.2.7"
+ "php": "^7.0",
+ "symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "~3.2@dev",
+ "symfony/phpunit-bridge": "~3.2",
"symfony/debug": "~2.7"
},
"autoload": {
@@ -38,9 +39,14 @@
"Twig_" : "lib/"
}
},
+ "autoload-dev": {
+ "psr-0" : {
+ "Twig_Tests_" : "test/"
+ }
+ },
"extra": {
"branch-alias": {
- "dev-master": "1.28-dev"
+ "dev-master": "2.1-dev"
}
}
}
diff --git a/vendor/twig/twig/ext/twig/config.m4 b/vendor/twig/twig/ext/twig/config.m4
deleted file mode 100644
index 83486be4..00000000
--- a/vendor/twig/twig/ext/twig/config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-dnl config.m4 for extension twig
-
-PHP_ARG_ENABLE(twig, whether to enable twig support,
-[ --enable-twig Enable twig support])
-
-if test "$PHP_TWIG" != "no"; then
- PHP_NEW_EXTENSION(twig, twig.c, $ext_shared)
-fi
diff --git a/vendor/twig/twig/ext/twig/config.w32 b/vendor/twig/twig/ext/twig/config.w32
deleted file mode 100644
index cb287b99..00000000
--- a/vendor/twig/twig/ext/twig/config.w32
+++ /dev/null
@@ -1,8 +0,0 @@
-// vim:ft=javascript
-
-ARG_ENABLE("twig", "Twig support", "no");
-
-if (PHP_TWIG != "no") {
- AC_DEFINE('HAVE_TWIG', 1);
- EXTENSION('twig', 'twig.c');
-}
diff --git a/vendor/twig/twig/ext/twig/php_twig.h b/vendor/twig/twig/ext/twig/php_twig.h
deleted file mode 100644
index f4f8e062..00000000
--- a/vendor/twig/twig/ext/twig/php_twig.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | Twig Extension |
- +----------------------------------------------------------------------+
- | Copyright (c) 2011 Derick Rethans |
- +----------------------------------------------------------------------+
- | Redistribution and use in source and binary forms, with or without |
- | modification, are permitted provided that the conditions mentioned |
- | in the accompanying LICENSE file are met (BSD-3-Clause). |
- +----------------------------------------------------------------------+
- | Author: Derick Rethans <derick@derickrethans.nl> |
- +----------------------------------------------------------------------+
- */
-
-#ifndef PHP_TWIG_H
-#define PHP_TWIG_H
-
-#define PHP_TWIG_VERSION "1.28.2"
-
-#include "php.h"
-
-extern zend_module_entry twig_module_entry;
-#define phpext_twig_ptr &twig_module_entry
-#ifndef PHP_WIN32
-zend_module_entry *get_module(void);
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-PHP_FUNCTION(twig_template_get_attributes);
-PHP_RSHUTDOWN_FUNCTION(twig);
-
-#endif
diff --git a/vendor/twig/twig/ext/twig/twig.c b/vendor/twig/twig/ext/twig/twig.c
deleted file mode 100644
index 08171a31..00000000
--- a/vendor/twig/twig/ext/twig/twig.c
+++ /dev/null
@@ -1,1127 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | Twig Extension |
- +----------------------------------------------------------------------+
- | Copyright (c) 2011 Derick Rethans |
- +----------------------------------------------------------------------+
- | Redistribution and use in source and binary forms, with or without |
- | modification, are permitted provided that the conditions mentioned |
- | in the accompanying LICENSE file are met (BSD-3-Clause). |
- +----------------------------------------------------------------------+
- | Author: Derick Rethans <derick@derickrethans.nl> |
- +----------------------------------------------------------------------+
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_twig.h"
-#include "ext/standard/php_var.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.h"
-#include "ext/spl/spl_exceptions.h"
-
-#include "Zend/zend_object_handlers.h"
-#include "Zend/zend_interfaces.h"
-#include "Zend/zend_exceptions.h"
-
-#ifndef Z_ADDREF_P
-#define Z_ADDREF_P(pz) (pz)->refcount++
-#endif
-
-#define FREE_DTOR(z) \
- zval_dtor(z); \
- efree(z);
-
-#if PHP_VERSION_ID >= 50300
- #define APPLY_TSRMLS_DC TSRMLS_DC
- #define APPLY_TSRMLS_CC TSRMLS_CC
- #define APPLY_TSRMLS_FETCH()
-#else
- #define APPLY_TSRMLS_DC
- #define APPLY_TSRMLS_CC
- #define APPLY_TSRMLS_FETCH() TSRMLS_FETCH()
-#endif
-
-ZEND_BEGIN_ARG_INFO_EX(twig_template_get_attribute_args, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 6)
- ZEND_ARG_INFO(0, template)
- ZEND_ARG_INFO(0, object)
- ZEND_ARG_INFO(0, item)
- ZEND_ARG_INFO(0, arguments)
- ZEND_ARG_INFO(0, type)
- ZEND_ARG_INFO(0, isDefinedTest)
-ZEND_END_ARG_INFO()
-
-#ifndef PHP_FE_END
-#define PHP_FE_END { NULL, NULL, NULL}
-#endif
-
-static const zend_function_entry twig_functions[] = {
- PHP_FE(twig_template_get_attributes, twig_template_get_attribute_args)
- PHP_FE_END
-};
-
-PHP_RSHUTDOWN_FUNCTION(twig)
-{
-#if ZEND_DEBUG
- CG(unclean_shutdown) = 0; /* get rid of PHPUnit's exit() and report memleaks */
-#endif
- return SUCCESS;
-}
-
-zend_module_entry twig_module_entry = {
- STANDARD_MODULE_HEADER,
- "twig",
- twig_functions,
- NULL,
- NULL,
- NULL,
- PHP_RSHUTDOWN(twig),
- NULL,
- PHP_TWIG_VERSION,
- STANDARD_MODULE_PROPERTIES
-};
-
-
-#ifdef COMPILE_DL_TWIG
-ZEND_GET_MODULE(twig)
-#endif
-
-static int TWIG_ARRAY_KEY_EXISTS(zval *array, zval *key)
-{
- if (Z_TYPE_P(array) != IS_ARRAY) {
- return 0;
- }
-
- switch (Z_TYPE_P(key)) {
- case IS_NULL:
- return zend_hash_exists(Z_ARRVAL_P(array), "", 1);
-
- case IS_BOOL:
- case IS_DOUBLE:
- convert_to_long(key);
- case IS_LONG:
- return zend_hash_index_exists(Z_ARRVAL_P(array), Z_LVAL_P(key));
-
- default:
- convert_to_string(key);
- return zend_symtable_exists(Z_ARRVAL_P(array), Z_STRVAL_P(key), Z_STRLEN_P(key) + 1);
- }
-}
-
-static int TWIG_INSTANCE_OF(zval *object, zend_class_entry *interface TSRMLS_DC)
-{
- if (Z_TYPE_P(object) != IS_OBJECT) {
- return 0;
- }
- return instanceof_function(Z_OBJCE_P(object), interface TSRMLS_CC);
-}
-
-static int TWIG_INSTANCE_OF_USERLAND(zval *object, char *interface TSRMLS_DC)
-{
- zend_class_entry **pce;
- if (Z_TYPE_P(object) != IS_OBJECT) {
- return 0;
- }
- if (zend_lookup_class(interface, strlen(interface), &pce TSRMLS_CC) == FAILURE) {
- return 0;
- }
- return instanceof_function(Z_OBJCE_P(object), *pce TSRMLS_CC);
-}
-
-static zval *TWIG_GET_ARRAYOBJECT_ELEMENT(zval *object, zval *offset TSRMLS_DC)
-{
- zend_class_entry *ce = Z_OBJCE_P(object);
- zval *retval;
-
- if (Z_TYPE_P(object) == IS_OBJECT) {
- SEPARATE_ARG_IF_REF(offset);
- zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset);
-
- zval_ptr_dtor(&offset);
-
- if (!retval) {
- if (!EG(exception)) {
- zend_error(E_ERROR, "Undefined offset for object of type %s used as array.", ce->name);
- }
- return NULL;
- }
-
- return retval;
- }
- return NULL;
-}
-
-static int TWIG_ISSET_ARRAYOBJECT_ELEMENT(zval *object, zval *offset TSRMLS_DC)
-{
- zend_class_entry *ce = Z_OBJCE_P(object);
- zval *retval;
-
- if (Z_TYPE_P(object) == IS_OBJECT) {
- SEPARATE_ARG_IF_REF(offset);
- zend_call_method_with_1_params(&object, ce, NULL, "offsetexists", &retval, offset);
-
- zval_ptr_dtor(&offset);
-
- if (!retval) {
- if (!EG(exception)) {
- zend_error(E_ERROR, "Undefined offset for object of type %s used as array.", ce->name);
- }
- return 0;
- }
-
- return (retval && Z_TYPE_P(retval) == IS_BOOL && Z_LVAL_P(retval));
- }
- return 0;
-}
-
-static char *TWIG_STRTOLOWER(const char *str, int str_len)
-{
- char *item_dup;
-
- item_dup = estrndup(str, str_len);
- php_strtolower(item_dup, str_len);
- return item_dup;
-}
-
-static zval *TWIG_CALL_USER_FUNC_ARRAY(zval *object, char *function, zval *arguments TSRMLS_DC)
-{
- zend_fcall_info fci;
- zval ***args = NULL;
- int arg_count = 0;
- HashTable *table;
- HashPosition pos;
- int i = 0;
- zval *retval_ptr;
- zval *zfunction;
-
- if (arguments) {
- table = HASH_OF(arguments);
- args = safe_emalloc(sizeof(zval **), table->nNumOfElements, 0);
-
- zend_hash_internal_pointer_reset_ex(table, &pos);
-
- while (zend_hash_get_current_data_ex(table, (void **)&args[i], &pos) == SUCCESS) {
- i++;
- zend_hash_move_forward_ex(table, &pos);
- }
- arg_count = table->nNumOfElements;
- }
-
- MAKE_STD_ZVAL(zfunction);
- ZVAL_STRING(zfunction, function, 1);
- fci.size = sizeof(fci);
- fci.function_table = EG(function_table);
- fci.function_name = zfunction;
- fci.symbol_table = NULL;
-#if PHP_VERSION_ID >= 50300
- fci.object_ptr = object;
-#else
- fci.object_pp = &object;
-#endif
- fci.retval_ptr_ptr = &retval_ptr;
- fci.param_count = arg_count;
- fci.params = args;
- fci.no_separation = 0;
-
- if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE) {
- ALLOC_INIT_ZVAL(retval_ptr);
- ZVAL_BOOL(retval_ptr, 0);
- }
-
- if (args) {
- efree(fci.params);
- }
- FREE_DTOR(zfunction);
- return retval_ptr;
-}
-
-static int TWIG_CALL_BOOLEAN(zval *object, char *functionName TSRMLS_DC)
-{
- zval *ret;
- int res;
-
- ret = TWIG_CALL_USER_FUNC_ARRAY(object, functionName, NULL TSRMLS_CC);
- res = Z_LVAL_P(ret);
- zval_ptr_dtor(&ret);
- return res;
-}
-
-static zval *TWIG_GET_STATIC_PROPERTY(zval *class, char *prop_name TSRMLS_DC)
-{
- zval **tmp_zval;
- zend_class_entry *ce;
-
- if (class == NULL || Z_TYPE_P(class) != IS_OBJECT) {
- return NULL;
- }
-
- ce = zend_get_class_entry(class TSRMLS_CC);
-#if PHP_VERSION_ID >= 50400
- tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0, NULL TSRMLS_CC);
-#else
- tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0 TSRMLS_CC);
-#endif
- return *tmp_zval;
-}
-
-static zval *TWIG_GET_ARRAY_ELEMENT_ZVAL(zval *class, zval *prop_name TSRMLS_DC)
-{
- zval **tmp_zval;
-
- if (class == NULL || Z_TYPE_P(class) != IS_ARRAY) {
- if (class != NULL && Z_TYPE_P(class) == IS_OBJECT && TWIG_INSTANCE_OF(class, zend_ce_arrayaccess TSRMLS_CC)) {
- // array access object
- return TWIG_GET_ARRAYOBJECT_ELEMENT(class, prop_name TSRMLS_CC);
- }
- return NULL;
- }
-
- switch(Z_TYPE_P(prop_name)) {
- case IS_NULL:
- zend_hash_find(HASH_OF(class), "", 1, (void**) &tmp_zval);
- return *tmp_zval;
-
- case IS_BOOL:
- case IS_DOUBLE:
- convert_to_long(prop_name);
- case IS_LONG:
- zend_hash_index_find(HASH_OF(class), Z_LVAL_P(prop_name), (void **) &tmp_zval);
- return *tmp_zval;
-
- case IS_STRING:
- zend_symtable_find(HASH_OF(class), Z_STRVAL_P(prop_name), Z_STRLEN_P(prop_name) + 1, (void**) &tmp_zval);
- return *tmp_zval;
- }
-
- return NULL;
-}
-
-static zval *TWIG_GET_ARRAY_ELEMENT(zval *class, char *prop_name, int prop_name_length TSRMLS_DC)
-{
- zval **tmp_zval;
-
- if (class == NULL/* || Z_TYPE_P(class) != IS_ARRAY*/) {
- return NULL;
- }
-
- if (class != NULL && Z_TYPE_P(class) == IS_OBJECT && TWIG_INSTANCE_OF(class, zend_ce_arrayaccess TSRMLS_CC)) {
- // array access object
- zval *tmp_name_zval;
- zval *tmp_ret_zval;
-
- ALLOC_INIT_ZVAL(tmp_name_zval);
- ZVAL_STRING(tmp_name_zval, prop_name, 1);
- tmp_ret_zval = TWIG_GET_ARRAYOBJECT_ELEMENT(class, tmp_name_zval TSRMLS_CC);
- FREE_DTOR(tmp_name_zval);
- return tmp_ret_zval;
- }
-
- if (zend_symtable_find(HASH_OF(class), prop_name, prop_name_length+1, (void**)&tmp_zval) == SUCCESS) {
- return *tmp_zval;
- }
- return NULL;
-}
-
-static zval *TWIG_PROPERTY(zval *object, zval *propname TSRMLS_DC)
-{
- zval *tmp = NULL;
-
- if (Z_OBJ_HT_P(object)->read_property) {
-#if PHP_VERSION_ID >= 50400
- tmp = Z_OBJ_HT_P(object)->read_property(object, propname, BP_VAR_IS, NULL TSRMLS_CC);
-#else
- tmp = Z_OBJ_HT_P(object)->read_property(object, propname, BP_VAR_IS TSRMLS_CC);
-#endif
- if (tmp == EG(uninitialized_zval_ptr)) {
- ZVAL_NULL(tmp);
- }
- }
- return tmp;
-}
-
-static int TWIG_HAS_PROPERTY(zval *object, zval *propname TSRMLS_DC)
-{
- if (Z_OBJ_HT_P(object)->has_property) {
-#if PHP_VERSION_ID >= 50400
- return Z_OBJ_HT_P(object)->has_property(object, propname, 0, NULL TSRMLS_CC);
-#else
- return Z_OBJ_HT_P(object)->has_property(object, propname, 0 TSRMLS_CC);
-#endif
- }
- return 0;
-}
-
-static int TWIG_HAS_DYNAMIC_PROPERTY(zval *object, char *prop, int prop_len TSRMLS_DC)
-{
- if (Z_OBJ_HT_P(object)->get_properties) {
- return zend_hash_quick_exists(
- Z_OBJ_HT_P(object)->get_properties(object TSRMLS_CC), // the properties hash
- prop, // property name
- prop_len + 1, // property length
- zend_get_hash_value(prop, prop_len + 1) // hash value
- );
- }
- return 0;
-}
-
-static zval *TWIG_PROPERTY_CHAR(zval *object, char *propname TSRMLS_DC)
-{
- zval *tmp_name_zval, *tmp;
-
- ALLOC_INIT_ZVAL(tmp_name_zval);
- ZVAL_STRING(tmp_name_zval, propname, 1);
- tmp = TWIG_PROPERTY(object, tmp_name_zval TSRMLS_CC);
- FREE_DTOR(tmp_name_zval);
- return tmp;
-}
-
-static zval *TWIG_CALL_S(zval *object, char *method, char *arg0 TSRMLS_DC)
-{
- zend_fcall_info fci;
- zval **args[1];
- zval *argument;
- zval *zfunction;
- zval *retval_ptr;
-
- MAKE_STD_ZVAL(argument);
- ZVAL_STRING(argument, arg0, 1);
- args[0] = &argument;
-
- MAKE_STD_ZVAL(zfunction);
- ZVAL_STRING(zfunction, method, 1);
- fci.size = sizeof(fci);
- fci.function_table = EG(function_table);
- fci.function_name = zfunction;
- fci.symbol_table = NULL;
-#if PHP_VERSION_ID >= 50300
- fci.object_ptr = object;
-#else
- fci.object_pp = &object;
-#endif
- fci.retval_ptr_ptr = &retval_ptr;
- fci.param_count = 1;
- fci.params = args;
- fci.no_separation = 0;
-
- if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE) {
- FREE_DTOR(zfunction);
- zval_ptr_dtor(&argument);
- return 0;
- }
- FREE_DTOR(zfunction);
- zval_ptr_dtor(&argument);
- return retval_ptr;
-}
-
-static int TWIG_CALL_SB(zval *object, char *method, char *arg0 TSRMLS_DC)
-{
- zval *retval_ptr;
- int success;
-
- retval_ptr = TWIG_CALL_S(object, method, arg0 TSRMLS_CC);
- success = (retval_ptr && (Z_TYPE_P(retval_ptr) == IS_BOOL) && Z_LVAL_P(retval_ptr));
-
- if (retval_ptr) {
- zval_ptr_dtor(&retval_ptr);
- }
-
- return success;
-}
-
-static int TWIG_CALL_ZZ(zval *object, char *method, zval *arg1, zval *arg2 TSRMLS_DC)
-{
- zend_fcall_info fci;
- zval **args[2];
- zval *zfunction;
- zval *retval_ptr;
- int success;
-
- args[0] = &arg1;
- args[1] = &arg2;
-
- MAKE_STD_ZVAL(zfunction);
- ZVAL_STRING(zfunction, method, 1);
- fci.size = sizeof(fci);
- fci.function_table = EG(function_table);
- fci.function_name = zfunction;
- fci.symbol_table = NULL;
-#if PHP_VERSION_ID >= 50300
- fci.object_ptr = object;
-#else
- fci.object_pp = &object;
-#endif
- fci.retval_ptr_ptr = &retval_ptr;
- fci.param_count = 2;
- fci.params = args;
- fci.no_separation = 0;
-
- if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE) {
- FREE_DTOR(zfunction);
- return 0;
- }
-
- FREE_DTOR(zfunction);
-
- success = (retval_ptr && (Z_TYPE_P(retval_ptr) == IS_BOOL) && Z_LVAL_P(retval_ptr));
- if (retval_ptr) {
- zval_ptr_dtor(&retval_ptr);
- }
-
- return success;
-}
-
-#ifndef Z_SET_REFCOUNT_P
-# define Z_SET_REFCOUNT_P(pz, rc) pz->refcount = rc
-# define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
-#endif
-
-static void TWIG_NEW(zval *object, char *class, zval *arg0, zval *arg1 TSRMLS_DC)
-{
- zend_class_entry **pce;
-
- if (zend_lookup_class(class, strlen(class), &pce TSRMLS_CC) == FAILURE) {
- return;
- }
-
- Z_TYPE_P(object) = IS_OBJECT;
- object_init_ex(object, *pce);
- Z_SET_REFCOUNT_P(object, 1);
- Z_UNSET_ISREF_P(object);
-
- TWIG_CALL_ZZ(object, "__construct", arg0, arg1 TSRMLS_CC);
-}
-
-static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
-{
- smart_str *buf;
- char *joiner;
- APPLY_TSRMLS_FETCH();
-
- buf = va_arg(args, smart_str*);
- joiner = va_arg(args, char*);
-
- if (buf->len != 0) {
- smart_str_appends(buf, joiner);
- }
-
- if (hash_key->nKeyLength == 0) {
- smart_str_append_long(buf, (long) hash_key->h);
- } else {
- char *key, *tmp_str;
- int key_len, tmp_len;
- key = php_addcslashes(hash_key->arKey, hash_key->nKeyLength - 1, &key_len, 0, "'\\", 2 TSRMLS_CC);
- tmp_str = php_str_to_str_ex(key, key_len, "\0", 1, "' . \"\\0\" . '", 12, &tmp_len, 0, NULL);
-
- smart_str_appendl(buf, tmp_str, tmp_len);
- efree(key);
- efree(tmp_str);
- }
-
- return 0;
-}
-
-static char *TWIG_IMPLODE_ARRAY_KEYS(char *joiner, zval *array TSRMLS_DC)
-{
- smart_str collector = { 0, 0, 0 };
-
- smart_str_appendl(&collector, "", 0);
- zend_hash_apply_with_arguments(HASH_OF(array) APPLY_TSRMLS_CC, twig_add_array_key_to_string, 2, &collector, joiner);
- smart_str_0(&collector);
-
- return collector.c;
-}
-
-static void TWIG_RUNTIME_ERROR(zval *template TSRMLS_DC, char *message, ...)
-{
- char *buffer;
- va_list args;
- zend_class_entry **pce;
- zval *ex;
- zval *constructor;
- zval *zmessage;
- zval *lineno;
- zval *filename_func;
- zval *filename;
- zval *constructor_args[3];
- zval *constructor_retval;
-
- if (zend_lookup_class("Twig_Error_Runtime", strlen("Twig_Error_Runtime"), &pce TSRMLS_CC) == FAILURE) {
- return;
- }
-
- va_start(args, message);
- vspprintf(&buffer, 0, message, args);
- va_end(args);
-
- MAKE_STD_ZVAL(ex);
- object_init_ex(ex, *pce);
-
- // Call Twig_Error constructor
- MAKE_STD_ZVAL(constructor);
- MAKE_STD_ZVAL(zmessage);
- MAKE_STD_ZVAL(lineno);
- MAKE_STD_ZVAL(filename);
- MAKE_STD_ZVAL(filename_func);
- MAKE_STD_ZVAL(constructor_retval);
-
- ZVAL_STRINGL(constructor, "__construct", sizeof("__construct")-1, 1);
- ZVAL_STRING(zmessage, buffer, 1);
- ZVAL_LONG(lineno, -1);
-
- // Get template filename
- ZVAL_STRINGL(filename_func, "getTemplateName", sizeof("getTemplateName")-1, 1);
- call_user_function(EG(function_table), &template, filename_func, filename, 0, 0 TSRMLS_CC);
-
- constructor_args[0] = zmessage;
- constructor_args[1] = lineno;
- constructor_args[2] = filename;
- call_user_function(EG(function_table), &ex, constructor, constructor_retval, 3, constructor_args TSRMLS_CC);
-
- zval_ptr_dtor(&constructor_retval);
- zval_ptr_dtor(&zmessage);
- zval_ptr_dtor(&lineno);
- zval_ptr_dtor(&filename);
- FREE_DTOR(constructor);
- FREE_DTOR(filename_func);
- efree(buffer);
-
- zend_throw_exception_object(ex TSRMLS_CC);
-}
-
-static char *TWIG_GET_CLASS_NAME(zval *object TSRMLS_DC)
-{
- char *class_name;
- zend_uint class_name_len;
-
- if (Z_TYPE_P(object) != IS_OBJECT) {
- return "";
- }
-#if PHP_API_VERSION >= 20100412
- zend_get_object_classname(object, (const char **) &class_name, &class_name_len TSRMLS_CC);
-#else
- zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC);
-#endif
- return class_name;
-}
-
-static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
-{
- zend_class_entry *ce;
- zval *retval;
- char *item;
- size_t item_len;
- zend_function *mptr = (zend_function *) pDest;
- APPLY_TSRMLS_FETCH();
-
- if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
- return 0;
- }
-
- ce = *va_arg(args, zend_class_entry**);
- retval = va_arg(args, zval*);
-
- item_len = strlen(mptr->common.function_name);
- item = estrndup(mptr->common.function_name, item_len);
- php_strtolower(item, item_len);
-
- if (strcmp("getenvironment", item) == 0) {
- zend_class_entry **twig_template_ce;
- if (zend_lookup_class("Twig_Template", strlen("Twig_Template"), &twig_template_ce TSRMLS_CC) == FAILURE) {
- return 0;
- }
- if (instanceof_function(ce, *twig_template_ce TSRMLS_CC)) {
- return 0;
- }
- }
-
- add_assoc_stringl_ex(retval, item, item_len+1, item, item_len, 0);
-
- return 0;
-}
-
-static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
-{
- zend_class_entry *ce;
- zval *retval;
- char *class_name, *prop_name;
- zend_property_info *pptr = (zend_property_info *) pDest;
- APPLY_TSRMLS_FETCH();
-
- if (!(pptr->flags & ZEND_ACC_PUBLIC) || (pptr->flags & ZEND_ACC_STATIC)) {
- return 0;
- }
-
- ce = *va_arg(args, zend_class_entry**);
- retval = va_arg(args, zval*);
-
-#if PHP_API_VERSION >= 20100412
- zend_unmangle_property_name(pptr->name, pptr->name_length, (const char **) &class_name, (const char **) &prop_name);
-#else
- zend_unmangle_property_name(pptr->name, pptr->name_length, &class_name, &prop_name);
-#endif
-
- add_assoc_string(retval, prop_name, prop_name, 1);
-
- return 0;
-}
-
-static void twig_add_class_to_cache(zval *cache, zval *object, char *class_name TSRMLS_DC)
-{
- zval *class_info, *class_methods, *class_properties;
- zend_class_entry *class_ce;
-
- class_ce = zend_get_class_entry(object TSRMLS_CC);
-
- ALLOC_INIT_ZVAL(class_info);
- ALLOC_INIT_ZVAL(class_methods);
- ALLOC_INIT_ZVAL(class_properties);
- array_init(class_info);
- array_init(class_methods);
- array_init(class_properties);
- // add all methods to self::cache[$class]['methods']
- zend_hash_apply_with_arguments(&class_ce->function_table APPLY_TSRMLS_CC, twig_add_method_to_class, 2, &class_ce, class_methods);
- zend_hash_apply_with_arguments(&class_ce->properties_info APPLY_TSRMLS_CC, twig_add_property_to_class, 2, &class_ce, class_properties);
-
- add_assoc_zval(class_info, "methods", class_methods);
- add_assoc_zval(class_info, "properties", class_properties);
- add_assoc_zval(cache, class_name, class_info);
-}
-
-/* {{{ proto mixed twig_template_get_attributes(TwigTemplate template, mixed object, mixed item, array arguments, string type, boolean isDefinedTest, boolean ignoreStrictCheck)
- A C implementation of TwigTemplate::getAttribute() */
-PHP_FUNCTION(twig_template_get_attributes)
-{
- zval *template;
- zval *object;
- char *item;
- int item_len;
- zval *zitem, ztmpitem;
- zval *arguments = NULL;
- zval *ret = NULL;
- char *type = NULL;
- int type_len = 0;
- zend_bool isDefinedTest = 0;
- zend_bool ignoreStrictCheck = 0;
- int free_ret = 0;
- zval *tmp_self_cache;
- char *class_name = NULL;
- zval *tmp_class;
- char *type_name;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ozz|asbb", &template, &object, &zitem, &arguments, &type, &type_len, &isDefinedTest, &ignoreStrictCheck) == FAILURE) {
- return;
- }
-
- // convert the item to a string
- ztmpitem = *zitem;
- zval_copy_ctor(&ztmpitem);
- convert_to_string(&ztmpitem);
- item_len = Z_STRLEN(ztmpitem);
- item = estrndup(Z_STRVAL(ztmpitem), item_len);
- zval_dtor(&ztmpitem);
-
- if (!type) {
- type = "any";
- }
-
-/*
- // array
- if (Twig_Template::METHOD_CALL !== $type) {
- $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
-
- if ((is_array($object) && array_key_exists($arrayItem, $object))
- || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
- ) {
- if ($isDefinedTest) {
- return true;
- }
-
- return $object[$arrayItem];
- }
-*/
-
-
- if (strcmp("method", type) != 0) {
- if ((TWIG_ARRAY_KEY_EXISTS(object, zitem))
- || (TWIG_INSTANCE_OF(object, zend_ce_arrayaccess TSRMLS_CC) && TWIG_ISSET_ARRAYOBJECT_ELEMENT(object, zitem TSRMLS_CC))
- ) {
-
- if (isDefinedTest) {
- efree(item);
- RETURN_TRUE;
- }
-
- ret = TWIG_GET_ARRAY_ELEMENT_ZVAL(object, zitem TSRMLS_CC);
-
- if (!ret) {
- ret = &EG(uninitialized_zval);
- }
- RETVAL_ZVAL(ret, 1, 0);
- if (free_ret) {
- zval_ptr_dtor(&ret);
- }
- efree(item);
- return;
- }
-/*
- if (Twig_Template::ARRAY_CALL === $type) {
- if ($isDefinedTest) {
- return false;
- }
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
- }
-*/
- if (strcmp("array", type) == 0 || Z_TYPE_P(object) != IS_OBJECT) {
- if (isDefinedTest) {
- efree(item);
- RETURN_FALSE;
- }
- if (ignoreStrictCheck || !TWIG_CALL_BOOLEAN(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "isStrictVariables" TSRMLS_CC)) {
- efree(item);
- return;
- }
-/*
- if ($object instanceof ArrayAccess) {
- $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist', $arrayItem, get_class($object));
- } elseif (is_object($object)) {
- $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface', $item, get_class($object));
- } elseif (is_array($object)) {
- if (empty($object)) {
- $message = sprintf('Key "%s" does not exist as the array is empty', $arrayItem);
- } else {
- $message = sprintf('Key "%s" for array with keys "%s" does not exist', $arrayItem, implode(', ', array_keys($object)));
- }
- } elseif (Twig_Template::ARRAY_CALL === $type) {
- if (null === $object) {
- $message = sprintf('Impossible to access a key ("%s") on a null variable', $item);
- } else {
- $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
- }
- } elseif (null === $object) {
- $message = sprintf('Impossible to access an attribute ("%s") on a null variable', $item);
- } else {
- $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
- }
- throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
- }
- }
-*/
- if (TWIG_INSTANCE_OF(object, zend_ce_arrayaccess TSRMLS_CC)) {
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Key \"%s\" in object with ArrayAccess of class \"%s\" does not exist.", item, TWIG_GET_CLASS_NAME(object TSRMLS_CC));
- } else if (Z_TYPE_P(object) == IS_OBJECT) {
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Impossible to access a key \"%s\" on an object of class \"%s\" that does not implement ArrayAccess interface.", item, TWIG_GET_CLASS_NAME(object TSRMLS_CC));
- } else if (Z_TYPE_P(object) == IS_ARRAY) {
- if (0 == zend_hash_num_elements(Z_ARRVAL_P(object))) {
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Key \"%s\" does not exist as the array is empty.", item);
- } else {
- char *array_keys = TWIG_IMPLODE_ARRAY_KEYS(", ", object TSRMLS_CC);
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Key \"%s\" for array with keys \"%s\" does not exist.", item, array_keys);
- efree(array_keys);
- }
- } else {
- char *type_name = zend_zval_type_name(object);
- Z_ADDREF_P(object);
- if (Z_TYPE_P(object) == IS_NULL) {
- convert_to_string(object);
- TWIG_RUNTIME_ERROR(template TSRMLS_CC,
- (strcmp("array", type) == 0)
- ? "Impossible to access a key (\"%s\") on a %s variable."
- : "Impossible to access an attribute (\"%s\") on a %s variable.",
- item, type_name);
- } else {
- convert_to_string(object);
- TWIG_RUNTIME_ERROR(template TSRMLS_CC,
- (strcmp("array", type) == 0)
- ? "Impossible to access a key (\"%s\") on a %s variable (\"%s\")."
- : "Impossible to access an attribute (\"%s\") on a %s variable (\"%s\").",
- item, type_name, Z_STRVAL_P(object));
- }
- zval_ptr_dtor(&object);
- }
- efree(item);
- return;
- }
- }
-
-/*
- if (!is_object($object)) {
- if ($isDefinedTest) {
- return false;
- }
-*/
-
- if (Z_TYPE_P(object) != IS_OBJECT) {
- if (isDefinedTest) {
- efree(item);
- RETURN_FALSE;
- }
-/*
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
- }
-
- if (null === $object) {
- $message = sprintf('Impossible to invoke a method ("%s") on a null variable', $item);
- } else {
- $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
- }
-
- throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
- }
-*/
- if (ignoreStrictCheck || !TWIG_CALL_BOOLEAN(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "isStrictVariables" TSRMLS_CC)) {
- efree(item);
- return;
- }
-
- type_name = zend_zval_type_name(object);
- Z_ADDREF_P(object);
- if (Z_TYPE_P(object) == IS_NULL) {
- convert_to_string_ex(&object);
-
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Impossible to invoke a method (\"%s\") on a %s variable.", item, type_name);
- } else {
- convert_to_string_ex(&object);
-
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Impossible to invoke a method (\"%s\") on a %s variable (\"%s\").", item, type_name, Z_STRVAL_P(object));
- }
-
- zval_ptr_dtor(&object);
- efree(item);
- return;
- }
-/*
- $class = get_class($object);
-*/
-
- class_name = TWIG_GET_CLASS_NAME(object TSRMLS_CC);
- tmp_self_cache = TWIG_GET_STATIC_PROPERTY(template, "cache" TSRMLS_CC);
- tmp_class = TWIG_GET_ARRAY_ELEMENT(tmp_self_cache, class_name, strlen(class_name) TSRMLS_CC);
-
- if (!tmp_class) {
- twig_add_class_to_cache(tmp_self_cache, object, class_name TSRMLS_CC);
- tmp_class = TWIG_GET_ARRAY_ELEMENT(tmp_self_cache, class_name, strlen(class_name) TSRMLS_CC);
- }
- efree(class_name);
-
-/*
- // object property
- if (Twig_Template::METHOD_CALL !== $type && !$object instanceof Twig_Template) {
- if (isset($object->$item) || array_key_exists((string) $item, $object)) {
- if ($isDefinedTest) {
- return true;
- }
-
- if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
- $this->env->getExtension('Twig_Extension_Sandbox')->checkPropertyAllowed($object, $item);
- }
-
- return $object->$item;
- }
- }
-*/
- if (strcmp("method", type) != 0 && !TWIG_INSTANCE_OF_USERLAND(object, "Twig_Template" TSRMLS_CC)) {
- zval *tmp_properties, *tmp_item;
-
- tmp_properties = TWIG_GET_ARRAY_ELEMENT(tmp_class, "properties", strlen("properties") TSRMLS_CC);
- tmp_item = TWIG_GET_ARRAY_ELEMENT(tmp_properties, item, item_len TSRMLS_CC);
-
- if (tmp_item || TWIG_HAS_PROPERTY(object, zitem TSRMLS_CC) || TWIG_HAS_DYNAMIC_PROPERTY(object, item, item_len TSRMLS_CC)) {
- if (isDefinedTest) {
- efree(item);
- RETURN_TRUE;
- }
- if (TWIG_CALL_SB(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "hasExtension", "Twig_Extension_Sandbox" TSRMLS_CC)) {
- TWIG_CALL_ZZ(TWIG_CALL_S(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "getExtension", "Twig_Extension_Sandbox" TSRMLS_CC), "checkPropertyAllowed", object, zitem TSRMLS_CC);
- }
- if (EG(exception)) {
- efree(item);
- return;
- }
-
- ret = TWIG_PROPERTY(object, zitem TSRMLS_CC);
- efree(item);
- RETURN_ZVAL(ret, 1, 0);
- }
- }
-/*
- // object method
- if (!isset(self::$cache[$class]['methods'])) {
- if ($object instanceof self) {
- $ref = new ReflectionClass($class);
- $methods = array();
-
- foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
- $methodName = strtolower($refMethod->name);
-
- // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
- if ('getenvironment' !== $methodName) {
- $methods[$methodName] = true;
- }
- }
-
- self::$cache[$class]['methods'] = $methods;
- } else {
- self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object)));
- }
- }
-
- $call = false;
- $lcItem = strtolower($item);
- if (isset(self::$cache[$class]['methods'][$lcItem])) {
- $method = (string) $item;
- } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
- $method = 'get'.$item;
- } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
- $method = 'is'.$item;
- } elseif (isset(self::$cache[$class]['methods']['__call'])) {
- $method = (string) $item;
- $call = true;
-*/
- {
- int call = 0;
- char *lcItem = TWIG_STRTOLOWER(item, item_len);
- int lcItem_length;
- char *method = NULL;
- char *tmp_method_name_get;
- char *tmp_method_name_is;
- zval *zmethod;
- zval *tmp_methods;
-
- lcItem_length = strlen(lcItem);
- tmp_method_name_get = emalloc(4 + lcItem_length);
- tmp_method_name_is = emalloc(3 + lcItem_length);
-
- sprintf(tmp_method_name_get, "get%s", lcItem);
- sprintf(tmp_method_name_is, "is%s", lcItem);
-
- tmp_methods = TWIG_GET_ARRAY_ELEMENT(tmp_class, "methods", strlen("methods") TSRMLS_CC);
-
- if (TWIG_GET_ARRAY_ELEMENT(tmp_methods, lcItem, lcItem_length TSRMLS_CC)) {
- method = item;
- } else if (TWIG_GET_ARRAY_ELEMENT(tmp_methods, tmp_method_name_get, lcItem_length + 3 TSRMLS_CC)) {
- method = tmp_method_name_get;
- } else if (TWIG_GET_ARRAY_ELEMENT(tmp_methods, tmp_method_name_is, lcItem_length + 2 TSRMLS_CC)) {
- method = tmp_method_name_is;
- } else if (TWIG_GET_ARRAY_ELEMENT(tmp_methods, "__call", 6 TSRMLS_CC)) {
- method = item;
- call = 1;
-/*
- } else {
- if ($isDefinedTest) {
- return false;
- }
-
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
- }
-
- throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist.', $item, get_class($object)), -1, $this->getTemplateName());
- }
-
- if ($isDefinedTest) {
- return true;
- }
-*/
- } else {
- efree(tmp_method_name_get);
- efree(tmp_method_name_is);
- efree(lcItem);
-
- if (isDefinedTest) {
- efree(item);
- RETURN_FALSE;
- }
- if (ignoreStrictCheck || !TWIG_CALL_BOOLEAN(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "isStrictVariables" TSRMLS_CC)) {
- efree(item);
- return;
- }
- TWIG_RUNTIME_ERROR(template TSRMLS_CC, "Neither the property \"%s\" nor one of the methods \"%s()\", \"get%s()\"/\"is%s()\" or \"__call()\" exist and have public access in class \"%s\".", item, item, item, item, TWIG_GET_CLASS_NAME(object TSRMLS_CC));
- efree(item);
- return;
- }
-
- if (isDefinedTest) {
- efree(tmp_method_name_get);
- efree(tmp_method_name_is);
- efree(lcItem);efree(item);
- RETURN_TRUE;
- }
-/*
- if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
- $this->env->getExtension('Twig_Extension_Sandbox')->checkMethodAllowed($object, $method);
- }
-*/
- MAKE_STD_ZVAL(zmethod);
- ZVAL_STRING(zmethod, method, 1);
- if (TWIG_CALL_SB(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "hasExtension", "Twig_Extension_Sandbox" TSRMLS_CC)) {
- TWIG_CALL_ZZ(TWIG_CALL_S(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "getExtension", "Twig_Extension_Sandbox" TSRMLS_CC), "checkMethodAllowed", object, zmethod TSRMLS_CC);
- }
- zval_ptr_dtor(&zmethod);
- if (EG(exception)) {
- efree(tmp_method_name_get);
- efree(tmp_method_name_is);
- efree(lcItem);efree(item);
- return;
- }
-/*
- // Some objects throw exceptions when they have __call, and the method we try
- // to call is not supported. If ignoreStrictCheck is true, we should return null.
- try {
- $ret = call_user_func_array(array($object, $method), $arguments);
- } catch (BadMethodCallException $e) {
- if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
- return null;
- }
- throw $e;
- }
-*/
- ret = TWIG_CALL_USER_FUNC_ARRAY(object, method, arguments TSRMLS_CC);
- if (EG(exception) && TWIG_INSTANCE_OF(EG(exception), spl_ce_BadMethodCallException TSRMLS_CC)) {
- if (ignoreStrictCheck || !TWIG_CALL_BOOLEAN(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "isStrictVariables" TSRMLS_CC)) {
- efree(tmp_method_name_get);
- efree(tmp_method_name_is);
- efree(lcItem);efree(item);
- zend_clear_exception(TSRMLS_C);
- return;
- }
- }
- free_ret = 1;
- efree(tmp_method_name_get);
- efree(tmp_method_name_is);
- efree(lcItem);
- }
-/*
- // useful when calling a template method from a template
- // this is not supported but unfortunately heavily used in the Symfony profiler
- if ($object instanceof Twig_TemplateInterface) {
- return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
- }
-
- return $ret;
-*/
- efree(item);
- // ret can be null, if e.g. the called method throws an exception
- if (ret) {
- if (TWIG_INSTANCE_OF_USERLAND(object, "Twig_TemplateInterface" TSRMLS_CC)) {
- if (Z_STRLEN_P(ret) != 0) {
- zval *charset = TWIG_CALL_USER_FUNC_ARRAY(TWIG_PROPERTY_CHAR(template, "env" TSRMLS_CC), "getCharset", NULL TSRMLS_CC);
- TWIG_NEW(return_value, "Twig_Markup", ret, charset TSRMLS_CC);
- zval_ptr_dtor(&charset);
- if (ret) {
- zval_ptr_dtor(&ret);
- }
- return;
- }
- }
-
- RETVAL_ZVAL(ret, 1, 0);
- if (free_ret) {
- zval_ptr_dtor(&ret);
- }
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Autoloader.php b/vendor/twig/twig/lib/Twig/Autoloader.php
deleted file mode 100644
index 14016b29..00000000
--- a/vendor/twig/twig/lib/Twig/Autoloader.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Autoloader class is deprecated since version 1.21 and will be removed in 2.0. Use Composer instead.', E_USER_DEPRECATED);
-
-/**
- * Autoloads Twig classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.21 and will be removed in 2.0. Use Composer instead. 2.0.
- */
-class Twig_Autoloader
-{
- /**
- * Registers Twig_Autoloader as an SPL autoloader.
- *
- * @param bool $prepend Whether to prepend the autoloader or not.
- */
- public static function register($prepend = false)
- {
- @trigger_error('Using Twig_Autoloader is deprecated since version 1.21. Use Composer instead.', E_USER_DEPRECATED);
-
- if (PHP_VERSION_ID < 50300) {
- spl_autoload_register(array(__CLASS__, 'autoload'));
- } else {
- spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
- }
- }
-
- /**
- * Handles autoloading of classes.
- *
- * @param string $class A class name.
- */
- public static function autoload($class)
- {
- if (0 !== strpos($class, 'Twig')) {
- return;
- }
-
- if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
- require $file;
- }
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php b/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
index c2e7b7ea..bb83de40 100644
--- a/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
+++ b/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
@@ -16,27 +16,13 @@
*/
abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
{
- /**
- * {@inheritdoc}
- */
- final public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
+ final public function enterNode(Twig_Node $node, Twig_Environment $env)
{
- if (!$node instanceof Twig_Node) {
- throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
- }
-
return $this->doEnterNode($node, $env);
}
- /**
- * {@inheritdoc}
- */
- final public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
+ final public function leaveNode(Twig_Node $node, Twig_Environment $env)
{
- if (!$node instanceof Twig_Node) {
- throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
- }
-
return $this->doLeaveNode($node, $env);
}
diff --git a/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
index 9e70ca9e..de4e5072 100644
--- a/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ b/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -31,9 +31,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
$this->options = $options;
}
- /**
- * {@inheritdoc}
- */
public function generateKey($name, $className)
{
$hash = hash('sha256', $className);
@@ -41,9 +38,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
return $this->directory.$hash[0].$hash[1].'/'.$hash.'.php';
}
- /**
- * {@inheritdoc}
- */
public function load($key)
{
if (file_exists($key)) {
@@ -51,9 +45,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
}
}
- /**
- * {@inheritdoc}
- */
public function write($key, $content)
{
$dir = dirname($key);
@@ -84,9 +75,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
}
- /**
- * {@inheritdoc}
- */
public function getTimestamp($key)
{
if (!file_exists($key)) {
diff --git a/vendor/twig/twig/lib/Twig/Cache/Null.php b/vendor/twig/twig/lib/Twig/Cache/Null.php
index fde8c808..34738927 100644
--- a/vendor/twig/twig/lib/Twig/Cache/Null.php
+++ b/vendor/twig/twig/lib/Twig/Cache/Null.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,33 +14,21 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Cache_Null implements Twig_CacheInterface
+final class Twig_Cache_Null implements Twig_CacheInterface
{
- /**
- * {@inheritdoc}
- */
public function generateKey($name, $className)
{
return '';
}
- /**
- * {@inheritdoc}
- */
public function write($key, $content)
{
}
- /**
- * {@inheritdoc}
- */
public function load($key)
{
}
- /**
- * {@inheritdoc}
- */
public function getTimestamp($key)
{
return 0;
diff --git a/vendor/twig/twig/lib/Twig/CacheInterface.php b/vendor/twig/twig/lib/Twig/CacheInterface.php
index 9b17e0f4..2a3f04dd 100644
--- a/vendor/twig/twig/lib/Twig/CacheInterface.php
+++ b/vendor/twig/twig/lib/Twig/CacheInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Compiler.php b/vendor/twig/twig/lib/Twig/Compiler.php
index 5e96ac35..53b96515 100644
--- a/vendor/twig/twig/lib/Twig/Compiler.php
+++ b/vendor/twig/twig/lib/Twig/Compiler.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,32 +15,21 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Compiler implements Twig_CompilerInterface
+class Twig_Compiler
{
- protected $lastLine;
- protected $source;
- protected $indentation;
- protected $env;
- protected $debugInfo = array();
- protected $sourceOffset;
- protected $sourceLine;
- protected $filename;
+ private $lastLine;
+ private $source;
+ private $indentation;
+ private $env;
+ private $debugInfo = array();
+ private $sourceOffset;
+ private $sourceLine;
public function __construct(Twig_Environment $env)
{
$this->env = $env;
}
- /**
- * @deprecated since 1.25 (to be removed in 2.0)
- */
- public function getFilename()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
- return $this->filename;
- }
-
/**
* Returns the environment instance related to this compiler.
*
@@ -64,12 +53,12 @@ class Twig_Compiler implements Twig_CompilerInterface
/**
* Compiles a node.
*
- * @param Twig_NodeInterface $node The node to compile
- * @param int $indentation The current indentation
+ * @param Twig_Node $node The node to compile
+ * @param int $indentation The current indentation
*
* @return $this
*/
- public function compile(Twig_NodeInterface $node, $indentation = 0)
+ public function compile(Twig_Node $node, $indentation = 0)
{
$this->lastLine = null;
$this->source = '';
@@ -79,17 +68,12 @@ class Twig_Compiler implements Twig_CompilerInterface
$this->sourceLine = 1;
$this->indentation = $indentation;
- if ($node instanceof Twig_Node_Module) {
- // to be removed in 2.0
- $this->filename = $node->getTemplateName();
- }
-
$node->compile($this);
return $this;
}
- public function subcompile(Twig_NodeInterface $node, $raw = true)
+ public function subcompile(Twig_Node $node, $raw = true)
{
if (false === $raw) {
$this->source .= str_repeat(' ', $this->indentation * 4);
@@ -119,9 +103,8 @@ class Twig_Compiler implements Twig_CompilerInterface
*
* @return $this
*/
- public function write()
+ public function write(...$strings)
{
- $strings = func_get_args();
foreach ($strings as $string) {
$this->source .= str_repeat(' ', $this->indentation * 4).$string;
}
@@ -129,22 +112,6 @@ class Twig_Compiler implements Twig_CompilerInterface
return $this;
}
- /**
- * Appends an indentation to the current PHP code after compilation.
- *
- * @return $this
- *
- * @deprecated since 1.27 (to be removed in 2.0).
- */
- public function addIndentation()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use write(\'\') instead.', E_USER_DEPRECATED);
-
- $this->source .= str_repeat(' ', $this->indentation * 4);
-
- return $this;
- }
-
/**
* Adds a quoted string to the compiled code.
*
@@ -207,20 +174,12 @@ class Twig_Compiler implements Twig_CompilerInterface
*
* @return $this
*/
- public function addDebugInfo(Twig_NodeInterface $node)
+ public function addDebugInfo(Twig_Node $node)
{
if ($node->getTemplateLine() != $this->lastLine) {
$this->write(sprintf("// line %d\n", $node->getTemplateLine()));
- // when mbstring.func_overload is set to 2
- // mb_substr_count() replaces substr_count()
- // but they have different signatures!
- if (((int) ini_get('mbstring.func_overload')) & 2) {
- // this is much slower than the "right" version
- $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
- } else {
- $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
- }
+ $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
$this->sourceOffset = strlen($this->source);
$this->debugInfo[$this->sourceLine] = $node->getTemplateLine();
diff --git a/vendor/twig/twig/lib/Twig/CompilerInterface.php b/vendor/twig/twig/lib/Twig/CompilerInterface.php
deleted file mode 100644
index 70350ca5..00000000
--- a/vendor/twig/twig/lib/Twig/CompilerInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by compiler classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_CompilerInterface
-{
- /**
- * Compiles a node.
- *
- * @return $this
- */
- public function compile(Twig_NodeInterface $node);
-
- /**
- * Gets the current PHP code after compilation.
- *
- * @return string The PHP code
- */
- public function getSource();
-}
diff --git a/vendor/twig/twig/lib/Twig/Environment.php b/vendor/twig/twig/lib/Twig/Environment.php
index 7153790e..4cbad1c0 100644
--- a/vendor/twig/twig/lib/Twig/Environment.php
+++ b/vendor/twig/twig/lib/Twig/Environment.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,45 +16,29 @@
*/
class Twig_Environment
{
- const VERSION = '1.28.2';
- const VERSION_ID = 12802;
- const MAJOR_VERSION = 1;
- const MINOR_VERSION = 28;
- const RELEASE_VERSION = 2;
+ const VERSION = '2.1.0';
+ const VERSION_ID = 20100;
+ const MAJOR_VERSION = 2;
+ const MINOR_VERSION = 1;
+ const RELEASE_VERSION = 0;
const EXTRA_VERSION = '';
- protected $charset;
- protected $loader;
- protected $debug;
- protected $autoReload;
- protected $cache;
- protected $lexer;
- protected $parser;
- protected $compiler;
- protected $baseTemplateClass;
- protected $extensions;
- protected $parsers;
- protected $visitors;
- protected $filters;
- protected $tests;
- protected $functions;
- protected $globals;
- protected $runtimeInitialized = false;
- protected $extensionInitialized = false;
- protected $loadedTemplates;
- protected $strictVariables;
- protected $unaryOperators;
- protected $binaryOperators;
- protected $templateClassPrefix = '__TwigTemplate_';
- protected $functionCallbacks = array();
- protected $filterCallbacks = array();
- protected $staging;
-
+ private $charset;
+ private $loader;
+ private $debug;
+ private $autoReload;
+ private $cache;
+ private $lexer;
+ private $parser;
+ private $compiler;
+ private $baseTemplateClass;
+ private $globals = array();
+ private $resolvedGlobals;
+ private $loadedTemplates;
+ private $strictVariables;
+ private $templateClassPrefix = '__TwigTemplate_';
private $originalCache;
- private $bcWriteCacheFile = false;
- private $bcGetCacheFilename = false;
- private $lastModifiedExtension = 0;
- private $extensionsByClass = array();
+ private $extensionSet;
private $runtimeLoaders = array();
private $runtimes = array();
private $optionsHash;
@@ -85,7 +69,6 @@ class Twig_Environment
*
* * autoescape: Whether to enable auto-escaping (default to html):
* * false: disable auto-escaping
- * * true: equivalent to html
* * html, js: set the autoescaping to one of the supported strategies
* * name: set the autoescaping strategy based on the template name extension
* * PHP callback: a PHP callback that returns an escaping strategy based on the template "name"
@@ -97,13 +80,9 @@ class Twig_Environment
* @param Twig_LoaderInterface $loader
* @param array $options An array of options
*/
- public function __construct(Twig_LoaderInterface $loader = null, $options = array())
+ public function __construct(Twig_LoaderInterface $loader, $options = array())
{
- if (null !== $loader) {
- $this->setLoader($loader);
- } else {
- @trigger_error('Not passing a Twig_LoaderInterface as the first constructor argument of Twig_Environment is deprecated since version 1.21.', E_USER_DEPRECATED);
- }
+ $this->setLoader($loader);
$options = array_merge(array(
'debug' => false,
@@ -117,33 +96,16 @@ class Twig_Environment
), $options);
$this->debug = (bool) $options['debug'];
- $this->charset = strtoupper($options['charset']);
+ $this->setCharset($options['charset']);
$this->baseTemplateClass = $options['base_template_class'];
$this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
$this->strictVariables = (bool) $options['strict_variables'];
$this->setCache($options['cache']);
+ $this->extensionSet = new Twig_ExtensionSet();
$this->addExtension(new Twig_Extension_Core());
$this->addExtension(new Twig_Extension_Escaper($options['autoescape']));
$this->addExtension(new Twig_Extension_Optimizer($options['optimizations']));
- $this->staging = new Twig_Extension_Staging();
-
- // For BC
- if (is_string($this->originalCache)) {
- $r = new ReflectionMethod($this, 'writeCacheFile');
- if ($r->getDeclaringClass()->getName() !== __CLASS__) {
- @trigger_error('The Twig_Environment::writeCacheFile method is deprecated since version 1.22 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
- $this->bcWriteCacheFile = true;
- }
-
- $r = new ReflectionMethod($this, 'getCacheFilename');
- if ($r->getDeclaringClass()->getName() !== __CLASS__) {
- @trigger_error('The Twig_Environment::getCacheFilename method is deprecated since version 1.22 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
- $this->bcGetCacheFilename = true;
- }
- }
}
/**
@@ -278,10 +240,6 @@ class Twig_Environment
} elseif (false === $cache) {
$this->originalCache = $cache;
$this->cache = new Twig_Cache_Null();
- } elseif (null === $cache) {
- @trigger_error('Using "null" as the cache strategy is deprecated since version 1.23 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
- $this->originalCache = false;
- $this->cache = new Twig_Cache_Null();
} elseif ($cache instanceof Twig_CacheInterface) {
$this->originalCache = $this->cache = $cache;
} else {
@@ -289,24 +247,6 @@ class Twig_Environment
}
}
- /**
- * Gets the cache filename for a given template.
- *
- * @param string $name The template name
- *
- * @return string|false The cache file name or false when caching is disabled
- *
- * @deprecated since 1.22 (to be removed in 2.0)
- */
- public function getCacheFilename($name)
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- $key = $this->cache->generateKey($name, $this->getTemplateClass($name));
-
- return !$key ? false : $key;
- }
-
/**
* Gets the template class associated with the given string.
*
@@ -331,20 +271,6 @@ class Twig_Environment
return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
}
- /**
- * Gets the template class prefix.
- *
- * @return string The template class prefix
- *
- * @deprecated since 1.22 (to be removed in 2.0)
- */
- public function getTemplateClassPrefix()
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->templateClassPrefix;
- }
-
/**
* Renders a template.
*
@@ -406,50 +332,38 @@ class Twig_Environment
* @param string $name The template name
* @param int $index The index if it is an embedded template
*
- * @return Twig_TemplateInterface A template instance representing the given template name
+ * @return Twig_Template A template instance representing the given template name
*
- * @throws Twig_Error_Loader When the template cannot be found
- * @throws Twig_Error_Syntax When an error occurred during compilation
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Runtime When a previously generated cache is corrupted
+ * @throws Twig_Error_Syntax When an error occurred during compilation
*
* @internal
*/
public function loadTemplate($name, $index = null)
{
- $cls = $this->getTemplateClass($name, $index);
+ $cls = $mainCls = $this->getTemplateClass($name);
+ if (null !== $index) {
+ $cls .= '_'.$index;
+ }
if (isset($this->loadedTemplates[$cls])) {
return $this->loadedTemplates[$cls];
}
if (!class_exists($cls, false)) {
- if ($this->bcGetCacheFilename) {
- $key = $this->getCacheFilename($name);
- } else {
- $key = $this->cache->generateKey($name, $cls);
- }
+ $key = $this->cache->generateKey($name, $mainCls);
if (!$this->isAutoReload() || $this->isTemplateFresh($name, $this->cache->getTimestamp($key))) {
$this->cache->load($key);
}
if (!class_exists($cls, false)) {
- $loader = $this->getLoader();
- if (!$loader instanceof Twig_SourceContextLoaderInterface) {
- $source = new Twig_Source($loader->getSource($name), $name);
- } else {
- $source = $loader->getSourceContext($name);
- }
-
- $content = $this->compileSource($source);
-
- if ($this->bcWriteCacheFile) {
- $this->writeCacheFile($key, $content);
- } else {
- $this->cache->write($key, $content);
- $this->cache->load($key);
- }
+ $content = $this->compileSource($this->getLoader()->getSourceContext($name));
+ $this->cache->write($key, $content);
+ $this->cache->load($key);
- if (!class_exists($cls, false)) {
+ if (!class_exists($mainCls, false)) {
/* Last line of defense if either $this->bcWriteCacheFile was used,
* $this->cache is implemented as a no-op or we have a race condition
* where the cache was cleared between the above calls to write to and load from
@@ -458,12 +372,15 @@ class Twig_Environment
eval('?>'.$content);
}
}
- }
- if (!$this->runtimeInitialized) {
- $this->initRuntime();
+ if (!class_exists($cls, false)) {
+ throw new Twig_Error_Runtime(sprintf('Failed to load Twig template "%s", index "%s": cache is corrupted.', $name, $index), -1, $source);
+ }
}
+ // to be removed in 3.0
+ $this->extensionSet->initRuntime($this);
+
return $this->loadedTemplates[$cls] = new $cls($this);
}
@@ -491,16 +408,9 @@ class Twig_Environment
$this->setLoader($loader);
try {
$template = $this->loadTemplate($name);
- } catch (Exception $e) {
- $this->setLoader($current);
-
- throw $e;
- } catch (Throwable $e) {
+ } finally {
$this->setLoader($current);
-
- throw $e;
}
- $this->setLoader($current);
return $template;
}
@@ -519,22 +429,13 @@ class Twig_Environment
*/
public function isTemplateFresh($name, $time)
{
- if (0 === $this->lastModifiedExtension) {
- foreach ($this->extensions as $extension) {
- $r = new ReflectionObject($extension);
- if (file_exists($r->getFileName()) && ($extensionTime = filemtime($r->getFileName())) > $this->lastModifiedExtension) {
- $this->lastModifiedExtension = $extensionTime;
- }
- }
- }
-
- return $this->lastModifiedExtension <= $time && $this->getLoader()->isFresh($name, $time);
+ return $this->extensionSet->getLastModified() <= $time && $this->getLoader()->isFresh($name, $time);
}
/**
* Tries to load a template consecutively from an array.
*
- * Similar to loadTemplate() but it also accepts Twig_TemplateInterface instances and an array
+ * Similar to loadTemplate() but it also accepts Twig_Template instances and an array
* of templates where each is tried to be loaded.
*
* @param string|Twig_Template|array $names A template or an array of templates to try consecutively
@@ -568,55 +469,7 @@ class Twig_Environment
throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
}
- /**
- * Clears the internal template cache.
- *
- * @deprecated since 1.18.3 (to be removed in 2.0)
- */
- public function clearTemplateCache()
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.18.3 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- $this->loadedTemplates = array();
- }
-
- /**
- * Clears the template cache files on the filesystem.
- *
- * @deprecated since 1.22 (to be removed in 2.0)
- */
- public function clearCacheFiles()
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- if (is_string($this->originalCache)) {
- foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->originalCache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
- if ($file->isFile()) {
- @unlink($file->getPathname());
- }
- }
- }
- }
-
- /**
- * Gets the Lexer instance.
- *
- * @return Twig_LexerInterface
- *
- * @deprecated since 1.25 (to be removed in 2.0)
- */
- public function getLexer()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
- if (null === $this->lexer) {
- $this->lexer = new Twig_Lexer($this);
- }
-
- return $this->lexer;
- }
-
- public function setLexer(Twig_LexerInterface $lexer)
+ public function setLexer(Twig_Lexer $lexer)
{
$this->lexer = $lexer;
}
@@ -624,20 +477,12 @@ class Twig_Environment
/**
* Tokenizes a source code.
*
- * @param string|Twig_Source $source The template source code
- * @param string $name The template name (deprecated)
- *
* @return Twig_TokenStream
*
* @throws Twig_Error_Syntax When the code is syntactically wrong
*/
- public function tokenize($source, $name = null)
+ public function tokenize(Twig_Source $source)
{
- if (!$source instanceof Twig_Source) {
- @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
- $source = new Twig_Source($source, $name);
- }
-
if (null === $this->lexer) {
$this->lexer = new Twig_Lexer($this);
}
@@ -645,25 +490,7 @@ class Twig_Environment
return $this->lexer->tokenize($source);
}
- /**
- * Gets the Parser instance.
- *
- * @return Twig_ParserInterface
- *
- * @deprecated since 1.25 (to be removed in 2.0)
- */
- public function getParser()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
- if (null === $this->parser) {
- $this->parser = new Twig_Parser($this);
- }
-
- return $this->parser;
- }
-
- public function setParser(Twig_ParserInterface $parser)
+ public function setParser(Twig_Parser $parser)
{
$this->parser = $parser;
}
@@ -684,25 +511,7 @@ class Twig_Environment
return $this->parser->parse($stream);
}
- /**
- * Gets the Compiler instance.
- *
- * @return Twig_CompilerInterface
- *
- * @deprecated since 1.25 (to be removed in 2.0)
- */
- public function getCompiler()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
- if (null === $this->compiler) {
- $this->compiler = new Twig_Compiler($this);
- }
-
- return $this->compiler;
- }
-
- public function setCompiler(Twig_CompilerInterface $compiler)
+ public function setCompiler(Twig_Compiler $compiler)
{
$this->compiler = $compiler;
}
@@ -712,7 +521,7 @@ class Twig_Environment
*
* @return string The compiled PHP source code
*/
- public function compile(Twig_NodeInterface $node)
+ public function compile(Twig_Node $node)
{
if (null === $this->compiler) {
$this->compiler = new Twig_Compiler($this);
@@ -724,36 +533,24 @@ class Twig_Environment
/**
* Compiles a template source code.
*
- * @param string|Twig_Source $source The template source code
- * @param string $name The template name (deprecated)
- *
* @return string The compiled PHP source code
*
* @throws Twig_Error_Syntax When there was an error during tokenizing, parsing or compiling
*/
- public function compileSource($source, $name = null)
+ public function compileSource(Twig_Source $source)
{
- if (!$source instanceof Twig_Source) {
- @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
- $source = new Twig_Source($source, $name);
- }
-
try {
return $this->compile($this->parse($this->tokenize($source)));
} catch (Twig_Error $e) {
- $e->setTemplateName($source->getName());
+ $e->setSourceContext($source);
throw $e;
} catch (Exception $e) {
- throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $source->getName(), $e);
+ throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $source, $e);
}
}
public function setLoader(Twig_LoaderInterface $loader)
{
- if (!$loader instanceof Twig_SourceContextLoaderInterface && 0 !== strpos(get_class($loader), 'Mock_Twig_LoaderInterface')) {
- @trigger_error(sprintf('Twig loader "%s" should implement Twig_SourceContextLoaderInterface since version 1.27.', get_class($loader)), E_USER_DEPRECATED);
- }
-
$this->loader = $loader;
}
@@ -764,10 +561,6 @@ class Twig_Environment
*/
public function getLoader()
{
- if (null === $this->loader) {
- throw new LogicException('You must set a loader first.');
- }
-
return $this->loader;
}
@@ -778,7 +571,12 @@ class Twig_Environment
*/
public function setCharset($charset)
{
- $this->charset = strtoupper($charset);
+ if ('UTF8' === $charset = strtoupper($charset)) {
+ // iconv on Windows requires "UTF-8" instead of "UTF8"
+ $charset = 'UTF-8';
+ }
+
+ $this->charset = $charset;
}
/**
@@ -791,28 +589,6 @@ class Twig_Environment
return $this->charset;
}
- /**
- * Initializes the runtime environment.
- *
- * @deprecated since 1.23 (to be removed in 2.0)
- */
- public function initRuntime()
- {
- $this->runtimeInitialized = true;
-
- foreach ($this->getExtensions() as $name => $extension) {
- if (!$extension instanceof Twig_Extension_InitRuntimeInterface) {
- $m = new ReflectionMethod($extension, 'initRuntime');
-
- if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
- @trigger_error(sprintf('Defining the initRuntime() method in the "%s" extension is deprecated since version 1.23. Use the `needs_environment` option to get the Twig_Environment instance in filters, functions, or tests; or explicitly implement Twig_Extension_InitRuntimeInterface if needed (not recommended).', $name), E_USER_DEPRECATED);
- }
- }
-
- $extension->initRuntime($this);
- }
- }
-
/**
* Returns true if the given extension is registered.
*
@@ -822,16 +598,7 @@ class Twig_Environment
*/
public function hasExtension($class)
{
- $class = ltrim($class, '\\');
- if (isset($this->extensions[$class])) {
- if ($class !== get_class($this->extensions[$class])) {
- @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
- }
-
- return true;
- }
-
- return isset($this->extensionsByClass[ltrim($class, '\\')]);
+ return $this->extensionSet->hasExtension($class);
}
/**
@@ -851,21 +618,7 @@ class Twig_Environment
*/
public function getExtension($class)
{
- $class = ltrim($class, '\\');
-
- if (isset($this->extensions[$class])) {
- if ($class !== get_class($this->extensions[$class])) {
- @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
- }
-
- return $this->extensions[$class];
- }
-
- if (!isset($this->extensionsByClass[$class])) {
- throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $class));
- }
-
- return $this->extensionsByClass[$class];
+ return $this->extensionSet->getExtension($class);
}
/**
@@ -894,51 +647,7 @@ class Twig_Environment
public function addExtension(Twig_ExtensionInterface $extension)
{
- if ($this->extensionInitialized) {
- throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $extension->getName()));
- }
-
- $class = get_class($extension);
- if ($class !== $extension->getName()) {
- if (isset($this->extensions[$extension->getName()])) {
- unset($this->extensions[$extension->getName()], $this->extensionsByClass[$class]);
- @trigger_error(sprintf('The possibility to register the same extension twice ("%s") is deprecated since version 1.23 and will be removed in Twig 2.0. Use proper PHP inheritance instead.', $extension->getName()), E_USER_DEPRECATED);
- }
- }
-
- $this->lastModifiedExtension = 0;
- $this->extensionsByClass[$class] = $extension;
- $this->extensions[$extension->getName()] = $extension;
- $this->updateOptionsHash();
- }
-
- /**
- * Removes an extension by name.
- *
- * This method is deprecated and you should not use it.
- *
- * @param string $name The extension name
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
- public function removeExtension($name)
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.12 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- if ($this->extensionInitialized) {
- throw new LogicException(sprintf('Unable to remove extension "%s" as extensions have already been initialized.', $name));
- }
-
- $class = ltrim($name, '\\');
- if (isset($this->extensions[$class])) {
- if ($class !== get_class($this->extensions[$class])) {
- @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
- }
-
- unset($this->extensions[$class]);
- }
-
- unset($this->extensions[$class]);
+ $this->extensionSet->addExtension($extension);
$this->updateOptionsHash();
}
@@ -949,9 +658,7 @@ class Twig_Environment
*/
public function setExtensions(array $extensions)
{
- foreach ($extensions as $extension) {
- $this->addExtension($extension);
- }
+ $this->extensionSet->setExtensions($extensions);
}
/**
@@ -961,39 +668,29 @@ class Twig_Environment
*/
public function getExtensions()
{
- return $this->extensions;
+ return $this->extensionSet->getExtensions();
}
public function addTokenParser(Twig_TokenParserInterface $parser)
{
- if ($this->extensionInitialized) {
- throw new LogicException('Unable to add a token parser as extensions have already been initialized.');
- }
-
- $this->staging->addTokenParser($parser);
+ $this->extensionSet->addTokenParser($parser);
}
/**
* Gets the registered Token Parsers.
*
- * @return Twig_TokenParserBrokerInterface
+ * @return Twig_TokenParserInterface[]
*
* @internal
*/
public function getTokenParsers()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->parsers;
+ return $this->extensionSet->getTokenParsers();
}
/**
* Gets registered tags.
*
- * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
- *
* @return Twig_TokenParserInterface[]
*
* @internal
@@ -1001,10 +698,8 @@ class Twig_Environment
public function getTags()
{
$tags = array();
- foreach ($this->getTokenParsers()->getParsers() as $parser) {
- if ($parser instanceof Twig_TokenParserInterface) {
- $tags[$parser->getTag()] = $parser;
- }
+ foreach ($this->getTokenParsers() as $parser) {
+ $tags[$parser->getTag()] = $parser;
}
return $tags;
@@ -1012,11 +707,7 @@ class Twig_Environment
public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
{
- if ($this->extensionInitialized) {
- throw new LogicException('Unable to add a node visitor as extensions have already been initialized.');
- }
-
- $this->staging->addNodeVisitor($visitor);
+ $this->extensionSet->addNodeVisitor($visitor);
}
/**
@@ -1028,37 +719,12 @@ class Twig_Environment
*/
public function getNodeVisitors()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->visitors;
+ return $this->extensionSet->getNodeVisitors();
}
- /**
- * Registers a Filter.
- *
- * @param string|Twig_SimpleFilter $name The filter name or a Twig_SimpleFilter instance
- * @param Twig_FilterInterface|Twig_SimpleFilter $filter
- */
- public function addFilter($name, $filter = null)
+ public function addFilter(Twig_Filter $filter)
{
- if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
- throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter.');
- }
-
- if ($name instanceof Twig_SimpleFilter) {
- $filter = $name;
- $name = $filter->getName();
- } else {
- @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleFilter" instead when defining filter "%s".', __METHOD__, $name), E_USER_DEPRECATED);
- }
-
- if ($this->extensionInitialized) {
- throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
- }
-
- $this->staging->addFilter($name, $filter);
+ $this->extensionSet->addFilter($filter);
}
/**
@@ -1075,39 +741,12 @@ class Twig_Environment
*/
public function getFilter($name)
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- if (isset($this->filters[$name])) {
- return $this->filters[$name];
- }
-
- foreach ($this->filters as $pattern => $filter) {
- $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
- if ($count) {
- if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
- array_shift($matches);
- $filter->setArguments($matches);
-
- return $filter;
- }
- }
- }
-
- foreach ($this->filterCallbacks as $callback) {
- if (false !== $filter = call_user_func($callback, $name)) {
- return $filter;
- }
- }
-
- return false;
+ return $this->extensionSet->getFilter($name);
}
- public function registerUndefinedFilterCallback($callable)
+ public function registerUndefinedFilterCallback(callable $callable)
{
- $this->filterCallbacks[] = $callable;
+ $this->extensionSet->registerUndefinedFilterCallback($callable);
}
/**
@@ -1115,7 +754,7 @@ class Twig_Environment
*
* Be warned that this method cannot return filters defined with registerUndefinedFilterCallback.
*
- * @return Twig_FilterInterface[]
+ * @return Twig_Filter[]
*
* @see registerUndefinedFilterCallback
*
@@ -1123,53 +762,29 @@ class Twig_Environment
*/
public function getFilters()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->filters;
+ return $this->extensionSet->getFilters();
}
/**
* Registers a Test.
*
- * @param string|Twig_SimpleTest $name The test name or a Twig_SimpleTest instance
- * @param Twig_TestInterface|Twig_SimpleTest $test A Twig_TestInterface instance or a Twig_SimpleTest instance
+ * @param Twig_Test $test A Twig_Test instance
*/
- public function addTest($name, $test = null)
+ public function addTest(Twig_Test $test)
{
- if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
- throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest.');
- }
-
- if ($name instanceof Twig_SimpleTest) {
- $test = $name;
- $name = $test->getName();
- } else {
- @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleTest" instead when defining test "%s".', __METHOD__, $name), E_USER_DEPRECATED);
- }
-
- if ($this->extensionInitialized) {
- throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
- }
-
- $this->staging->addTest($name, $test);
+ $this->extensionSet->addTest($test);
}
/**
* Gets the registered Tests.
*
- * @return Twig_TestInterface[]
+ * @return Twig_Test[]
*
* @internal
*/
public function getTests()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->tests;
+ return $this->extensionSet->getTests();
}
/**
@@ -1183,41 +798,12 @@ class Twig_Environment
*/
public function getTest($name)
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- if (isset($this->tests[$name])) {
- return $this->tests[$name];
- }
-
- return false;
+ return $this->extensionSet->getTest($name);
}
- /**
- * Registers a Function.
- *
- * @param string|Twig_SimpleFunction $name The function name or a Twig_SimpleFunction instance
- * @param Twig_FunctionInterface|Twig_SimpleFunction $function
- */
- public function addFunction($name, $function = null)
+ public function addFunction(Twig_Function $function)
{
- if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
- throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction.');
- }
-
- if ($name instanceof Twig_SimpleFunction) {
- $function = $name;
- $name = $function->getName();
- } else {
- @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleFunction" instead when defining function "%s".', __METHOD__, $name), E_USER_DEPRECATED);
- }
-
- if ($this->extensionInitialized) {
- throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
- }
-
- $this->staging->addFunction($name, $function);
+ $this->extensionSet->addFunction($function);
}
/**
@@ -1234,39 +820,12 @@ class Twig_Environment
*/
public function getFunction($name)
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- if (isset($this->functions[$name])) {
- return $this->functions[$name];
- }
-
- foreach ($this->functions as $pattern => $function) {
- $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
- if ($count) {
- if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
- array_shift($matches);
- $function->setArguments($matches);
-
- return $function;
- }
- }
- }
-
- foreach ($this->functionCallbacks as $callback) {
- if (false !== $function = call_user_func($callback, $name)) {
- return $function;
- }
- }
-
- return false;
+ return $this->extensionSet->getFunction($name);
}
- public function registerUndefinedFunctionCallback($callable)
+ public function registerUndefinedFunctionCallback(callable $callable)
{
- $this->functionCallbacks[] = $callable;
+ $this->extensionSet->registerUndefinedFunctionCallback($callable);
}
/**
@@ -1274,7 +833,7 @@ class Twig_Environment
*
* Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
*
- * @return Twig_FunctionInterface[]
+ * @return Twig_Function[]
*
* @see registerUndefinedFunctionCallback
*
@@ -1282,11 +841,7 @@ class Twig_Environment
*/
public function getFunctions()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->functions;
+ return $this->extensionSet->getFunctions();
}
/**
@@ -1300,23 +855,14 @@ class Twig_Environment
*/
public function addGlobal($name, $value)
{
- if ($this->extensionInitialized || $this->runtimeInitialized) {
- if (null === $this->globals) {
- $this->globals = $this->initGlobals();
- }
-
- if (!array_key_exists($name, $this->globals)) {
- // The deprecation notice must be turned into the following exception in Twig 2.0
- @trigger_error(sprintf('Registering global variable "%s" at runtime or when the extensions have already been initialized is deprecated since version 1.21.', $name), E_USER_DEPRECATED);
- //throw new LogicException(sprintf('Unable to add global "%s" as the runtime or the extensions have already been initialized.', $name));
- }
+ if ($this->extensionSet->isInitialized() && !array_key_exists($name, $this->getGlobals())) {
+ throw new LogicException(sprintf('Unable to add global "%s" as the runtime or the extensions have already been initialized.', $name));
}
- if ($this->extensionInitialized || $this->runtimeInitialized) {
- // update the value
- $this->globals[$name] = $value;
+ if (null !== $this->resolvedGlobals) {
+ $this->resolvedGlobals[$name] = $value;
} else {
- $this->staging->addGlobal($name, $value);
+ $this->globals[$name] = $value;
}
}
@@ -1329,15 +875,15 @@ class Twig_Environment
*/
public function getGlobals()
{
- if (!$this->runtimeInitialized && !$this->extensionInitialized) {
- return $this->initGlobals();
- }
+ if ($this->extensionSet->isInitialized()) {
+ if (null === $this->resolvedGlobals) {
+ $this->resolvedGlobals = array_merge($this->extensionSet->getGlobals(), $this->globals);
+ }
- if (null === $this->globals) {
- $this->globals = $this->initGlobals();
+ return $this->resolvedGlobals;
}
- return $this->globals;
+ return array_merge($this->extensionSet->getGlobals(), $this->globals);
}
/**
@@ -1369,11 +915,7 @@ class Twig_Environment
*/
public function getUnaryOperators()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->unaryOperators;
+ return $this->extensionSet->getUnaryOperators();
}
/**
@@ -1385,164 +927,19 @@ class Twig_Environment
*/
public function getBinaryOperators()
{
- if (!$this->extensionInitialized) {
- $this->initExtensions();
- }
-
- return $this->binaryOperators;
- }
-
- /**
- * @deprecated since 1.23 (to be removed in 2.0)
- */
- public function computeAlternatives($name, $items)
- {
- @trigger_error(sprintf('The %s method is deprecated since version 1.23 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- return Twig_Error_Syntax::computeAlternatives($name, $items);
- }
-
- /**
- * @internal
- */
- protected function initGlobals()
- {
- $globals = array();
- foreach ($this->extensions as $name => $extension) {
- if (!$extension instanceof Twig_Extension_GlobalsInterface) {
- $m = new ReflectionMethod($extension, 'getGlobals');
-
- if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
- @trigger_error(sprintf('Defining the getGlobals() method in the "%s" extension without explicitly implementing Twig_Extension_GlobalsInterface is deprecated since version 1.23.', $name), E_USER_DEPRECATED);
- }
- }
-
- $extGlob = $extension->getGlobals();
- if (!is_array($extGlob)) {
- throw new UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', get_class($extension)));
- }
-
- $globals[] = $extGlob;
- }
-
- $globals[] = $this->staging->getGlobals();
-
- return call_user_func_array('array_merge', $globals);
- }
-
- /**
- * @internal
- */
- protected function initExtensions()
- {
- if ($this->extensionInitialized) {
- return;
- }
-
- $this->extensionInitialized = true;
- $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
- $this->filters = array();
- $this->functions = array();
- $this->tests = array();
- $this->visitors = array();
- $this->unaryOperators = array();
- $this->binaryOperators = array();
-
- foreach ($this->extensions as $extension) {
- $this->initExtension($extension);
- }
- $this->initExtension($this->staging);
- }
-
- /**
- * @internal
- */
- protected function initExtension(Twig_ExtensionInterface $extension)
- {
- // filters
- foreach ($extension->getFilters() as $name => $filter) {
- if ($filter instanceof Twig_SimpleFilter) {
- $name = $filter->getName();
- } else {
- @trigger_error(sprintf('Using an instance of "%s" for filter "%s" is deprecated since version 1.21. Use Twig_SimpleFilter instead.', get_class($filter), $name), E_USER_DEPRECATED);
- }
-
- $this->filters[$name] = $filter;
- }
-
- // functions
- foreach ($extension->getFunctions() as $name => $function) {
- if ($function instanceof Twig_SimpleFunction) {
- $name = $function->getName();
- } else {
- @trigger_error(sprintf('Using an instance of "%s" for function "%s" is deprecated since version 1.21. Use Twig_SimpleFunction instead.', get_class($function), $name), E_USER_DEPRECATED);
- }
-
- $this->functions[$name] = $function;
- }
-
- // tests
- foreach ($extension->getTests() as $name => $test) {
- if ($test instanceof Twig_SimpleTest) {
- $name = $test->getName();
- } else {
- @trigger_error(sprintf('Using an instance of "%s" for test "%s" is deprecated since version 1.21. Use Twig_SimpleTest instead.', get_class($test), $name), E_USER_DEPRECATED);
- }
-
- $this->tests[$name] = $test;
- }
-
- // token parsers
- foreach ($extension->getTokenParsers() as $parser) {
- if ($parser instanceof Twig_TokenParserInterface) {
- $this->parsers->addTokenParser($parser);
- } elseif ($parser instanceof Twig_TokenParserBrokerInterface) {
- @trigger_error('Registering a Twig_TokenParserBrokerInterface instance is deprecated since version 1.21.', E_USER_DEPRECATED);
-
- $this->parsers->addTokenParserBroker($parser);
- } else {
- throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances.');
- }
- }
-
- // node visitors
- foreach ($extension->getNodeVisitors() as $visitor) {
- $this->visitors[] = $visitor;
- }
-
- // operators
- if ($operators = $extension->getOperators()) {
- if (2 !== count($operators)) {
- throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
- }
-
- $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
- $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
- }
- }
-
- /**
- * @deprecated since 1.22 (to be removed in 2.0)
- */
- protected function writeCacheFile($file, $content)
- {
- $this->cache->write($file, $content);
+ return $this->extensionSet->getBinaryOperators();
}
private function updateOptionsHash()
{
- $hashParts = array_merge(
- array_keys($this->extensions),
- array(
- (int) function_exists('twig_template_get_attributes'),
- PHP_MAJOR_VERSION,
- PHP_MINOR_VERSION,
- self::VERSION,
- (int) $this->debug,
- $this->baseTemplateClass,
- (int) $this->strictVariables,
- )
- );
- $this->optionsHash = implode(':', $hashParts);
+ $this->optionsHash = implode(':', array(
+ $this->extensionSet->getSignature(),
+ PHP_MAJOR_VERSION,
+ PHP_MINOR_VERSION,
+ self::VERSION,
+ (int) $this->debug,
+ $this->baseTemplateClass,
+ (int) $this->strictVariables,
+ ));
}
}
diff --git a/vendor/twig/twig/lib/Twig/Error.php b/vendor/twig/twig/lib/Twig/Error.php
index cf373e69..61f1a9fd 100644
--- a/vendor/twig/twig/lib/Twig/Error.php
+++ b/vendor/twig/twig/lib/Twig/Error.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -33,11 +33,11 @@
*/
class Twig_Error extends Exception
{
- protected $lineno;
- // to be renamed to name in 2.0
- protected $filename;
- protected $rawMessage;
- protected $previous;
+ private $lineno;
+ private $name;
+ private $rawMessage;
+ private $sourcePath;
+ private $sourceCode;
/**
* Constructor.
@@ -51,24 +51,30 @@ class Twig_Error extends Exception
*
* By default, automatic guessing is enabled.
*
- * @param string $message The error message
- * @param int $lineno The template line where the error occurred
- * @param string $name The template logical name where the error occurred
- * @param Exception $previous The previous exception
+ * @param string $message The error message
+ * @param int $lineno The template line where the error occurred
+ * @param Twig_Source|string|null $source The source context where the error occurred
+ * @param Exception $previous The previous exception
*/
- public function __construct($message, $lineno = -1, $name = null, Exception $previous = null)
+ public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
{
- if (PHP_VERSION_ID < 50300) {
- $this->previous = $previous;
- parent::__construct('');
+ parent::__construct('', 0, $previous);
+
+ if (null === $source) {
+ $name = null;
+ } elseif (!$source instanceof Twig_Source) {
+ // for compat with the Twig C ext., passing the template name as string is accepted
+ $name = $source;
} else {
- parent::__construct('', 0, $previous);
+ $name = $source->getName();
+ $this->sourceCode = $source->getCode();
+ $this->sourcePath = $source->getPath();
}
$this->lineno = $lineno;
- $this->filename = $name;
+ $this->name = $name;
- if (-1 === $lineno || null === $name) {
+ if (-1 === $lineno || null === $name || null === $this->sourcePath) {
$this->guessTemplateInfo();
}
@@ -88,75 +94,49 @@ class Twig_Error extends Exception
}
/**
- * Gets the logical name where the error occurred.
- *
- * @return string The name
+ * Gets the template line where the error occurred.
*
- * @deprecated since 1.27 (to be removed in 2.0). Use getTemplateName() instead.
+ * @return int The template line
*/
- public function getTemplateFile()
+ public function getTemplateLine()
{
- @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->filename;
+ return $this->lineno;
}
/**
- * Sets the logical name where the error occurred.
- *
- * @param string $name The name
+ * Sets the template line where the error occurred.
*
- * @deprecated since 1.27 (to be removed in 2.0). Use setTemplateName() instead.
+ * @param int $lineno The template line
*/
- public function setTemplateFile($name)
+ public function setTemplateLine($lineno)
{
- @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', __METHOD__), E_USER_DEPRECATED);
-
- $this->filename = $name;
+ $this->lineno = $lineno;
$this->updateRepr();
}
/**
- * Gets the logical name where the error occurred.
+ * Gets the source context of the Twig template where the error occurred.
*
- * @return string The name
+ * @return Twig_Source|null
*/
- public function getTemplateName()
+ public function getSourceContext()
{
- return $this->filename;
+ return $this->name ? new Twig_Source($this->sourceCode, $this->name, $this->sourcePath) : null;
}
/**
- * Sets the logical name where the error occurred.
- *
- * @param string $name The name
+ * Sets the source context of the Twig template where the error occurred.
*/
- public function setTemplateName($name)
+ public function setSourceContext(Twig_Source $source = null)
{
- $this->filename = $name;
-
- $this->updateRepr();
- }
-
- /**
- * Gets the template line where the error occurred.
- *
- * @return int The template line
- */
- public function getTemplateLine()
- {
- return $this->lineno;
- }
-
- /**
- * Sets the template line where the error occurred.
- *
- * @param int $lineno The template line
- */
- public function setTemplateLine($lineno)
- {
- $this->lineno = $lineno;
+ if (null === $source) {
+ $this->sourceCode = $this->name = $this->sourcePath = null;
+ } else {
+ $this->sourceCode = $source->getCode();
+ $this->name = $source->getName();
+ $this->sourcePath = $source->getPath();
+ }
$this->updateRepr();
}
@@ -167,38 +147,23 @@ class Twig_Error extends Exception
$this->updateRepr();
}
- /**
- * For PHP < 5.3.0, provides access to the getPrevious() method.
- *
- * @param string $method The method name
- * @param array $arguments The parameters to be passed to the method
- *
- * @return Exception The previous exception or null
- *
- * @throws BadMethodCallException
- */
- public function __call($method, $arguments)
- {
- if ('getprevious' == strtolower($method)) {
- return $this->previous;
- }
-
- throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
- }
-
public function appendMessage($rawMessage)
{
$this->rawMessage .= $rawMessage;
$this->updateRepr();
}
- /**
- * @internal
- */
- protected function updateRepr()
+ private function updateRepr()
{
$this->message = $this->rawMessage;
+ if ($this->sourcePath && $this->lineno > 0) {
+ $this->file = $this->sourcePath;
+ $this->line = $this->lineno;
+
+ return;
+ }
+
$dot = false;
if ('.' === substr($this->message, -1)) {
$this->message = substr($this->message, 0, -1);
@@ -211,11 +176,11 @@ class Twig_Error extends Exception
$questionMark = true;
}
- if ($this->filename) {
- if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
- $name = sprintf('"%s"', $this->filename);
+ if ($this->name) {
+ if (is_string($this->name) || (is_object($this->name) && method_exists($this->name, '__toString'))) {
+ $name = sprintf('"%s"', $this->name);
} else {
- $name = json_encode($this->filename);
+ $name = json_encode($this->name);
}
$this->message .= sprintf(' in %s', $name);
}
@@ -233,25 +198,17 @@ class Twig_Error extends Exception
}
}
- /**
- * @internal
- */
- protected function guessTemplateInfo()
+ private function guessTemplateInfo()
{
$template = null;
$templateClass = null;
- if (PHP_VERSION_ID >= 50306) {
- $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
- } else {
- $backtrace = debug_backtrace();
- }
-
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
foreach ($backtrace as $trace) {
if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
$currentClass = get_class($trace['object']);
$isEmbedContainer = 0 === strpos($templateClass, $currentClass);
- if (null === $this->filename || ($this->filename == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
+ if (null === $this->name || ($this->name == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
$template = $trace['object'];
$templateClass = get_class($trace['object']);
}
@@ -259,8 +216,15 @@ class Twig_Error extends Exception
}
// update template name
- if (null !== $template && null === $this->filename) {
- $this->filename = $template->getTemplateName();
+ if (null !== $template && null === $this->name) {
+ $this->name = $template->getTemplateName();
+ }
+
+ // update template path if any
+ if (null !== $template && null === $this->sourcePath) {
+ $src = $template->getSourceContext();
+ $this->sourceCode = $src->getCode();
+ $this->sourcePath = $src->getPath();
}
if (null === $template || $this->lineno > -1) {
@@ -276,7 +240,7 @@ class Twig_Error extends Exception
}
$exceptions = array($e = $this);
- while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
+ while ($e = $e->getPrevious()) {
$exceptions[] = $e;
}
diff --git a/vendor/twig/twig/lib/Twig/Error/Loader.php b/vendor/twig/twig/lib/Twig/Error/Loader.php
index 68efb574..4c56ebeb 100644
--- a/vendor/twig/twig/lib/Twig/Error/Loader.php
+++ b/vendor/twig/twig/lib/Twig/Error/Loader.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -24,8 +24,10 @@
*/
class Twig_Error_Loader extends Twig_Error
{
- public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+ public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
{
- parent::__construct($message, false, false, $previous);
+ Exception::__construct('', 0, $previous);
+ $this->appendMessage($message);
+ $this->setTemplateLine(false);
}
}
diff --git a/vendor/twig/twig/lib/Twig/Error/Runtime.php b/vendor/twig/twig/lib/Twig/Error/Runtime.php
index 8b6ceddb..c4e41b1d 100644
--- a/vendor/twig/twig/lib/Twig/Error/Runtime.php
+++ b/vendor/twig/twig/lib/Twig/Error/Runtime.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Error/Syntax.php b/vendor/twig/twig/lib/Twig/Error/Syntax.php
index f73730a1..ee9679bc 100644
--- a/vendor/twig/twig/lib/Twig/Error/Syntax.php
+++ b/vendor/twig/twig/lib/Twig/Error/Syntax.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -24,20 +24,6 @@ class Twig_Error_Syntax extends Twig_Error
* @param array $items An array of possible items
*/
public function addSuggestions($name, array $items)
- {
- if (!$alternatives = self::computeAlternatives($name, $items)) {
- return;
- }
-
- $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', $alternatives)));
- }
-
- /**
- * @internal
- *
- * To be merged with the addSuggestions() method in 2.0.
- */
- public static function computeAlternatives($name, $items)
{
$alternatives = array();
foreach ($items as $item) {
@@ -46,8 +32,13 @@ class Twig_Error_Syntax extends Twig_Error
$alternatives[$item] = $lev;
}
}
+
+ if (!$alternatives) {
+ return;
+ }
+
asort($alternatives);
- return array_keys($alternatives);
+ $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', array_keys($alternatives))));
}
}
diff --git a/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php b/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
index b168c3c3..19617280 100644
--- a/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
+++ b/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
@@ -3,27 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
- * Adds an exists() method for loaders.
- *
- * @author Florin Patan <florinpatan@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
+ * Empty interface for Twig 1.x compatibility.
*/
-interface Twig_ExistsLoaderInterface
+interface Twig_ExistsLoaderInterface extends Twig_LoaderInterface
{
- /**
- * Check if we have the source code of a template, given its name.
- *
- * @param string $name The name of the template to check if we can load
- *
- * @return bool If the template source code is handled by this loader or not
- */
- public function exists($name);
}
diff --git a/vendor/twig/twig/lib/Twig/ExpressionParser.php b/vendor/twig/twig/lib/Twig/ExpressionParser.php
index de2e56a3..73ecb26b 100644
--- a/vendor/twig/twig/lib/Twig/ExpressionParser.php
+++ b/vendor/twig/twig/lib/Twig/ExpressionParser.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -27,27 +27,17 @@ class Twig_ExpressionParser
const OPERATOR_LEFT = 1;
const OPERATOR_RIGHT = 2;
- protected $parser;
- protected $unaryOperators;
- protected $binaryOperators;
-
+ private $parser;
private $env;
+ private $unaryOperators;
+ private $binaryOperators;
- public function __construct(Twig_Parser $parser, Twig_Environment $env = null)
+ public function __construct(Twig_Parser $parser, Twig_Environment $env)
{
$this->parser = $parser;
-
- if ($env instanceof Twig_Environment) {
- $this->env = $env;
- $this->unaryOperators = $env->getUnaryOperators();
- $this->binaryOperators = $env->getBinaryOperators();
- } else {
- @trigger_error('Passing the operators as constructor arguments to '.__METHOD__.' is deprecated since version 1.27. Pass the environment instead.', E_USER_DEPRECATED);
-
- $this->env = $parser->getEnvironment();
- $this->unaryOperators = func_get_arg(1);
- $this->binaryOperators = func_get_arg(2);
- }
+ $this->env = $env;
+ $this->unaryOperators = $env->getUnaryOperators();
+ $this->binaryOperators = $env->getBinaryOperators();
}
public function parseExpression($precedence = 0)
@@ -63,7 +53,7 @@ class Twig_ExpressionParser
} elseif ('is' === $token->getValue()) {
$expr = $this->parseTestExpression($expr);
} elseif (isset($op['callable'])) {
- $expr = call_user_func($op['callable'], $this->parser, $expr);
+ $expr = $op['callable']($this->parser, $expr);
} else {
$expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
$class = $op['class'];
@@ -80,7 +70,7 @@ class Twig_ExpressionParser
return $expr;
}
- protected function getPrimary()
+ private function getPrimary()
{
$token = $this->parser->getCurrentToken();
@@ -102,7 +92,7 @@ class Twig_ExpressionParser
return $this->parsePrimaryExpression();
}
- protected function parseConditionalExpression($expr)
+ private function parseConditionalExpression($expr)
{
while ($this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, '?')) {
if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
@@ -123,12 +113,12 @@ class Twig_ExpressionParser
return $expr;
}
- protected function isUnary(Twig_Token $token)
+ private function isUnary(Twig_Token $token)
{
return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
}
- protected function isBinary(Twig_Token $token)
+ private function isBinary(Twig_Token $token)
{
return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
}
@@ -189,7 +179,7 @@ class Twig_ExpressionParser
$negClass = 'Twig_Node_Expression_Unary_Neg';
$posClass = 'Twig_Node_Expression_Unary_Pos';
if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
- throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
}
$this->parser->getStream()->next();
@@ -205,7 +195,7 @@ class Twig_ExpressionParser
} elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
$node = $this->parseHashExpression();
} else {
- throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
}
}
@@ -296,7 +286,7 @@ class Twig_ExpressionParser
} else {
$current = $stream->getCurrent();
- throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext());
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -335,25 +325,25 @@ class Twig_ExpressionParser
case 'parent':
$this->parseArguments();
if (!count($this->parser->getBlockStack())) {
- throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext());
}
if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
- throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext());
}
return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
case 'block':
$args = $this->parseArguments();
if (count($args) < 1) {
- throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext());
}
return new Twig_Node_Expression_BlockReference($args->getNode(0), count($args) > 1 ? $args->getNode(1) : null, $line);
case 'attribute':
$args = $this->parseArguments();
if (count($args) < 2) {
- throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext());
}
return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
@@ -402,21 +392,17 @@ class Twig_ExpressionParser
}
}
} else {
- throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext());
}
if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
if (!$arg instanceof Twig_Node_Expression_Constant) {
- throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext());
}
$name = $arg->getAttribute('value');
- if ($this->parser->isReservedMacroName($name)) {
- throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext()->getName());
- }
-
- $node = new Twig_Node_Expression_MethodCall($node, 'get'.$name, $arguments, $lineno);
+ $node = new Twig_Node_Expression_MethodCall($node, 'macro_'.$name, $arguments, $lineno);
$node->setAttribute('safe', true);
return $node;
@@ -523,7 +509,7 @@ class Twig_ExpressionParser
$name = null;
if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
if (!$value instanceof Twig_Node_Expression_Name) {
- throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext());
}
$name = $value->getAttribute('name');
@@ -531,7 +517,7 @@ class Twig_ExpressionParser
$value = $this->parsePrimaryExpression();
if (!$this->checkConstantExpression($value)) {
- throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext());
}
} else {
$value = $this->parseExpression();
@@ -565,7 +551,7 @@ class Twig_ExpressionParser
$token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
$value = $token->getValue();
if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {
- throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
}
$targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());
@@ -590,12 +576,12 @@ class Twig_ExpressionParser
return new Twig_Node($targets);
}
- private function parseNotTestExpression(Twig_NodeInterface $node)
+ private function parseNotTestExpression(Twig_Node $node)
{
return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($node), $this->parser->getCurrentToken()->getLine());
}
- private function parseTestExpression(Twig_NodeInterface $node)
+ private function parseTestExpression(Twig_Node $node)
{
$stream = $this->parser->getStream();
list($name, $test) = $this->getTest($node->getTemplateLine());
@@ -629,7 +615,7 @@ class Twig_ExpressionParser
}
}
- $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext()->getName());
+ $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext());
$e->addSuggestions($name, array_keys($this->env->getTests()));
throw $e;
@@ -637,37 +623,35 @@ class Twig_ExpressionParser
private function getTestNodeClass($test)
{
- if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
+ if ($test->isDeprecated()) {
$stream = $this->parser->getStream();
$message = sprintf('Twig Test "%s" is deprecated', $test->getName());
+
if (!is_bool($test->getDeprecatedVersion())) {
$message .= sprintf(' since version %s', $test->getDeprecatedVersion());
}
if ($test->getAlternative()) {
$message .= sprintf('. Use "%s" instead', $test->getAlternative());
}
- $message .= sprintf(' in %s at line %d.', $stream->getSourceContext()->getName(), $stream->getCurrent()->getLine());
+ $src = $stream->getSourceContext();
+ $message .= sprintf(' in %s at line %d.', $src->getPath() ?: $src->getName(), $stream->getCurrent()->getLine());
@trigger_error($message, E_USER_DEPRECATED);
}
- if ($test instanceof Twig_SimpleTest) {
- return $test->getNodeClass();
- }
-
- return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
+ return $test->getNodeClass();
}
- protected function getFunctionNodeClass($name, $line)
+ private function getFunctionNodeClass($name, $line)
{
if (false === $function = $this->env->getFunction($name)) {
- $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext()->getName());
+ $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext());
$e->addSuggestions($name, array_keys($this->env->getFunctions()));
throw $e;
}
- if ($function instanceof Twig_SimpleFunction && $function->isDeprecated()) {
+ if ($function->isDeprecated()) {
$message = sprintf('Twig Function "%s" is deprecated', $function->getName());
if (!is_bool($function->getDeprecatedVersion())) {
$message .= sprintf(' since version %s', $function->getDeprecatedVersion());
@@ -675,28 +659,25 @@ class Twig_ExpressionParser
if ($function->getAlternative()) {
$message .= sprintf('. Use "%s" instead', $function->getAlternative());
}
- $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getSourceContext()->getName(), $line);
+ $src = $this->parser->getStream()->getSourceContext();
+ $message .= sprintf(' in %s at line %d.', $src->getPath() ?: $src->getName(), $line);
@trigger_error($message, E_USER_DEPRECATED);
}
- if ($function instanceof Twig_SimpleFunction) {
- return $function->getNodeClass();
- }
-
- return $function instanceof Twig_Function_Node ? $function->getClass() : 'Twig_Node_Expression_Function';
+ return $function->getNodeClass();
}
- protected function getFilterNodeClass($name, $line)
+ private function getFilterNodeClass($name, $line)
{
if (false === $filter = $this->env->getFilter($name)) {
- $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext()->getName());
+ $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext());
$e->addSuggestions($name, array_keys($this->env->getFilters()));
throw $e;
}
- if ($filter instanceof Twig_SimpleFilter && $filter->isDeprecated()) {
+ if ($filter->isDeprecated()) {
$message = sprintf('Twig Filter "%s" is deprecated', $filter->getName());
if (!is_bool($filter->getDeprecatedVersion())) {
$message .= sprintf(' since version %s', $filter->getDeprecatedVersion());
@@ -704,20 +685,17 @@ class Twig_ExpressionParser
if ($filter->getAlternative()) {
$message .= sprintf('. Use "%s" instead', $filter->getAlternative());
}
- $message .= sprintf(' in %s at line %d.', $this->parser->getStream()->getSourceContext()->getName(), $line);
+ $src = $this->parser->getStream()->getSourceContext();
+ $message .= sprintf(' in %s at line %d.', $src->getPath() ?: $src->getName(), $line);
@trigger_error($message, E_USER_DEPRECATED);
}
- if ($filter instanceof Twig_SimpleFilter) {
- return $filter->getNodeClass();
- }
-
- return $filter instanceof Twig_Filter_Node ? $filter->getClass() : 'Twig_Node_Expression_Filter';
+ return $filter->getNodeClass();
}
// checks that the node only contains "constant" elements
- protected function checkConstantExpression(Twig_NodeInterface $node)
+ private function checkConstantExpression(Twig_Node $node)
{
if (!($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array
|| $node instanceof Twig_Node_Expression_Unary_Neg || $node instanceof Twig_Node_Expression_Unary_Pos
diff --git a/vendor/twig/twig/lib/Twig/Extension.php b/vendor/twig/twig/lib/Twig/Extension.php
index fd674ee1..76fc5591 100644
--- a/vendor/twig/twig/lib/Twig/Extension.php
+++ b/vendor/twig/twig/lib/Twig/Extension.php
@@ -3,87 +3,40 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
abstract class Twig_Extension implements Twig_ExtensionInterface
{
- /**
- * {@inheritdoc}
- *
- * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
- */
- public function initRuntime(Twig_Environment $environment)
- {
- }
-
- /**
- * {@inheritdoc}
- */
public function getTokenParsers()
{
return array();
}
- /**
- * {@inheritdoc}
- */
public function getNodeVisitors()
{
return array();
}
- /**
- * {@inheritdoc}
- */
public function getFilters()
{
return array();
}
- /**
- * {@inheritdoc}
- */
public function getTests()
{
return array();
}
- /**
- * {@inheritdoc}
- */
public function getFunctions()
{
return array();
}
- /**
- * {@inheritdoc}
- */
public function getOperators()
{
return array();
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
- */
- public function getGlobals()
- {
- return array();
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
- */
- public function getName()
- {
- return get_class($this);
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Core.php b/vendor/twig/twig/lib/Twig/Extension/Core.php
index 16959e4f..cbb6c84c 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Core.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -1,24 +1,20 @@
<?php
-if (!defined('ENT_SUBSTITUTE')) {
- // use 0 as hhvm does not support several flags yet
- define('ENT_SUBSTITUTE', 0);
-}
-
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_Core extends Twig_Extension
+
+final class Twig_Extension_Core extends Twig_Extension
{
- protected $dateFormats = array('F j, Y H:i', '%d days');
- protected $numberFormat = array(0, '.', ',');
- protected $timezone = null;
- protected $escapers = array();
+ private $dateFormats = array('F j, Y H:i', '%d days');
+ private $numberFormat = array(0, '.', ',');
+ private $timezone = null;
+ private $escapers = array();
/**
* Defines a new escaper to be used via the escape filter.
@@ -26,7 +22,7 @@ class Twig_Extension_Core extends Twig_Extension
* @param string $strategy The strategy name that should be used as a strategy in the escape call
* @param callable $callable A valid PHP callable
*/
- public function setEscaper($strategy, $callable)
+ public function setEscaper($strategy, callable $callable)
{
$this->escapers[$strategy] = $callable;
}
@@ -34,7 +30,7 @@ class Twig_Extension_Core extends Twig_Extension
/**
* Gets all defined escapers.
*
- * @return array An array of escapers
+ * @return callable[] An array of escapers
*/
public function getEscapers()
{
@@ -95,9 +91,9 @@ class Twig_Extension_Core extends Twig_Extension
/**
* Sets the default format to be used by the number_format filter.
*
- * @param int $decimal The number of decimal places to use.
- * @param string $decimalPoint The character(s) to use for the decimal point.
- * @param string $thousandSep The character(s) to use for the thousands separator.
+ * @param int $decimal the number of decimal places to use
+ * @param string $decimalPoint the character(s) to use for the decimal point
+ * @param string $thousandSep the character(s) to use for the thousands separator
*/
public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
{
@@ -138,91 +134,82 @@ class Twig_Extension_Core extends Twig_Extension
public function getFilters()
{
- $filters = array(
+ return array(
// formatting filters
- new Twig_SimpleFilter('date', 'twig_date_format_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('format', 'sprintf'),
- new Twig_SimpleFilter('replace', 'twig_replace_filter'),
- new Twig_SimpleFilter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('abs', 'abs'),
- new Twig_SimpleFilter('round', 'twig_round'),
+ new Twig_Filter('date', 'twig_date_format_filter', array('needs_environment' => true)),
+ new Twig_Filter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
+ new Twig_Filter('format', 'sprintf'),
+ new Twig_Filter('replace', 'twig_replace_filter'),
+ new Twig_Filter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
+ new Twig_Filter('abs', 'abs'),
+ new Twig_Filter('round', 'twig_round'),
// encoding
- new Twig_SimpleFilter('url_encode', 'twig_urlencode_filter'),
- new Twig_SimpleFilter('json_encode', 'twig_jsonencode_filter'),
- new Twig_SimpleFilter('convert_encoding', 'twig_convert_encoding'),
+ new Twig_Filter('url_encode', 'twig_urlencode_filter'),
+ new Twig_Filter('json_encode', 'json_encode'),
+ new Twig_Filter('convert_encoding', 'twig_convert_encoding'),
// string filters
- new Twig_SimpleFilter('title', 'twig_title_string_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('upper', 'strtoupper'),
- new Twig_SimpleFilter('lower', 'strtolower'),
- new Twig_SimpleFilter('striptags', 'strip_tags'),
- new Twig_SimpleFilter('trim', 'trim'),
- new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
+ new Twig_Filter('title', 'twig_title_string_filter', array('needs_environment' => true)),
+ new Twig_Filter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
+ new Twig_Filter('upper', 'twig_upper_filter', array('needs_environment' => true)),
+ new Twig_Filter('lower', 'twig_lower_filter', array('needs_environment' => true)),
+ new Twig_Filter('striptags', 'strip_tags'),
+ new Twig_Filter('trim', 'trim'),
+ new Twig_Filter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
// array helpers
- new Twig_SimpleFilter('join', 'twig_join_filter'),
- new Twig_SimpleFilter('split', 'twig_split_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('sort', 'twig_sort_filter'),
- new Twig_SimpleFilter('merge', 'twig_array_merge'),
- new Twig_SimpleFilter('batch', 'twig_array_batch'),
+ new Twig_Filter('join', 'twig_join_filter'),
+ new Twig_Filter('split', 'twig_split_filter', array('needs_environment' => true)),
+ new Twig_Filter('sort', 'twig_sort_filter'),
+ new Twig_Filter('merge', 'twig_array_merge'),
+ new Twig_Filter('batch', 'twig_array_batch'),
// string/array filters
- new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('length', 'twig_length_filter', array('needs_environment' => true)),
- new Twig_SimpleFilter('slice', 'twig_slice', array('needs_environment' => true)),
- new Twig_SimpleFilter('first', 'twig_first', array('needs_environment' => true)),
- new Twig_SimpleFilter('last', 'twig_last', array('needs_environment' => true)),
+ new Twig_Filter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
+ new Twig_Filter('length', 'twig_length_filter', array('needs_environment' => true)),
+ new Twig_Filter('slice', 'twig_slice', array('needs_environment' => true)),
+ new Twig_Filter('first', 'twig_first', array('needs_environment' => true)),
+ new Twig_Filter('last', 'twig_last', array('needs_environment' => true)),
// iteration and runtime
- new Twig_SimpleFilter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
- new Twig_SimpleFilter('keys', 'twig_get_array_keys_filter'),
+ new Twig_Filter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
+ new Twig_Filter('keys', 'twig_get_array_keys_filter'),
// escaping
- new Twig_SimpleFilter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
- new Twig_SimpleFilter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
+ new Twig_Filter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
+ new Twig_Filter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
);
-
- if (function_exists('mb_get_info')) {
- $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
- $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
- }
-
- return $filters;
}
public function getFunctions()
{
return array(
- new Twig_SimpleFunction('max', 'max'),
- new Twig_SimpleFunction('min', 'min'),
- new Twig_SimpleFunction('range', 'range'),
- new Twig_SimpleFunction('constant', 'twig_constant'),
- new Twig_SimpleFunction('cycle', 'twig_cycle'),
- new Twig_SimpleFunction('random', 'twig_random', array('needs_environment' => true)),
- new Twig_SimpleFunction('date', 'twig_date_converter', array('needs_environment' => true)),
- new Twig_SimpleFunction('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
- new Twig_SimpleFunction('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
+ new Twig_Function('max', 'max'),
+ new Twig_Function('min', 'min'),
+ new Twig_Function('range', 'range'),
+ new Twig_Function('constant', 'twig_constant'),
+ new Twig_Function('cycle', 'twig_cycle'),
+ new Twig_Function('random', 'twig_random', array('needs_environment' => true)),
+ new Twig_Function('date', 'twig_date_converter', array('needs_environment' => true)),
+ new Twig_Function('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
+ new Twig_Function('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
);
}
public function getTests()
{
return array(
- new Twig_SimpleTest('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
- new Twig_SimpleTest('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
- new Twig_SimpleTest('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
- new Twig_SimpleTest('sameas', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => '1.21', 'alternative' => 'same as')),
- new Twig_SimpleTest('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
- new Twig_SimpleTest('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
- new Twig_SimpleTest('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
- new Twig_SimpleTest('divisibleby', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => '1.21', 'alternative' => 'divisible by')),
- new Twig_SimpleTest('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
- new Twig_SimpleTest('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
- new Twig_SimpleTest('empty', 'twig_test_empty'),
- new Twig_SimpleTest('iterable', 'twig_test_iterable'),
+ new Twig_Test('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
+ new Twig_Test('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
+ new Twig_Test('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
+ new Twig_Test('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
+ new Twig_Test('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
+ new Twig_Test('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
+ new Twig_Test('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
+ new Twig_Test('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
+ new Twig_Test('empty', 'twig_test_empty'),
+ new Twig_Test('iterable', 'twig_test_iterable'),
);
}
@@ -266,11 +253,6 @@ class Twig_Extension_Core extends Twig_Extension
),
);
}
-
- public function getName()
- {
- return 'core';
- }
}
/**
@@ -299,7 +281,7 @@ function twig_cycle($values, $position)
* @param Twig_Environment $env
* @param Traversable|array|int|float|string $values The values to pick a random item from
*
- * @throws Twig_Error_Runtime When $values is an empty array (does not apply to an empty string which is returned as is).
+ * @throws Twig_Error_Runtime when $values is an empty array (does not apply to an empty string which is returned as is)
*
* @return mixed A random value from the given sequence
*/
@@ -319,22 +301,21 @@ function twig_random(Twig_Environment $env, $values = null)
if ('' === $values) {
return '';
}
- if (null !== $charset = $env->getCharset()) {
- if ('UTF-8' !== $charset) {
- $values = twig_convert_encoding($values, 'UTF-8', $charset);
- }
- // unicode version of str_split()
- // split at all positions, but not after the start and not before the end
- $values = preg_split('/(?<!^)(?!$)/u', $values);
+ $charset = $env->getCharset();
- if ('UTF-8' !== $charset) {
- foreach ($values as $i => $value) {
- $values[$i] = twig_convert_encoding($value, $charset, 'UTF-8');
- }
+ if ('UTF-8' !== $charset) {
+ $values = iconv($charset, 'UTF-8', $values);
+ }
+
+ // unicode version of str_split()
+ // split at all positions, but not after the start and not before the end
+ $values = preg_split('/(?<!^)(?!$)/u', $values);
+
+ if ('UTF-8' !== $charset) {
+ foreach ($values as $i => $value) {
+ $values[$i] = iconv('UTF-8', $charset, $value);
}
- } else {
- return $values[mt_rand(0, strlen($values) - 1)];
}
}
@@ -356,10 +337,10 @@ function twig_random(Twig_Environment $env, $values = null)
* {{ post.published_at|date("m/d/Y") }}
* </pre>
*
- * @param Twig_Environment $env
- * @param DateTime|DateTimeInterface|DateInterval|string $date A date
- * @param string|null $format The target format, null to use the default
- * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ * @param Twig_Environment $env
+ * @param DateTimeInterface|DateInterval|string $date A date
+ * @param string|null $format The target format, null to use the default
+ * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
*
* @return string The formatted date
*/
@@ -384,21 +365,17 @@ function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $
* {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
* </pre>
*
- * @param Twig_Environment $env
- * @param DateTime|string $date A date
- * @param string $modifier A modifier string
+ * @param Twig_Environment $env
+ * @param DateTimeInterface|string $date A date
+ * @param string $modifier A modifier string
*
- * @return DateTime A new date object
+ * @return DateTimeInterface A new date object
*/
function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
{
$date = twig_date_converter($env, $date, false);
- $resultDate = $date->modify($modifier);
- // This is a hack to ensure PHP 5.2 support and support for DateTimeImmutable
- // DateTime::modify does not return the modified DateTime object < 5.3.0
- // and DateTimeImmutable does not modify $date.
- return null === $resultDate ? $date : $resultDate;
+ return $date->modify($modifier);
}
/**
@@ -410,9 +387,9 @@ function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
* {% endif %}
* </pre>
*
- * @param Twig_Environment $env
- * @param DateTime|DateTimeInterface|string|null $date A date
- * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ * @param Twig_Environment $env
+ * @param DateTimeInterface|string|null $date A date or null to use the current time
+ * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
*
* @return DateTime A DateTime instance
*/
@@ -432,7 +409,7 @@ function twig_date_converter(Twig_Environment $env, $date = null, $timezone = nu
return false !== $timezone ? $date->setTimezone($timezone) : $date;
}
- if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
+ if ($date instanceof DateTimeInterface) {
$date = clone $date;
if (false !== $timezone) {
$date->setTimezone($timezone);
@@ -464,18 +441,13 @@ function twig_date_converter(Twig_Environment $env, $date = null, $timezone = nu
*
* @param string $str String to replace in
* @param array|Traversable $from Replace values
- * @param string|null $to Replace to, deprecated (@see http://php.net/manual/en/function.strtr.php)
*
* @return string
*/
-function twig_replace_filter($str, $from, $to = null)
+function twig_replace_filter($str, $from)
{
if ($from instanceof Traversable) {
$from = iterator_to_array($from);
- } elseif (is_string($from) && is_string($to)) {
- @trigger_error('Using "replace" with character by character replacement is deprecated since version 1.22 and will be removed in Twig 2.0', E_USER_DEPRECATED);
-
- return strtr($str, $from, $to);
} elseif (!is_array($from)) {
throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', is_object($from) ? get_class($from) : gettype($from)));
}
@@ -514,9 +486,9 @@ function twig_round($value, $precision = 0, $method = 'common')
*
* @param Twig_Environment $env
* @param mixed $number A float/int/string of the number to format
- * @param int $decimal The number of decimal points to display.
- * @param string $decimalPoint The character(s) to use for the decimal point.
- * @param string $thousandSep The character(s) to use for the thousands separator.
+ * @param int $decimal the number of decimal points to display
+ * @param string $decimalPoint the character(s) to use for the decimal point
+ * @param string $thousandSep the character(s) to use for the thousands separator
*
* @return string The formatted number
*/
@@ -548,63 +520,12 @@ function twig_number_format_filter(Twig_Environment $env, $number, $decimal = nu
function twig_urlencode_filter($url)
{
if (is_array($url)) {
- if (defined('PHP_QUERY_RFC3986')) {
- return http_build_query($url, '', '&', PHP_QUERY_RFC3986);
- }
-
- return http_build_query($url, '', '&');
+ return http_build_query($url, '', '&', PHP_QUERY_RFC3986);
}
return rawurlencode($url);
}
-if (PHP_VERSION_ID < 50300) {
- /**
- * JSON encodes a variable.
- *
- * @param mixed $value The value to encode.
- * @param int $options Not used on PHP 5.2.x
- *
- * @return mixed The JSON encoded value
- */
- function twig_jsonencode_filter($value, $options = 0)
- {
- if ($value instanceof Twig_Markup) {
- $value = (string) $value;
- } elseif (is_array($value)) {
- array_walk_recursive($value, '_twig_markup2string');
- }
-
- return json_encode($value);
- }
-} else {
- /**
- * JSON encodes a variable.
- *
- * @param mixed $value The value to encode.
- * @param int $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
- *
- * @return mixed The JSON encoded value
- */
- function twig_jsonencode_filter($value, $options = 0)
- {
- if ($value instanceof Twig_Markup) {
- $value = (string) $value;
- } elseif (is_array($value)) {
- array_walk_recursive($value, '_twig_markup2string');
- }
-
- return json_encode($value, $options);
- }
-}
-
-function _twig_markup2string(&$value)
-{
- if ($value instanceof Twig_Markup) {
- $value = (string) $value;
- }
-}
-
/**
* Merges an array with another one.
*
@@ -652,7 +573,7 @@ function twig_array_merge($arr1, $arr2)
function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
{
if ($item instanceof Traversable) {
- if ($item instanceof IteratorAggregate) {
+ while ($item instanceof IteratorAggregate) {
$item = $item->getIterator();
}
@@ -673,11 +594,7 @@ function twig_slice(Twig_Environment $env, $item, $start, $length = null, $prese
$item = (string) $item;
- if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
- return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
- }
-
- return (string) (null === $length ? substr($item, $start) : substr($item, $start, $length));
+ return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $env->getCharset()) - $start : $length, $env->getCharset());
}
/**
@@ -767,22 +684,18 @@ function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = n
return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
}
- if (!function_exists('mb_get_info') || null === $charset = $env->getCharset()) {
- return str_split($value, null === $limit ? 1 : $limit);
- }
-
if ($limit <= 1) {
return preg_split('/(?<!^)(?!$)/u', $value);
}
- $length = mb_strlen($value, $charset);
+ $length = mb_strlen($value, $env->getCharset());
if ($length < $limit) {
return array($value);
}
$r = array();
for ($i = 0; $i < $length; $i += $limit) {
- $r[] = mb_substr($value, $i, $limit, $charset);
+ $r[] = mb_substr($value, $i, $limit, $env->getCharset());
}
return $r;
@@ -821,7 +734,27 @@ function _twig_default_filter($value, $default = '')
function twig_get_array_keys_filter($array)
{
if ($array instanceof Traversable) {
- return array_keys(iterator_to_array($array));
+ while ($array instanceof IteratorAggregate) {
+ $array = $array->getIterator();
+ }
+
+ if ($array instanceof Iterator) {
+ $keys = array();
+ $array->rewind();
+ while ($array->valid()) {
+ $keys[] = $array->key();
+ $array->next();
+ }
+
+ return $keys;
+ }
+
+ $keys = array();
+ foreach ($array as $key => $item) {
+ $keys[] = $key;
+ }
+
+ return $keys;
}
if (!is_array($array)) {
@@ -850,25 +783,23 @@ function twig_reverse_filter(Twig_Environment $env, $item, $preserveKeys = false
return array_reverse($item, $preserveKeys);
}
- if (null !== $charset = $env->getCharset()) {
- $string = (string) $item;
+ $string = (string) $item;
- if ('UTF-8' !== $charset) {
- $item = twig_convert_encoding($string, 'UTF-8', $charset);
- }
+ $charset = $env->getCharset();
- preg_match_all('/./us', $item, $matches);
+ if ('UTF-8' !== $charset) {
+ $item = iconv($charset, 'UTF-8', $string);
+ }
- $string = implode('', array_reverse($matches[0]));
+ preg_match_all('/./us', $item, $matches);
- if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, $charset, 'UTF-8');
- }
+ $string = implode('', array_reverse($matches[0]));
- return $string;
+ if ('UTF-8' !== $charset) {
+ $string = iconv('UTF-8', $charset, $string);
}
- return strrev((string) $item);
+ return $string;
}
/**
@@ -901,7 +832,21 @@ function twig_in_filter($value, $compare)
} elseif (is_string($compare) && (is_string($value) || is_int($value) || is_float($value))) {
return '' === $value || false !== strpos($compare, (string) $value);
} elseif ($compare instanceof Traversable) {
- return in_array($value, iterator_to_array($compare, false), is_object($value) || is_resource($value));
+ if (is_object($value) || is_resource($value)) {
+ foreach ($compare as $item) {
+ if ($item === $value) {
+ return true;
+ }
+ }
+ } else {
+ foreach ($compare as $item) {
+ if ($item == $value) {
+ return true;
+ }
+ }
+ }
+
+ return false;
}
return false;
@@ -979,69 +924,146 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
}
- $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ $string = iconv($charset, 'UTF-8', $string);
$string = htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
- return twig_convert_encoding($string, $charset, 'UTF-8');
+ return iconv('UTF-8', $charset, $string);
case 'js':
// escape all non-alphanumeric characters
// into their \xHH or \uHHHH representations
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ $string = iconv($charset, 'UTF-8', $string);
}
if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
- $string = preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', '_twig_escape_js_callback', $string);
+ $string = preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', function ($matches) {
+ $char = $matches[0];
+
+ // \xHH
+ if (!isset($char[1])) {
+ return '\\x'.strtoupper(substr('00'.bin2hex($char), -2));
+ }
+
+ // \uHHHH
+ $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+
+ return '\\u'.strtoupper(substr('0000'.bin2hex($char), -4));
+ }, $string);
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ $string = iconv('UTF-8', $charset, $string);
}
return $string;
case 'css':
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ $string = iconv($charset, 'UTF-8', $string);
}
if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
- $string = preg_replace_callback('#[^a-zA-Z0-9]#Su', '_twig_escape_css_callback', $string);
+ $string = preg_replace_callback('#[^a-zA-Z0-9]#Su', function ($matches) {
+ $char = $matches[0];
+
+ // \xHH
+ if (!isset($char[1])) {
+ $hex = ltrim(strtoupper(bin2hex($char)), '0');
+ if (0 === strlen($hex)) {
+ $hex = '0';
+ }
+
+ return '\\'.$hex.' ';
+ }
+
+ // \uHHHH
+ $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+
+ return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
+ }, $string);
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ $string = iconv('UTF-8', $charset, $string);
}
return $string;
case 'html_attr':
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ $string = iconv($charset, 'UTF-8', $string);
}
if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
}
- $string = preg_replace_callback('#[^a-zA-Z0-9,\.\-_]#Su', '_twig_escape_html_attr_callback', $string);
+ $string = preg_replace_callback('#[^a-zA-Z0-9,\.\-_]#Su', function ($matches) {
+ /**
+ * This function is adapted from code coming from Zend Framework.
+ *
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+ /*
+ * While HTML supports far more named entities, the lowest common denominator
+ * has become HTML5's XML Serialisation which is restricted to the those named
+ * entities that XML supports. Using HTML entities would result in this error:
+ * XML Parsing Error: undefined entity
+ */
+ static $entityMap = array(
+ 34 => 'quot', /* quotation mark */
+ 38 => 'amp', /* ampersand */
+ 60 => 'lt', /* less-than sign */
+ 62 => 'gt', /* greater-than sign */
+ );
+
+ $chr = $matches[0];
+ $ord = ord($chr);
+
+ /*
+ * The following replaces characters undefined in HTML with the
+ * hex entity for the Unicode replacement character.
+ */
+ if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r") || ($ord >= 0x7f && $ord <= 0x9f)) {
+ return '�';
+ }
+
+ /*
+ * Check if the current character to escape has a name entity we should
+ * replace it with while grabbing the hex value of the character.
+ */
+ if (strlen($chr) == 1) {
+ $hex = strtoupper(substr('00'.bin2hex($chr), -2));
+ } else {
+ $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
+ $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
+ }
+
+ $int = hexdec($hex);
+ if (array_key_exists($int, $entityMap)) {
+ return sprintf('&%s;', $entityMap[$int]);
+ }
+
+ /*
+ * Per OWASP recommendations, we'll use hex entities for any other
+ * characters where a named entity does not exist.
+ */
+ return sprintf('&#x%s;', $hex);
+ }, $string);
if ('UTF-8' !== $charset) {
- $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ $string = iconv('UTF-8', $charset, $string);
}
return $string;
case 'url':
- if (PHP_VERSION_ID < 50300) {
- return str_replace('%7E', '~', rawurlencode($string));
- }
-
return rawurlencode($string);
default:
@@ -1052,7 +1074,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
}
if (isset($escapers[$strategy])) {
- return call_user_func($escapers[$strategy], $env, $string, $charset);
+ return $escapers[$strategy]($env, $string, $charset);
}
$validStrategies = implode(', ', array_merge(array('html', 'js', 'url', 'css', 'html_attr'), array_keys($escapers)));
@@ -1077,236 +1099,76 @@ function twig_escape_filter_is_safe(Twig_Node $filterArgs)
return array('html');
}
-if (function_exists('mb_convert_encoding')) {
- function twig_convert_encoding($string, $to, $from)
- {
- return mb_convert_encoding($string, $to, $from);
- }
-} elseif (function_exists('iconv')) {
- function twig_convert_encoding($string, $to, $from)
- {
- return iconv($from, $to, $string);
- }
-} else {
- function twig_convert_encoding($string, $to, $from)
- {
- throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
- }
+function twig_convert_encoding($string, $to, $from)
+{
+ return iconv($from, $to, $string);
}
-function _twig_escape_js_callback($matches)
+/**
+ * Returns the length of a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $thing A variable
+ *
+ * @return int The length of the value
+ */
+function twig_length_filter(Twig_Environment $env, $thing)
{
- $char = $matches[0];
-
- // \xHH
- if (!isset($char[1])) {
- return '\\x'.strtoupper(substr('00'.bin2hex($char), -2));
- }
-
- // \uHHHH
- $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
- return '\\u'.strtoupper(substr('0000'.bin2hex($char), -4));
+ return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
}
-function _twig_escape_css_callback($matches)
+/**
+ * Converts a string to uppercase.
+ *
+ * @param Twig_Environment $env
+ * @param string $string A string
+ *
+ * @return string The uppercased string
+ */
+function twig_upper_filter(Twig_Environment $env, $string)
{
- $char = $matches[0];
-
- // \xHH
- if (!isset($char[1])) {
- $hex = ltrim(strtoupper(bin2hex($char)), '0');
- if (0 === strlen($hex)) {
- $hex = '0';
- }
-
- return '\\'.$hex.' ';
- }
-
- // \uHHHH
- $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
- return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
+ return mb_strtoupper($string, $env->getCharset());
}
/**
- * This function is adapted from code coming from Zend Framework.
+ * Converts a string to lowercase.
+ *
+ * @param Twig_Environment $env
+ * @param string $string A string
*
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @return string The lowercased string
*/
-function _twig_escape_html_attr_callback($matches)
+function twig_lower_filter(Twig_Environment $env, $string)
{
- /*
- * While HTML supports far more named entities, the lowest common denominator
- * has become HTML5's XML Serialisation which is restricted to the those named
- * entities that XML supports. Using HTML entities would result in this error:
- * XML Parsing Error: undefined entity
- */
- static $entityMap = array(
- 34 => 'quot', /* quotation mark */
- 38 => 'amp', /* ampersand */
- 60 => 'lt', /* less-than sign */
- 62 => 'gt', /* greater-than sign */
- );
-
- $chr = $matches[0];
- $ord = ord($chr);
-
- /*
- * The following replaces characters undefined in HTML with the
- * hex entity for the Unicode replacement character.
- */
- if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r") || ($ord >= 0x7f && $ord <= 0x9f)) {
- return '�';
- }
-
- /*
- * Check if the current character to escape has a name entity we should
- * replace it with while grabbing the hex value of the character.
- */
- if (strlen($chr) == 1) {
- $hex = strtoupper(substr('00'.bin2hex($chr), -2));
- } else {
- $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
- $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
- }
-
- $int = hexdec($hex);
- if (array_key_exists($int, $entityMap)) {
- return sprintf('&%s;', $entityMap[$int]);
- }
-
- /*
- * Per OWASP recommendations, we'll use hex entities for any other
- * characters where a named entity does not exist.
- */
- return sprintf('&#x%s;', $hex);
+ return mb_strtolower($string, $env->getCharset());
}
-// add multibyte extensions if possible
-if (function_exists('mb_get_info')) {
- /**
- * Returns the length of a variable.
- *
- * @param Twig_Environment $env
- * @param mixed $thing A variable
- *
- * @return int The length of the value
- */
- function twig_length_filter(Twig_Environment $env, $thing)
- {
- return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
- }
-
- /**
- * Converts a string to uppercase.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The uppercased string
- */
- function twig_upper_filter(Twig_Environment $env, $string)
- {
- if (null !== $charset = $env->getCharset()) {
- return mb_strtoupper($string, $charset);
- }
-
- return strtoupper($string);
- }
-
- /**
- * Converts a string to lowercase.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The lowercased string
- */
- function twig_lower_filter(Twig_Environment $env, $string)
- {
- if (null !== $charset = $env->getCharset()) {
- return mb_strtolower($string, $charset);
- }
-
- return strtolower($string);
- }
-
- /**
- * Returns a titlecased string.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The titlecased string
- */
- function twig_title_string_filter(Twig_Environment $env, $string)
- {
- if (null !== $charset = $env->getCharset()) {
- return mb_convert_case($string, MB_CASE_TITLE, $charset);
- }
-
- return ucwords(strtolower($string));
- }
-
- /**
- * Returns a capitalized string.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The capitalized string
- */
- function twig_capitalize_string_filter(Twig_Environment $env, $string)
- {
- if (null !== $charset = $env->getCharset()) {
- return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
- }
-
- return ucfirst(strtolower($string));
- }
+/**
+ * Returns a titlecased string.
+ *
+ * @param Twig_Environment $env
+ * @param string $string A string
+ *
+ * @return string The titlecased string
+ */
+function twig_title_string_filter(Twig_Environment $env, $string)
+{
+ return mb_convert_case($string, MB_CASE_TITLE, $env->getCharset());
}
-// and byte fallback
-else {
- /**
- * Returns the length of a variable.
- *
- * @param Twig_Environment $env
- * @param mixed $thing A variable
- *
- * @return int The length of the value
- */
- function twig_length_filter(Twig_Environment $env, $thing)
- {
- return is_scalar($thing) ? strlen($thing) : count($thing);
- }
- /**
- * Returns a titlecased string.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The titlecased string
- */
- function twig_title_string_filter(Twig_Environment $env, $string)
- {
- return ucwords(strtolower($string));
- }
+/**
+ * Returns a capitalized string.
+ *
+ * @param Twig_Environment $env
+ * @param string $string A string
+ *
+ * @return string The capitalized string
+ */
+function twig_capitalize_string_filter(Twig_Environment $env, $string)
+{
+ $charset = $env->getCharset();
- /**
- * Returns a capitalized string.
- *
- * @param Twig_Environment $env
- * @param string $string A string
- *
- * @return string The capitalized string
- */
- function twig_capitalize_string_filter(Twig_Environment $env, $string)
- {
- return ucfirst(strtolower($string));
- }
+ return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, 2147483647, $charset), $charset);
}
/**
@@ -1402,6 +1264,18 @@ function twig_include(Twig_Environment $env, $context, $template, $variables = a
throw $e;
}
+ } catch (Throwable $e) {
+ if ($isSandboxed && !$alreadySandboxed) {
+ $sandbox->disableSandbox();
+ }
+
+ throw $e;
+ } catch (Exception $e) {
+ if ($isSandboxed && !$alreadySandboxed) {
+ $sandbox->disableSandbox();
+ }
+
+ throw $e;
}
if ($isSandboxed && !$alreadySandboxed) {
@@ -1424,11 +1298,7 @@ function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
{
$loader = $env->getLoader();
try {
- if (!$loader instanceof Twig_SourceContextLoaderInterface) {
- return $loader->getSource($name);
- } else {
- return $loader->getSourceContext($name)->getCode();
- }
+ return $loader->getSourceContext($name)->getCode();
} catch (Twig_Error_Loader $e) {
if (!$ignoreMissing) {
throw $e;
@@ -1501,3 +1371,191 @@ function twig_array_batch($items, $size, $fill = null)
return $result;
}
+
+/**
+ * Returns the attribute value for a given array/object.
+ *
+ * @param mixed $object The object or array from where to get the item
+ * @param mixed $item The item to get from the array or object
+ * @param array $arguments An array of arguments to pass if the item is an object method
+ * @param string $type The type of attribute (@see Twig_Template constants)
+ * @param bool $isDefinedTest Whether this is only a defined check
+ * @param bool $ignoreStrictCheck Whether to ignore the strict attribute check or not
+ *
+ * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
+ *
+ * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
+ *
+ * @internal
+ */
+function twig_get_attribute(Twig_Environment $env, Twig_Source $source, $object, $item, array $arguments = array(), $type = Twig_Template::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
+{
+ static $cache = array();
+
+ // array
+ if (Twig_Template::METHOD_CALL !== $type) {
+ $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
+
+ if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
+ || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
+ ) {
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ return $object[$arrayItem];
+ }
+
+ if (Twig_Template::ARRAY_CALL === $type || !is_object($object)) {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$env->isStrictVariables()) {
+ return;
+ }
+
+ if ($object instanceof ArrayAccess) {
+ $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, get_class($object));
+ } elseif (is_object($object)) {
+ $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, get_class($object));
+ } elseif (is_array($object)) {
+ if (empty($object)) {
+ $message = sprintf('Key "%s" does not exist as the array is empty.', $arrayItem);
+ } else {
+ $message = sprintf('Key "%s" for array with keys "%s" does not exist.', $arrayItem, implode(', ', array_keys($object)));
+ }
+ } elseif (Twig_Template::ARRAY_CALL === $type) {
+ if (null === $object) {
+ $message = sprintf('Impossible to access a key ("%s") on a null variable.', $item);
+ } else {
+ $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
+ }
+ } elseif (null === $object) {
+ $message = sprintf('Impossible to access an attribute ("%s") on a null variable.', $item);
+ } else {
+ $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
+ }
+
+ throw new Twig_Error_Runtime($message, -1, $source);
+ }
+ }
+
+ if (!is_object($object)) {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$env->isStrictVariables()) {
+ return;
+ }
+
+ if (null === $object) {
+ $message = sprintf('Impossible to invoke a method ("%s") on a null variable.', $item);
+ } else {
+ $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
+ }
+
+ throw new Twig_Error_Runtime($message, -1, $source);
+ }
+
+ if ($object instanceof Twig_Template) {
+ throw new Twig_Error_Runtime('Accessing Twig_Template attributes is forbidden.');
+ }
+
+ // object property
+ if (Twig_Template::METHOD_CALL !== $type) {
+ if (isset($object->$item) || array_key_exists((string) $item, $object)) {
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ if ($env->hasExtension('Twig_Extension_Sandbox')) {
+ $env->getExtension('Twig_Extension_Sandbox')->checkPropertyAllowed($object, $item);
+ }
+
+ return $object->$item;
+ }
+ }
+
+ $class = get_class($object);
+
+ // object method
+ // precedence: getXxx() > isXxx() > hasXxx()
+ if (!isset($cache[$class])) {
+ $methods = get_class_methods($object);
+ sort($methods);
+ $lcMethods = array_map('strtolower', $methods);
+ $classCache = array();
+ foreach ($methods as $i => $method) {
+ $classCache[$method] = $method;
+ $classCache[$lcName = $lcMethods[$i]] = $method;
+
+ if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
+ $name = substr($method, 3);
+ $lcName = substr($lcName, 3);
+ } elseif ('i' === $lcName[0] && 0 === strpos($lcName, 'is')) {
+ $name = substr($method, 2);
+ $lcName = substr($lcName, 2);
+ } elseif ('h' === $lcName[0] && 0 === strpos($lcName, 'has')) {
+ $name = substr($method, 3);
+ $lcName = substr($lcName, 3);
+ if (in_array('is'.$lcName, $lcMethods)) {
+ continue;
+ }
+ } else {
+ continue;
+ }
+
+ if (!isset($classCache[$name])) {
+ $classCache[$name] = $method;
+ }
+
+ if (!isset($classCache[$lcName])) {
+ $classCache[$lcName] = $method;
+ }
+ }
+ $cache[$class] = $classCache;
+ }
+
+ $call = false;
+ if (isset($cache[$class][$item])) {
+ $method = $cache[$class][$item];
+ } elseif (isset($cache[$class][$lcItem = strtolower($item)])) {
+ $method = $cache[$class][$lcItem];
+ } elseif (isset($cache[$class]['__call'])) {
+ $method = $item;
+ $call = true;
+ } else {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$env->isStrictVariables()) {
+ return;
+ }
+
+ throw new Twig_Error_Runtime(sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()"/"is%1$s()"/"has%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), -1, $source);
+ }
+
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ if ($env->hasExtension('Twig_Extension_Sandbox')) {
+ $env->getExtension('Twig_Extension_Sandbox')->checkMethodAllowed($object, $method);
+ }
+
+ // Some objects throw exceptions when they have __call, and the method we try
+ // to call is not supported. If ignoreStrictCheck is true, we should return null.
+ try {
+ $ret = $object->$method(...$arguments);
+ } catch (BadMethodCallException $e) {
+ if ($call && ($ignoreStrictCheck || !$env->isStrictVariables())) {
+ return;
+ }
+ throw $e;
+ }
+
+ return $ret;
+}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Debug.php b/vendor/twig/twig/lib/Twig/Extension/Debug.php
index 42fdb1e3..cd299b99 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Debug.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Debug.php
@@ -3,12 +3,13 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_Debug extends Twig_Extension
+
+final class Twig_Extension_Debug extends Twig_Extension
{
public function getFunctions()
{
@@ -23,17 +24,12 @@ class Twig_Extension_Debug extends Twig_Extension
;
return array(
- new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
+ new Twig_Function('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
);
}
-
- public function getName()
- {
- return 'debug';
- }
}
-function twig_var_dump(Twig_Environment $env, $context)
+function twig_var_dump(Twig_Environment $env, $context, ...$vars)
{
if (!$env->isDebug()) {
return;
@@ -41,8 +37,7 @@ function twig_var_dump(Twig_Environment $env, $context)
ob_start();
- $count = func_num_args();
- if (2 === $count) {
+ if (!$vars) {
$vars = array();
foreach ($context as $key => $value) {
if (!$value instanceof Twig_Template) {
@@ -52,9 +47,7 @@ function twig_var_dump(Twig_Environment $env, $context)
var_dump($vars);
} else {
- for ($i = 2; $i < $count; ++$i) {
- var_dump(func_get_arg($i));
- }
+ var_dump(...$vars);
}
return ob_get_clean();
diff --git a/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
index 5efccf20..6b70d91f 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Escaper.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
@@ -3,14 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_Escaper extends Twig_Extension
+
+final class Twig_Extension_Escaper extends Twig_Extension
{
- protected $defaultStrategy;
+ private $defaultStrategy;
/**
* @param string|false|callable $defaultStrategy An escaping strategy
@@ -35,7 +36,7 @@ class Twig_Extension_Escaper extends Twig_Extension
public function getFilters()
{
return array(
- new Twig_SimpleFilter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
+ new Twig_Filter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
);
}
@@ -49,19 +50,6 @@ class Twig_Extension_Escaper extends Twig_Extension
*/
public function setDefaultStrategy($defaultStrategy)
{
- // for BC
- if (true === $defaultStrategy) {
- @trigger_error('Using "true" as the default strategy is deprecated since version 1.21. Use "html" instead.', E_USER_DEPRECATED);
-
- $defaultStrategy = 'html';
- }
-
- if ('filename' === $defaultStrategy) {
- @trigger_error('Using "filename" as the default strategy is deprecated since version 1.27. Use "name" instead.', E_USER_DEPRECATED);
-
- $defaultStrategy = 'name';
- }
-
if ('name' === $defaultStrategy) {
$defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
}
@@ -86,11 +74,6 @@ class Twig_Extension_Escaper extends Twig_Extension
return $this->defaultStrategy;
}
-
- public function getName()
- {
- return 'escaper';
- }
}
/**
diff --git a/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php b/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
index 5370b8e2..a085cec7 100644
--- a/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
+++ b/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
@@ -19,4 +19,10 @@
*/
interface Twig_Extension_GlobalsInterface
{
+ /**
+ * Returns a list of global variables to add to the existing list.
+ *
+ * @return array An array of global variables
+ */
+ public function getGlobals();
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php b/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
index 7a075822..d883c7df 100644
--- a/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
+++ b/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
@@ -19,4 +19,12 @@
*/
interface Twig_Extension_InitRuntimeInterface
{
+ /**
+ * Initializes the runtime environment.
+ *
+ * This is where you can load some file that contains filter functions for instance.
+ *
+ * @param Twig_Environment $environment The current Twig_Environment instance
+ */
+ public function initRuntime(Twig_Environment $environment);
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Optimizer.php b/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
index 5a64a1a4..f0c5d441 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
@@ -3,14 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_Optimizer extends Twig_Extension
+
+final class Twig_Extension_Optimizer extends Twig_Extension
{
- protected $optimizers;
+ private $optimizers;
public function __construct($optimizers = -1)
{
@@ -21,9 +22,4 @@ class Twig_Extension_Optimizer extends Twig_Extension
{
return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
}
-
- public function getName()
- {
- return 'optimizer';
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Profiler.php b/vendor/twig/twig/lib/Twig/Extension/Profiler.php
index 643632b2..18612919 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Profiler.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Profiler.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -38,9 +38,4 @@ class Twig_Extension_Profiler extends Twig_Extension
{
return array(new Twig_Profiler_NodeVisitor_Profiler(get_class($this)));
}
-
- public function getName()
- {
- return 'profiler';
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Sandbox.php b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
index 760d1238..ecf71050 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
@@ -3,16 +3,17 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_Sandbox extends Twig_Extension
+
+final class Twig_Extension_Sandbox extends Twig_Extension
{
- protected $sandboxedGlobally;
- protected $sandboxed;
- protected $policy;
+ private $sandboxedGlobally;
+ private $sandboxed;
+ private $policy;
public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandboxed = false)
{
@@ -89,9 +90,4 @@ class Twig_Extension_Sandbox extends Twig_Extension
return $obj;
}
-
- public function getName()
- {
- return 'sandbox';
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Staging.php b/vendor/twig/twig/lib/Twig/Extension/Staging.php
index d21004d0..b45cf658 100644
--- a/vendor/twig/twig/lib/Twig/Extension/Staging.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -3,33 +3,34 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
- * Internal class.
- *
- * This class is used by Twig_Environment as a staging area and must not be used directly.
+ * Used by Twig_Environment as a staging area.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
-class Twig_Extension_Staging extends Twig_Extension
+final class Twig_Extension_Staging extends Twig_Extension
{
- protected $functions = array();
- protected $filters = array();
- protected $visitors = array();
- protected $tokenParsers = array();
- protected $globals = array();
- protected $tests = array();
-
- public function addFunction($name, $function)
+ private $functions = array();
+ private $filters = array();
+ private $visitors = array();
+ private $tokenParsers = array();
+ private $tests = array();
+
+ public function addFunction(Twig_Function $function)
{
- $this->functions[$name] = $function;
+ if (isset($this->functions[$function->getName()])) {
+ throw new LogicException(sprintf('Function "%s" is already registered.', $function->getName()));
+ }
+
+ $this->functions[$function->getName()] = $function;
}
public function getFunctions()
@@ -37,9 +38,13 @@ class Twig_Extension_Staging extends Twig_Extension
return $this->functions;
}
- public function addFilter($name, $filter)
+ public function addFilter(Twig_Filter $filter)
{
- $this->filters[$name] = $filter;
+ if (isset($this->filters[$filter->getName()])) {
+ throw new LogicException(sprintf('Filter "%s" is already registered.', $filter->getName()));
+ }
+
+ $this->filters[$filter->getName()] = $filter;
}
public function getFilters()
@@ -59,7 +64,11 @@ class Twig_Extension_Staging extends Twig_Extension
public function addTokenParser(Twig_TokenParserInterface $parser)
{
- $this->tokenParsers[] = $parser;
+ if (isset($this->tokenParsers[$parser->getTag()])) {
+ throw new LogicException(sprintf('Tag "%s" is already registered.', $parser->getTag()));
+ }
+
+ $this->tokenParsers[$parser->getTag()] = $parser;
}
public function getTokenParsers()
@@ -67,28 +76,17 @@ class Twig_Extension_Staging extends Twig_Extension
return $this->tokenParsers;
}
- public function addGlobal($name, $value)
+ public function addTest(Twig_Test $test)
{
- $this->globals[$name] = $value;
- }
+ if (isset($this->tests[$test->getName()])) {
+ throw new LogicException(sprintf('Test "%s" is already registered.', $test->getTag()));
+ }
- public function getGlobals()
- {
- return $this->globals;
- }
-
- public function addTest($name, $test)
- {
- $this->tests[$name] = $test;
+ $this->tests[$test->getName()] = $test;
}
public function getTests()
{
return $this->tests;
}
-
- public function getName()
- {
- return 'staging';
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
index 1b3bd26a..31c5eb3b 100644
--- a/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
+++ b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
@@ -3,24 +3,20 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Extension_StringLoader extends Twig_Extension
+
+final class Twig_Extension_StringLoader extends Twig_Extension
{
public function getFunctions()
{
return array(
- new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
+ new Twig_Function('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
);
}
-
- public function getName()
- {
- return 'string_loader';
- }
}
/**
diff --git a/vendor/twig/twig/lib/Twig/ExtensionInterface.php b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
index 980eade0..21dd86ca 100644
--- a/vendor/twig/twig/lib/Twig/ExtensionInterface.php
+++ b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,15 +16,6 @@
*/
interface Twig_ExtensionInterface
{
- /**
- * Initializes the runtime environment.
- *
- * This is where you can load some file that contains filter functions for instance.
- *
- * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
- */
- public function initRuntime(Twig_Environment $environment);
-
/**
* Returns the token parser instances to add to the existing list.
*
@@ -42,46 +33,28 @@ interface Twig_ExtensionInterface
/**
* Returns a list of filters to add to the existing list.
*
- * @return Twig_SimpleFilter[]
+ * @return Twig_Filter[]
*/
public function getFilters();
/**
* Returns a list of tests to add to the existing list.
*
- * @return Twig_SimpleTest[]
+ * @return Twig_Test[]
*/
public function getTests();
/**
* Returns a list of functions to add to the existing list.
*
- * @return Twig_SimpleFunction[]
+ * @return Twig_Function[]
*/
public function getFunctions();
/**
* Returns a list of operators to add to the existing list.
*
- * @return array An array of operators
+ * @return array<array> First array of unary operators, second array of binary operators
*/
public function getOperators();
-
- /**
- * Returns a list of global variables to add to the existing list.
- *
- * @return array An array of global variables
- *
- * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
- */
- public function getGlobals();
-
- /**
- * Returns the name of the extension.
- *
- * @return string The extension name
- *
- * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
- */
- public function getName();
}
diff --git a/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php b/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
index 772139e2..47183726 100644
--- a/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
+++ b/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Filter.php b/vendor/twig/twig/lib/Twig/Filter.php
index 101d2e79..343a5331 100644
--- a/vendor/twig/twig/lib/Twig/Filter.php
+++ b/vendor/twig/twig/lib/Twig/Filter.php
@@ -3,39 +3,73 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-@trigger_error('The Twig_Filter class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
/**
* Represents a template filter.
*
- * Use Twig_SimpleFilter instead.
+ * @final
*
* @author Fabien Potencier <fabien@symfony.com>
*
- * @deprecated since 1.12 (to be removed in 2.0)
+ * @see http://twig.sensiolabs.org/doc/templates.html#filters
*/
-abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
+class Twig_Filter
{
- protected $options;
- protected $arguments = array();
+ private $name;
+ private $callable;
+ private $options;
+ private $arguments = array();
- public function __construct(array $options = array())
+ /**
+ * Creates a template filter.
+ *
+ * @param string $name Name of this filter
+ * @param callable|null $callable A callable implementing the filter. If null, you need to overwrite the "node_class" option to customize compilation.
+ * @param array $options Options array
+ */
+ public function __construct(string $name, $callable = null, array $options = array())
{
+ $this->name = $name;
+ $this->callable = $callable;
$this->options = array_merge(array(
'needs_environment' => false,
'needs_context' => false,
+ 'is_variadic' => false,
+ 'is_safe' => null,
+ 'is_safe_callback' => null,
'pre_escape' => null,
'preserves_safety' => null,
- 'callable' => null,
+ 'node_class' => 'Twig_Node_Expression_Filter',
+ 'deprecated' => false,
+ 'alternative' => null,
), $options);
}
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * Returns the callable to execute for this filter.
+ *
+ * @return callable|null
+ */
+ public function getCallable()
+ {
+ return $this->callable;
+ }
+
+ public function getNodeClass()
+ {
+ return $this->options['node_class'];
+ }
+
public function setArguments($arguments)
{
$this->arguments = $arguments;
@@ -58,12 +92,12 @@ abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableI
public function getSafe(Twig_Node $filterArgs)
{
- if (isset($this->options['is_safe'])) {
+ if (null !== $this->options['is_safe']) {
return $this->options['is_safe'];
}
- if (isset($this->options['is_safe_callback'])) {
- return call_user_func($this->options['is_safe_callback'], $filterArgs);
+ if (null !== $this->options['is_safe_callback']) {
+ return $this->options['is_safe_callback']($filterArgs);
}
}
@@ -77,8 +111,23 @@ abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableI
return $this->options['pre_escape'];
}
- public function getCallable()
+ public function isVariadic()
+ {
+ return $this->options['is_variadic'];
+ }
+
+ public function isDeprecated()
+ {
+ return (bool) $this->options['deprecated'];
+ }
+
+ public function getDeprecatedVersion()
+ {
+ return $this->options['deprecated'];
+ }
+
+ public function getAlternative()
{
- return $this->options['callable'];
+ return $this->options['alternative'];
}
}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Function.php b/vendor/twig/twig/lib/Twig/Filter/Function.php
deleted file mode 100644
index d679cab2..00000000
--- a/vendor/twig/twig/lib/Twig/Filter/Function.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Function extends Twig_Filter
-{
- protected $function;
-
- public function __construct($function, array $options = array())
- {
- $options['callable'] = $function;
-
- parent::__construct($options);
-
- $this->function = $function;
- }
-
- public function compile()
- {
- return $this->function;
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Method.php b/vendor/twig/twig/lib/Twig/Filter/Method.php
deleted file mode 100644
index 5ca0511b..00000000
--- a/vendor/twig/twig/lib/Twig/Filter/Method.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Method extends Twig_Filter
-{
- protected $extension;
- protected $method;
-
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
- {
- $options['callable'] = array($extension, $method);
-
- parent::__construct($options);
-
- $this->extension = $extension;
- $this->method = $method;
- }
-
- public function compile()
- {
- return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Node.php b/vendor/twig/twig/lib/Twig/Filter/Node.php
deleted file mode 100644
index a922f503..00000000
--- a/vendor/twig/twig/lib/Twig/Filter/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template filter as a node.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Node extends Twig_Filter
-{
- protected $class;
-
- public function __construct($class, array $options = array())
- {
- parent::__construct($options);
-
- $this->class = $class;
- }
-
- public function getClass()
- {
- return $this->class;
- }
-
- public function compile()
- {
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
deleted file mode 100644
index 56798613..00000000
--- a/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterCallableInterface
-{
- public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/FilterInterface.php b/vendor/twig/twig/lib/Twig/FilterInterface.php
deleted file mode 100644
index 6b0be0e3..00000000
--- a/vendor/twig/twig/lib/Twig/FilterInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterInterface
-{
- /**
- * Compiles a filter.
- *
- * @return string The PHP code for the filter
- */
- public function compile();
-
- public function needsEnvironment();
-
- public function needsContext();
-
- public function getSafe(Twig_Node $filterArgs);
-
- public function getPreservesSafety();
-
- public function getPreEscape();
-
- public function setArguments($arguments);
-
- public function getArguments();
-}
diff --git a/vendor/twig/twig/lib/Twig/Function.php b/vendor/twig/twig/lib/Twig/Function.php
index 9fc76a8b..848c2770 100644
--- a/vendor/twig/twig/lib/Twig/Function.php
+++ b/vendor/twig/twig/lib/Twig/Function.php
@@ -3,37 +3,71 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-@trigger_error('The Twig_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
/**
* Represents a template function.
*
- * Use Twig_SimpleFunction instead.
+ * @final
*
* @author Fabien Potencier <fabien@symfony.com>
*
- * @deprecated since 1.12 (to be removed in 2.0)
+ * @see http://twig.sensiolabs.org/doc/templates.html#functions
*/
-abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
+class Twig_Function
{
- protected $options;
- protected $arguments = array();
+ private $name;
+ private $callable;
+ private $options;
+ private $arguments = array();
- public function __construct(array $options = array())
+ /**
+ * Creates a template function.
+ *
+ * @param string $name Name of this function
+ * @param callable|null $callable A callable implementing the function. If null, you need to overwrite the "node_class" option to customize compilation.
+ * @param array $options Options array
+ */
+ public function __construct(string $name, $callable = null, array $options = array())
{
+ $this->name = $name;
+ $this->callable = $callable;
$this->options = array_merge(array(
'needs_environment' => false,
'needs_context' => false,
- 'callable' => null,
+ 'is_variadic' => false,
+ 'is_safe' => null,
+ 'is_safe_callback' => null,
+ 'node_class' => 'Twig_Node_Expression_Function',
+ 'deprecated' => false,
+ 'alternative' => null,
), $options);
}
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * Returns the callable to execute for this function.
+ *
+ * @return callable|null
+ */
+ public function getCallable()
+ {
+ return $this->callable;
+ }
+
+ public function getNodeClass()
+ {
+ return $this->options['node_class'];
+ }
+
public function setArguments($arguments)
{
$this->arguments = $arguments;
@@ -56,19 +90,34 @@ abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCal
public function getSafe(Twig_Node $functionArgs)
{
- if (isset($this->options['is_safe'])) {
+ if (null !== $this->options['is_safe']) {
return $this->options['is_safe'];
}
- if (isset($this->options['is_safe_callback'])) {
- return call_user_func($this->options['is_safe_callback'], $functionArgs);
+ if (null !== $this->options['is_safe_callback']) {
+ return $this->options['is_safe_callback']($functionArgs);
}
return array();
}
- public function getCallable()
+ public function isVariadic()
+ {
+ return $this->options['is_variadic'];
+ }
+
+ public function isDeprecated()
+ {
+ return (bool) $this->options['deprecated'];
+ }
+
+ public function getDeprecatedVersion()
+ {
+ return $this->options['deprecated'];
+ }
+
+ public function getAlternative()
{
- return $this->options['callable'];
+ return $this->options['alternative'];
}
}
diff --git a/vendor/twig/twig/lib/Twig/Function/Function.php b/vendor/twig/twig/lib/Twig/Function/Function.php
deleted file mode 100644
index ae83e153..00000000
--- a/vendor/twig/twig/lib/Twig/Function/Function.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Function extends Twig_Function
-{
- protected $function;
-
- public function __construct($function, array $options = array())
- {
- $options['callable'] = $function;
-
- parent::__construct($options);
-
- $this->function = $function;
- }
-
- public function compile()
- {
- return $this->function;
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Function/Method.php b/vendor/twig/twig/lib/Twig/Function/Method.php
deleted file mode 100644
index d014be48..00000000
--- a/vendor/twig/twig/lib/Twig/Function/Method.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Method extends Twig_Function
-{
- protected $extension;
- protected $method;
-
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
- {
- $options['callable'] = array($extension, $method);
-
- parent::__construct($options);
-
- $this->extension = $extension;
- $this->method = $method;
- }
-
- public function compile()
- {
- return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Function/Node.php b/vendor/twig/twig/lib/Twig/Function/Node.php
deleted file mode 100644
index 118b0bab..00000000
--- a/vendor/twig/twig/lib/Twig/Function/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template function as a node.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Node extends Twig_Function
-{
- protected $class;
-
- public function __construct($class, array $options = array())
- {
- parent::__construct($options);
-
- $this->class = $class;
- }
-
- public function getClass()
- {
- return $this->class;
- }
-
- public function compile()
- {
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
deleted file mode 100644
index 87d795eb..00000000
--- a/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionCallableInterface
-{
- public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/FunctionInterface.php b/vendor/twig/twig/lib/Twig/FunctionInterface.php
deleted file mode 100644
index f4492344..00000000
--- a/vendor/twig/twig/lib/Twig/FunctionInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionInterface
-{
- /**
- * Compiles a function.
- *
- * @return string The PHP code for the function
- */
- public function compile();
-
- public function needsEnvironment();
-
- public function needsContext();
-
- public function getSafe(Twig_Node $filterArgs);
-
- public function setArguments($arguments);
-
- public function getArguments();
-}
diff --git a/vendor/twig/twig/lib/Twig/Lexer.php b/vendor/twig/twig/lib/Twig/Lexer.php
index 0e7019f5..33fc04de 100644
--- a/vendor/twig/twig/lib/Twig/Lexer.php
+++ b/vendor/twig/twig/lib/Twig/Lexer.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,24 +15,23 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Lexer implements Twig_LexerInterface
+class Twig_Lexer
{
- protected $tokens;
- protected $code;
- protected $cursor;
- protected $lineno;
- protected $end;
- protected $state;
- protected $states;
- protected $brackets;
- protected $env;
- // to be renamed to $name in 2.0 (where it is private)
- protected $filename;
- protected $options;
- protected $regexes;
- protected $position;
- protected $positions;
- protected $currentVarBlockLine;
+ private $tokens;
+ private $code;
+ private $cursor;
+ private $lineno;
+ private $end;
+ private $state;
+ private $states;
+ private $brackets;
+ private $env;
+ private $source;
+ private $options;
+ private $regexes;
+ private $position;
+ private $positions;
+ private $currentVarBlockLine;
const STATE_DATA = 0;
const STATE_BLOCK = 1;
@@ -62,10 +61,10 @@ class Twig_Lexer implements Twig_LexerInterface
$this->regexes = array(
'lex_var' => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
'lex_block' => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
- 'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:end%s)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
+ 'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:endverbatim)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
'operator' => $this->getOperatorRegex(),
'lex_comment' => '/(?:'.preg_quote($this->options['whitespace_trim'], '/').preg_quote($this->options['tag_comment'][1], '/').'\s*|'.preg_quote($this->options['tag_comment'][1], '/').')\n?/s',
- 'lex_block_raw' => '/\s*(raw|verbatim)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
+ 'lex_block_raw' => '/\s*verbatim\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
'lex_block_line' => '/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As',
'lex_tokens_start' => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
@@ -73,27 +72,10 @@ class Twig_Lexer implements Twig_LexerInterface
);
}
- /**
- * {@inheritdoc}
- */
- public function tokenize($code, $name = null)
+ public function tokenize(Twig_Source $source)
{
- if (!$code instanceof Twig_Source) {
- @trigger_error(sprintf('Passing a string as the $code argument of %s() is deprecated since version 1.27 and will be removed in 2.0. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
- $source = new Twig_Source($code, $name);
- } else {
- $source = $code;
- }
-
- if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
- $mbEncoding = mb_internal_encoding();
- mb_internal_encoding('ASCII');
- } else {
- $mbEncoding = null;
- }
-
+ $this->source = $source;
$this->code = str_replace(array("\r\n", "\r"), "\n", $source->getCode());
- $this->filename = $source->getName();
$this->cursor = 0;
$this->lineno = 1;
$this->end = strlen($this->code);
@@ -137,17 +119,13 @@ class Twig_Lexer implements Twig_LexerInterface
if (!empty($this->brackets)) {
list($expect, $lineno) = array_pop($this->brackets);
- throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
- }
-
- if ($mbEncoding) {
- mb_internal_encoding($mbEncoding);
+ throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
}
- return new Twig_TokenStream($this->tokens, $source);
+ return new Twig_TokenStream($this->tokens, $this->source);
}
- protected function lexData()
+ private function lexData()
{
// if no matches are left we return the rest of the template as simple text token
if ($this->position == count($this->positions[0]) - 1) {
@@ -183,7 +161,7 @@ class Twig_Lexer implements Twig_LexerInterface
// raw data?
if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
- $this->lexRawData($match[1]);
+ $this->lexRawData();
// {% line \d+ %}
} elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
@@ -203,7 +181,7 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function lexBlock()
+ private function lexBlock()
{
if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, null, $this->cursor)) {
$this->pushToken(Twig_Token::BLOCK_END_TYPE);
@@ -214,7 +192,7 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function lexVar()
+ private function lexVar()
{
if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, null, $this->cursor)) {
$this->pushToken(Twig_Token::VAR_END_TYPE);
@@ -225,14 +203,14 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function lexExpression()
+ private function lexExpression()
{
// whitespace
if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
if ($this->cursor >= $this->end) {
- throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
+ throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->source);
}
}
@@ -264,12 +242,12 @@ class Twig_Lexer implements Twig_LexerInterface
// closing bracket
elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
if (empty($this->brackets)) {
- throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
+ throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
}
list($expect, $lineno) = array_pop($this->brackets);
if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
- throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
+ throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
}
}
@@ -289,18 +267,14 @@ class Twig_Lexer implements Twig_LexerInterface
}
// unlexable
else {
- throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
+ throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
}
}
- protected function lexRawData($tag)
+ private function lexRawData()
{
- if ('raw' === $tag) {
- @trigger_error(sprintf('Twig Tag "raw" is deprecated since version 1.21. Use "verbatim" instead in %s at line %d.', $this->filename, $this->lineno), E_USER_DEPRECATED);
- }
-
- if (!preg_match(str_replace('%s', $tag, $this->regexes['lex_raw_data']), $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
- throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->filename);
+ if (!preg_match($this->regexes['lex_raw_data'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
+ throw new Twig_Error_Syntax('Unexpected end of file: Unclosed "verbatim" block.', $this->lineno, $this->source);
}
$text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
@@ -313,16 +287,16 @@ class Twig_Lexer implements Twig_LexerInterface
$this->pushToken(Twig_Token::TEXT_TYPE, $text);
}
- protected function lexComment()
+ private function lexComment()
{
if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
- throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->filename);
+ throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->source);
}
$this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
}
- protected function lexString()
+ private function lexString()
{
if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
$this->brackets[] = array($this->options['interpolation'][0], $this->lineno);
@@ -335,7 +309,7 @@ class Twig_Lexer implements Twig_LexerInterface
} elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
list($expect, $lineno) = array_pop($this->brackets);
if ($this->code[$this->cursor] != '"') {
- throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
+ throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
}
$this->popState();
@@ -343,7 +317,7 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function lexInterpolation()
+ private function lexInterpolation()
{
$bracket = end($this->brackets);
if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, null, $this->cursor)) {
@@ -356,7 +330,7 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function pushToken($type, $value = '')
+ private function pushToken($type, $value = '')
{
// do not push empty text tokens
if (Twig_Token::TEXT_TYPE === $type && '' === $value) {
@@ -366,13 +340,13 @@ class Twig_Lexer implements Twig_LexerInterface
$this->tokens[] = new Twig_Token($type, $value, $this->lineno);
}
- protected function moveCursor($text)
+ private function moveCursor($text)
{
$this->cursor += strlen($text);
$this->lineno += substr_count($text, "\n");
}
- protected function getOperatorRegex()
+ private function getOperatorRegex()
{
$operators = array_merge(
array('='),
@@ -402,16 +376,16 @@ class Twig_Lexer implements Twig_LexerInterface
return '/'.implode('|', $regex).'/A';
}
- protected function pushState($state)
+ private function pushState($state)
{
$this->states[] = $this->state;
$this->state = $state;
}
- protected function popState()
+ private function popState()
{
if (0 === count($this->states)) {
- throw new Exception('Cannot pop state without a previous state.');
+ throw new LogicException('Cannot pop state without a previous state.');
}
$this->state = array_pop($this->states);
diff --git a/vendor/twig/twig/lib/Twig/LexerInterface.php b/vendor/twig/twig/lib/Twig/LexerInterface.php
deleted file mode 100644
index afd86332..00000000
--- a/vendor/twig/twig/lib/Twig/LexerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by lexer classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_LexerInterface
-{
- /**
- * Tokenizes a source code.
- *
- * @param string|Twig_Source $code The source code
- * @param string $name A unique identifier for the source code
- *
- * @return Twig_TokenStream
- *
- * @throws Twig_Error_Syntax When the code is syntactically wrong
- */
- public function tokenize($code, $name = null);
-}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Array.php b/vendor/twig/twig/lib/Twig/Loader/Array.php
index 2bb2fb82..9cf05838 100644
--- a/vendor/twig/twig/lib/Twig/Loader/Array.php
+++ b/vendor/twig/twig/lib/Twig/Loader/Array.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -21,9 +21,9 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+final class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
{
- protected $templates = array();
+ private $templates = array();
/**
* @param array $templates An array of templates (keys are the names, and values are the source code)
@@ -41,27 +41,9 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
*/
public function setTemplate($name, $template)
{
- $this->templates[(string) $name] = $template;
+ $this->templates[$name] = $template;
}
- /**
- * {@inheritdoc}
- */
- public function getSource($name)
- {
- @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
- $name = (string) $name;
- if (!isset($this->templates[$name])) {
- throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
- }
-
- return $this->templates[$name];
- }
-
- /**
- * {@inheritdoc}
- */
public function getSourceContext($name)
{
$name = (string) $name;
@@ -72,20 +54,13 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
return new Twig_Source($this->templates[$name], $name);
}
- /**
- * {@inheritdoc}
- */
public function exists($name)
{
- return isset($this->templates[(string) $name]);
+ return isset($this->templates[$name]);
}
- /**
- * {@inheritdoc}
- */
public function getCacheKey($name)
{
- $name = (string) $name;
if (!isset($this->templates[$name])) {
throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
}
@@ -93,12 +68,8 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
return $this->templates[$name];
}
- /**
- * {@inheritdoc}
- */
public function isFresh($name, $time)
{
- $name = (string) $name;
if (!isset($this->templates[$name])) {
throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Chain.php b/vendor/twig/twig/lib/Twig/Loader/Chain.php
index 26766d6d..c49c1082 100644
--- a/vendor/twig/twig/lib/Twig/Loader/Chain.php
+++ b/vendor/twig/twig/lib/Twig/Loader/Chain.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,10 +14,10 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
+final class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
{
private $hasSourceCache = array();
- protected $loaders = array();
+ private $loaders = array();
/**
* @param Twig_LoaderInterface[] $loaders
@@ -35,46 +35,16 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
$this->hasSourceCache = array();
}
- /**
- * {@inheritdoc}
- */
- public function getSource($name)
- {
- @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
- $exceptions = array();
- foreach ($this->loaders as $loader) {
- if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
- continue;
- }
-
- try {
- return $loader->getSource($name);
- } catch (Twig_Error_Loader $e) {
- $exceptions[] = $e->getMessage();
- }
- }
-
- throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
- }
-
- /**
- * {@inheritdoc}
- */
public function getSourceContext($name)
{
$exceptions = array();
foreach ($this->loaders as $loader) {
- if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
+ if (!$loader->exists($name)) {
continue;
}
try {
- if ($loader instanceof Twig_SourceContextLoaderInterface) {
- return $loader->getSourceContext($name);
- }
-
- return new Twig_Source($loader->getSource($name), $name);
+ return $loader->getSourceContext($name);
} catch (Twig_Error_Loader $e) {
$exceptions[] = $e->getMessage();
}
@@ -83,49 +53,26 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
}
- /**
- * {@inheritdoc}
- */
public function exists($name)
{
- $name = (string) $name;
-
if (isset($this->hasSourceCache[$name])) {
return $this->hasSourceCache[$name];
}
foreach ($this->loaders as $loader) {
- if ($loader instanceof Twig_ExistsLoaderInterface) {
- if ($loader->exists($name)) {
- return $this->hasSourceCache[$name] = true;
- }
-
- continue;
- }
-
- try {
- if ($loader instanceof Twig_SourceContextLoaderInterface) {
- $loader->getSourceContext($name);
- } else {
- $loader->getSource($name);
- }
-
+ if ($loader->exists($name)) {
return $this->hasSourceCache[$name] = true;
- } catch (Twig_Error_Loader $e) {
}
}
return $this->hasSourceCache[$name] = false;
}
- /**
- * {@inheritdoc}
- */
public function getCacheKey($name)
{
$exceptions = array();
foreach ($this->loaders as $loader) {
- if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
+ if (!$loader->exists($name)) {
continue;
}
@@ -139,14 +86,11 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
}
- /**
- * {@inheritdoc}
- */
public function isFresh($name, $time)
{
$exceptions = array();
foreach ($this->loaders as $loader) {
- if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
+ if (!$loader->exists($name)) {
continue;
}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
index b9204786..9ce88f19 100644
--- a/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
+++ b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -131,19 +131,6 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
}
}
- /**
- * {@inheritdoc}
- */
- public function getSource($name)
- {
- @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
- return file_get_contents($this->findTemplate($name));
- }
-
- /**
- * {@inheritdoc}
- */
public function getSourceContext($name)
{
$path = $this->findTemplate($name);
@@ -151,9 +138,6 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
return new Twig_Source(file_get_contents($path), $name, $path);
}
- /**
- * {@inheritdoc}
- */
public function getCacheKey($name)
{
$path = $this->findTemplate($name);
@@ -165,9 +149,6 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
return $path;
}
- /**
- * {@inheritdoc}
- */
public function exists($name)
{
$name = $this->normalizeName($name);
@@ -176,26 +157,24 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
return true;
}
- try {
- return false !== $this->findTemplate($name, false);
- } catch (Twig_Error_Loader $exception) {
- @trigger_error(sprintf('In %s::findTemplate(), you must accept a second argument that when set to "false" returns "false" instead of throwing an exception. Not supporting this argument is deprecated since version 1.27.', get_class($this)), E_USER_DEPRECATED);
-
- return false;
- }
+ return false !== $this->findTemplate($name, false);
}
- /**
- * {@inheritdoc}
- */
public function isFresh($name, $time)
{
return filemtime($this->findTemplate($name)) <= $time;
}
- protected function findTemplate($name)
+ /**
+ * Checks if the template can be found.
+ *
+ * @param string $name The template name
+ * @param bool $throw Whether to throw an exception when an error occurs
+ *
+ * @return string|false The template name or false
+ */
+ protected function findTemplate($name, $throw = true)
{
- $throw = func_num_args() > 1 ? func_get_arg(1) : true;
$name = $this->normalizeName($name);
if (isset($this->cache[$name])) {
@@ -247,7 +226,12 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
throw new Twig_Error_Loader($this->errorCache[$name]);
}
- protected function parseName($name, $default = self::MAIN_NAMESPACE)
+ private function normalizeName($name)
+ {
+ return preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));
+ }
+
+ private function parseName($name, $default = self::MAIN_NAMESPACE)
{
if (isset($name[0]) && '@' == $name[0]) {
if (false === $pos = strpos($name, '/')) {
@@ -263,12 +247,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
return array($default, $name);
}
- protected function normalizeName($name)
- {
- return preg_replace('#/{2,}#', '/', str_replace('\\', '/', (string) $name));
- }
-
- protected function validateName($name)
+ private function validateName($name)
{
if (false !== strpos($name, "\0")) {
throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
@@ -294,7 +273,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
{
return strspn($file, '/\\', 0, 1)
|| (strlen($file) > 3 && ctype_alpha($file[0])
- && substr($file, 1, 1) === ':'
+ && ':' === $file[1]
&& strspn($file, '/\\', 2, 1)
)
|| null !== parse_url($file, PHP_URL_SCHEME)
diff --git a/vendor/twig/twig/lib/Twig/Loader/String.php b/vendor/twig/twig/lib/Twig/Loader/String.php
deleted file mode 100644
index 46da4a4e..00000000
--- a/vendor/twig/twig/lib/Twig/Loader/String.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Loader_String class is deprecated since version 1.18.1 and will be removed in 2.0. Use Twig_Loader_Array instead or Twig_Environment::createTemplate().', E_USER_DEPRECATED);
-
-/**
- * Loads a template from a string.
- *
- * This loader should NEVER be used. It only exists for Twig internal purposes.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @deprecated since 1.18.1 (to be removed in 2.0)
- *
- * @internal
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
-{
- /**
- * {@inheritdoc}
- */
- public function getSource($name)
- {
- @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
- return $name;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getSourceContext($name)
- {
- return new Twig_Source($name, $name);
- }
-
- /**
- * {@inheritdoc}
- */
- public function exists($name)
- {
- return true;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCacheKey($name)
- {
- return $name;
- }
-
- /**
- * {@inheritdoc}
- */
- public function isFresh($name, $time)
- {
- return true;
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/LoaderInterface.php b/vendor/twig/twig/lib/Twig/LoaderInterface.php
index 840ab14c..71f82e85 100644
--- a/vendor/twig/twig/lib/Twig/LoaderInterface.php
+++ b/vendor/twig/twig/lib/Twig/LoaderInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,17 +17,15 @@
interface Twig_LoaderInterface
{
/**
- * Gets the source code of a template, given its name.
+ * Returns the source context for a given template logical name.
*
- * @param string $name The name of the template to load
+ * @param string $name The template logical name
*
- * @return string The template source code
+ * @return Twig_Source
*
* @throws Twig_Error_Loader When $name is not found
- *
- * @deprecated since 1.27 (to be removed in 2.0), implement Twig_SourceContextLoaderInterface
*/
- public function getSource($name);
+ public function getSourceContext($name);
/**
* Gets the cache key to use for the cache for a given template name.
@@ -52,4 +50,13 @@ interface Twig_LoaderInterface
* @throws Twig_Error_Loader When $name is not found
*/
public function isFresh($name, $time);
+
+ /**
+ * Check if we have the source code of a template, given its name.
+ *
+ * @param string $name The name of the template to check if we can load
+ *
+ * @return bool If the template source code is handled by this loader or not
+ */
+ public function exists($name);
}
diff --git a/vendor/twig/twig/lib/Twig/Markup.php b/vendor/twig/twig/lib/Twig/Markup.php
index 69871fcb..6975ea1c 100644
--- a/vendor/twig/twig/lib/Twig/Markup.php
+++ b/vendor/twig/twig/lib/Twig/Markup.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,10 +14,10 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Markup implements Countable
+class Twig_Markup implements Countable, JsonSerializable
{
- protected $content;
- protected $charset;
+ private $content;
+ private $charset;
public function __construct($content, $charset)
{
@@ -32,6 +32,11 @@ class Twig_Markup implements Countable
public function count()
{
- return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
+ return mb_strlen($this->content, $this->charset);
+ }
+
+ public function jsonSerialize()
+ {
+ return $this->content;
}
}
diff --git a/vendor/twig/twig/lib/Twig/Node.php b/vendor/twig/twig/lib/Twig/Node.php
index ba0596ca..dc7c822c 100644
--- a/vendor/twig/twig/lib/Twig/Node.php
+++ b/vendor/twig/twig/lib/Twig/Node.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,7 +15,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Node implements Twig_NodeInterface
+class Twig_Node implements Countable, IteratorAggregate
{
protected $nodes;
protected $attributes;
@@ -38,8 +38,8 @@ class Twig_Node implements Twig_NodeInterface
public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
{
foreach ($nodes as $name => $node) {
- if (!$node instanceof Twig_NodeInterface) {
- @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
+ if (!$node instanceof self) {
+ throw new InvalidArgumentException(sprintf('Using "%s" for the value of node "%s" of "%s" is not supported. You must pass a Twig_Node instance.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)));
}
}
$this->nodes = $nodes;
@@ -76,41 +76,6 @@ class Twig_Node implements Twig_NodeInterface
return implode("\n", $repr);
}
- /**
- * @deprecated since 1.16.1 (to be removed in 2.0)
- */
- public function toXml($asDom = false)
- {
- @trigger_error(sprintf('%s is deprecated since version 1.16.1 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- $dom = new DOMDocument('1.0', 'UTF-8');
- $dom->formatOutput = true;
- $dom->appendChild($xml = $dom->createElement('twig'));
-
- $xml->appendChild($node = $dom->createElement('node'));
- $node->setAttribute('class', get_class($this));
-
- foreach ($this->attributes as $name => $value) {
- $node->appendChild($attribute = $dom->createElement('attribute'));
- $attribute->setAttribute('name', $name);
- $attribute->appendChild($dom->createTextNode($value));
- }
-
- foreach ($this->nodes as $name => $n) {
- if (null === $n) {
- continue;
- }
-
- $child = $n->toXml(true)->getElementsByTagName('node')->item(0);
- $child = $dom->importNode($child, true);
- $child->setAttribute('name', $name);
-
- $node->appendChild($child);
- }
-
- return $asDom ? $dom : $dom->saveXML();
- }
-
public function compile(Twig_Compiler $compiler)
{
foreach ($this->nodes as $node) {
@@ -123,16 +88,6 @@ class Twig_Node implements Twig_NodeInterface
return $this->lineno;
}
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getLine()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateLine() instead.', E_USER_DEPRECATED);
-
- return $this->lineno;
- }
-
public function getNodeTag()
{
return $this->tag;
@@ -177,7 +132,7 @@ class Twig_Node implements Twig_NodeInterface
*/
public function hasNode($name)
{
- return array_key_exists($name, $this->nodes);
+ return isset($this->nodes[$name]);
}
/**
@@ -185,19 +140,15 @@ class Twig_Node implements Twig_NodeInterface
*/
public function getNode($name)
{
- if (!array_key_exists($name, $this->nodes)) {
+ if (!isset($this->nodes[$name])) {
throw new LogicException(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
}
return $this->nodes[$name];
}
- public function setNode($name, $node = null)
+ public function setNode($name, Twig_Node $node)
{
- if (!$node instanceof Twig_NodeInterface) {
- @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
- }
-
$this->nodes[$name] = $node;
}
@@ -220,9 +171,7 @@ class Twig_Node implements Twig_NodeInterface
{
$this->name = $name;
foreach ($this->nodes as $node) {
- if (null !== $node) {
- $node->setTemplateName($name);
- }
+ $node->setTemplateName($name);
}
}
@@ -230,24 +179,4 @@ class Twig_Node implements Twig_NodeInterface
{
return $this->name;
}
-
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function setFilename($name)
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', E_USER_DEPRECATED);
-
- $this->setTemplateName($name);
- }
-
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getFilename()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED);
-
- return $this->name;
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Node/AutoEscape.php b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
index 47cc998d..f5e6cde2 100644
--- a/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
+++ b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -22,7 +22,7 @@
*/
class Twig_Node_AutoEscape extends Twig_Node
{
- public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
+ public function __construct($value, Twig_Node $body, $lineno, $tag = 'autoescape')
{
parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Block.php b/vendor/twig/twig/lib/Twig/Node/Block.php
index a05af6fb..f63b593d 100644
--- a/vendor/twig/twig/lib/Twig/Node/Block.php
+++ b/vendor/twig/twig/lib/Twig/Node/Block.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,7 +17,7 @@
*/
class Twig_Node_Block extends Twig_Node
{
- public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
+ public function __construct($name, Twig_Node $body, $lineno, $tag = null)
{
parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
index 9cd1551f..d9b59378 100644
--- a/vendor/twig/twig/lib/Twig/Node/BlockReference.php
+++ b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Body.php b/vendor/twig/twig/lib/Twig/Node/Body.php
index 3ffb1342..2314c9ab 100644
--- a/vendor/twig/twig/lib/Twig/Node/Body.php
+++ b/vendor/twig/twig/lib/Twig/Node/Body.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php b/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
index 52db7d2b..4ee6d57c 100644
--- a/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
+++ b/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,9 +14,9 @@
*/
class Twig_Node_CheckSecurity extends Twig_Node
{
- protected $usedFilters;
- protected $usedTags;
- protected $usedFunctions;
+ private $usedFilters;
+ private $usedTags;
+ private $usedFunctions;
public function __construct(array $usedFilters, array $usedTags, array $usedFunctions)
{
@@ -56,7 +56,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
->outdent()
->write("} catch (Twig_Sandbox_SecurityError \$e) {\n")
->indent()
- ->write("\$e->setTemplateName(\$this->getTemplateName());\n\n")
+ ->write("\$e->setSourceContext(\$this->getSourceContext());\n\n")
->write("if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {\n")
->indent()
->write("\$e->setTemplateLine(\$tags[\$e->getTagName()]);\n")
diff --git a/vendor/twig/twig/lib/Twig/Node/Do.php b/vendor/twig/twig/lib/Twig/Node/Do.php
index 14fb84e9..94305c7a 100644
--- a/vendor/twig/twig/lib/Twig/Node/Do.php
+++ b/vendor/twig/twig/lib/Twig/Node/Do.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Embed.php b/vendor/twig/twig/lib/Twig/Node/Embed.php
index d9af37b2..948e7b8b 100644
--- a/vendor/twig/twig/lib/Twig/Node/Embed.php
+++ b/vendor/twig/twig/lib/Twig/Node/Embed.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -22,8 +22,6 @@ class Twig_Node_Embed extends Twig_Node_Include
parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
$this->setAttribute('name', $name);
- // to be removed in 2.0, used name instead
- $this->setAttribute('filename', $name);
$this->setAttribute('index', $index);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression.php b/vendor/twig/twig/lib/Twig/Node/Expression.php
index a7382e7d..e609d812 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Array.php b/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
index aba1825c..43bdc4a5 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
@@ -3,14 +3,14 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Array extends Twig_Node_Expression
{
- protected $index;
+ private $index;
public function __construct(array $elements, $lineno)
{
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php b/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
index ce0c5fbc..ceb72823 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
index c821db52..019c2df0 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
@@ -3,15 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
{
- public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
+ public function __construct(Twig_Node $left, Twig_Node $right, $lineno)
{
parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
index 0ef8e117..51bba480 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
index d5752ebb..9b3997da 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
index 9a46d845..fa9729db 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
index 058a20bf..e3be5485 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
index f4da73d4..9255d8f7 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
index f9a64627..7de9070e 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
index e0797a61..386b4eab 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
index 93b3b96f..c24b720a 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
index 7b1236d0..4535cd08 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
index 6bbba62e..b386ae35 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
index a110bd92..52dcb332 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
index 3754fed2..1d66d6c4 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
index 9565a608..ba44961a 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
index 45fd3004..c9d20c42 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
index e38e257c..219b3bdb 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
index 93bb2920..b22debf2 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
index 9924114f..c99874ca 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
index c91529ca..0d24cee4 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
index 26867ba2..69eae7e8 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
index 49ab39e9..f276da7d 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
index adba49c6..7621763d 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
index 76f3a8c8..a637b4a4 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
@@ -3,28 +3,13 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
{
- public function compile(Twig_Compiler $compiler)
- {
- if (PHP_VERSION_ID >= 50600) {
- return parent::compile($compiler);
- }
-
- $compiler
- ->raw('pow(')
- ->subcompile($this->getNode('left'))
- ->raw(', ')
- ->subcompile($this->getNode('right'))
- ->raw(')')
- ;
- }
-
public function operator(Twig_Compiler $compiler)
{
return $compiler->raw('**');
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
index 692ec9c6..4261cdea 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
index d2e30d66..d1e9a5a7 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
index d4463991..b423d3ee 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
index adc63fcf..7c65e825 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,17 +17,8 @@
*/
class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
{
- /**
- * @param Twig_Node|null $template
- */
- public function __construct(Twig_NodeInterface $name, $template = null, $lineno, $tag = null)
+ public function __construct(Twig_Node $name, Twig_Node $template = null, $lineno, $tag = null)
{
- if (is_bool($template)) {
- @trigger_error(sprintf('The %s method "$asString" argument is deprecated since version 1.28 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
-
- $template = null;
- }
-
$nodes = array('name' => $name);
if (null !== $template) {
$nodes['template'] = $template;
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
index a5c88c75..ac2101ea 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,28 +14,25 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
protected function compileCallable(Twig_Compiler $compiler)
{
+ $callable = $this->getAttribute('callable');
+
$closingParenthesis = false;
- if ($this->hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
- if (is_string($callable) && false === strpos($callable, '::')) {
- $compiler->raw($callable);
- } else {
- list($r, $callable) = $this->reflectCallable($callable);
- if ($r instanceof ReflectionMethod && is_string($callable[0])) {
- if ($r->isStatic()) {
- $compiler->raw(sprintf('%s::%s', $callable[0], $callable[1]));
- } else {
- $compiler->raw(sprintf('$this->env->getRuntime(\'%s\')->%s', $callable[0], $callable[1]));
- }
- } elseif ($r instanceof ReflectionMethod && $callable[0] instanceof Twig_ExtensionInterface) {
- $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', get_class($callable[0]), $callable[1]));
+ if (is_string($callable) && false === strpos($callable, '::')) {
+ $compiler->raw($callable);
+ } else {
+ list($r, $callable) = $this->reflectCallable($callable);
+ if ($r instanceof ReflectionMethod && is_string($callable[0])) {
+ if ($r->isStatic()) {
+ $compiler->raw(sprintf('%s::%s', $callable[0], $callable[1]));
} else {
- $type = ucfirst($this->getAttribute('type'));
- $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
- $closingParenthesis = true;
+ $compiler->raw(sprintf('$this->env->getRuntime(\'%s\')->%s', $callable[0], $callable[1]));
}
+ } elseif ($r instanceof ReflectionMethod && $callable[0] instanceof Twig_ExtensionInterface) {
+ $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', get_class($callable[0]), $callable[1]));
+ } else {
+ $closingParenthesis = true;
+ $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', ucfirst($this->getAttribute('type')), $this->getAttribute('name')));
}
- } else {
- $compiler->raw($this->getAttribute('thing')->compile());
}
$this->compileArguments($compiler);
@@ -83,10 +80,8 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
}
if ($this->hasNode('arguments')) {
- $callable = $this->hasAttribute('callable') ? $this->getAttribute('callable') : null;
-
+ $callable = $this->getAttribute('callable');
$arguments = $this->getArguments($callable, $this->getNode('arguments'));
-
foreach ($arguments as $node) {
if (!$first) {
$compiler->raw(', ');
@@ -99,7 +94,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
$compiler->raw(')');
}
- protected function getArguments($callable, $arguments)
+ protected function getArguments($callable = null, $arguments)
{
$callType = $this->getAttribute('type');
$callName = $this->getAttribute('name');
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php b/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
index edcb1e2d..67cca1fd 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
index a91dc698..1a2c5964 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
deleted file mode 100644
index b4882e36..00000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Node_Expression_ExtensionReference class is deprecated since version 1.23 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-/**
- * Represents an extension call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.23 and will be removed in 2.0.
- */
-class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
-{
- public function __construct($name, $lineno, $tag = null)
- {
- parent::__construct(array(), array('name' => $name), $lineno, $tag);
- }
-
- public function compile(Twig_Compiler $compiler)
- {
- $compiler->raw(sprintf("\$this->env->getExtension('%s')", $this->getAttribute('name')));
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
index a906232e..3e245121 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
@@ -3,15 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
{
- public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
+ public function __construct(Twig_Node $node, Twig_Node_Expression_Constant $filterName, Twig_Node $arguments, $lineno, $tag = null)
{
parent::__construct(array('node' => $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
}
@@ -23,16 +23,11 @@ class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
$this->setAttribute('name', $name);
$this->setAttribute('type', 'filter');
- $this->setAttribute('thing', $filter);
$this->setAttribute('needs_environment', $filter->needsEnvironment());
$this->setAttribute('needs_context', $filter->needsContext());
$this->setAttribute('arguments', $filter->getArguments());
- if ($filter instanceof Twig_FilterCallableInterface || $filter instanceof Twig_SimpleFilter) {
- $this->setAttribute('callable', $filter->getCallable());
- }
- if ($filter instanceof Twig_SimpleFilter) {
- $this->setAttribute('is_variadic', $filter->isVariadic());
- }
+ $this->setAttribute('callable', $filter->getCallable());
+ $this->setAttribute('is_variadic', $filter->isVariadic());
$this->compileCallable($compiler);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
index 5ce172bc..47b8b570 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -20,7 +20,7 @@
*/
class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
{
- public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
+ public function __construct(Twig_Node $node, Twig_Node_Expression_Constant $filterName, Twig_Node $arguments, $lineno, $tag = null)
{
$default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getTemplateLine()), $arguments, $node->getTemplateLine());
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
index 207f6552..7c4c8f68 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
@@ -3,14 +3,14 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
{
- public function __construct($name, Twig_NodeInterface $arguments, $lineno)
+ public function __construct($name, Twig_Node $arguments, $lineno)
{
parent::__construct(array('arguments' => $arguments), array('name' => $name, 'is_defined_test' => false), $lineno);
}
@@ -22,21 +22,15 @@ class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
$this->setAttribute('name', $name);
$this->setAttribute('type', 'function');
- $this->setAttribute('thing', $function);
$this->setAttribute('needs_environment', $function->needsEnvironment());
$this->setAttribute('needs_context', $function->needsContext());
$this->setAttribute('arguments', $function->getArguments());
- if ($function instanceof Twig_FunctionCallableInterface || $function instanceof Twig_SimpleFunction) {
- $callable = $function->getCallable();
- if ('constant' === $name && $this->getAttribute('is_defined_test')) {
- $callable = 'twig_constant_is_defined';
- }
-
- $this->setAttribute('callable', $callable);
- }
- if ($function instanceof Twig_SimpleFunction) {
- $this->setAttribute('is_variadic', $function->isVariadic());
+ $callable = $function->getCallable();
+ if ('constant' === $name && $this->getAttribute('is_defined_test')) {
+ $callable = 'twig_constant_is_defined';
}
+ $this->setAttribute('callable', $callable);
+ $this->setAttribute('is_variadic', $function->isVariadic());
$this->compileCallable($compiler);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
index 9a8d3816..478d4497 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,16 +18,12 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
$nodes['arguments'] = $arguments;
}
- parent::__construct($nodes, array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
+ parent::__construct($nodes, array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false), $lineno);
}
public function compile(Twig_Compiler $compiler)
{
- if (function_exists('twig_template_get_attributes') && !$this->getAttribute('disable_c_ext')) {
- $compiler->raw('twig_template_get_attributes($this, ');
- } else {
- $compiler->raw('$this->getAttribute(');
- }
+ $compiler->raw('twig_get_attribute($this->env, $this->getSourceContext(), ');
if ($this->getAttribute('ignore_strict_check')) {
$this->getNode('node')->setAttribute('ignore_strict_check', true);
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
index 620b02bf..39481337 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Name.php b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
index d18aaca3..e0b1739f 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
@@ -3,16 +3,16 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Name extends Twig_Node_Expression
{
- protected $specialVars = array(
- '_self' => '$this',
+ private $specialVars = array(
+ '_self' => '$this->getTemplateName()',
'_context' => '$context',
'_charset' => '$this->env->getCharset()',
);
@@ -43,45 +43,25 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
->raw(']')
;
} else {
- if (PHP_VERSION_ID >= 70000) {
- // use PHP 7 null coalescing operator
+ if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
$compiler
->raw('($context[')
->string($name)
- ->raw('] ?? ')
+ ->raw('] ?? null)')
;
-
- if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
- $compiler->raw('null)');
- } else {
- $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
- }
- } elseif (PHP_VERSION_ID >= 50400) {
- // PHP 5.4 ternary operator performance was optimized
+ } else {
$compiler
->raw('(isset($context[')
->string($name)
- ->raw(']) ? $context[')
+ ->raw(']) || array_key_exists(')
->string($name)
- ->raw('] : ')
- ;
-
- if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
- $compiler->raw('null)');
- } else {
- $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
- }
- } else {
- $compiler
- ->raw('$this->getContext($context, ')
+ ->raw(', $context) ? $context[')
->string($name)
- ;
-
- if ($this->getAttribute('ignore_strict_check')) {
- $compiler->raw(', true');
- }
-
- $compiler
+ ->raw('] : (function () { throw new Twig_Error_Runtime(\'Variable ')
+ ->string($name)
+ ->raw(' does not exist.\', ')
+ ->repr($this->lineno)
+ ->raw(', $this->getSourceContext()); })()')
->raw(')')
;
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php b/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
index 14f6358f..b20e649a 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
@@ -10,7 +10,7 @@
*/
class Twig_Node_Expression_NullCoalesce extends Twig_Node_Expression_Conditional
{
- public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
+ public function __construct(Twig_Node $left, Twig_Node $right, $lineno)
{
$test = new Twig_Node_Expression_Binary_And(
new Twig_Node_Expression_Test_Defined(clone $left, 'defined', new Twig_Node(), $left->getTemplateLine()),
@@ -30,7 +30,7 @@ class Twig_Node_Expression_NullCoalesce extends Twig_Node_Expression_Conditional
* cases might be implemented as an optimizer node visitor, but has not been done
* as benefits are probably not worth the added complexity.
*/
- if (PHP_VERSION_ID >= 70000 && $this->getNode('expr2') instanceof Twig_Node_Expression_Name) {
+ if ($this->getNode('expr2') instanceof Twig_Node_Expression_Name) {
$this->getNode('expr2')->setAttribute('always_defined', true);
$compiler
->raw('((')
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
index 694c0804..e7d82d81 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
index e6b058e8..09a04a31 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
index 125d381d..505f3ad2 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
@@ -3,14 +3,14 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
{
- public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
+ public function __construct(Twig_Node $node, $name, Twig_Node $arguments = null, $lineno)
{
$nodes = array('node' => $node);
if (null !== $arguments) {
@@ -27,13 +27,8 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
$this->setAttribute('name', $name);
$this->setAttribute('type', 'test');
- $this->setAttribute('thing', $test);
- if ($test instanceof Twig_TestCallableInterface || $test instanceof Twig_SimpleTest) {
- $this->setAttribute('callable', $test->getCallable());
- }
- if ($test instanceof Twig_SimpleTest) {
- $this->setAttribute('is_variadic', $test->isVariadic());
- }
+ $this->setAttribute('callable', $test->getCallable());
+ $this->setAttribute('is_variadic', $test->isVariadic());
$this->compileCallable($compiler);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
index de55f5f5..ffde3488 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
index 9d2d7ca7..5bdae11d 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -23,7 +23,7 @@
*/
class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
{
- public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
+ public function __construct(Twig_Node $node, $name, Twig_Node $arguments = null, $lineno)
{
if ($node instanceof Twig_Node_Expression_Name) {
$node->setAttribute('is_defined_test', true);
@@ -43,7 +43,7 @@ class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
parent::__construct($node, $name, $arguments, $lineno);
}
- protected function changeIgnoreStrictCheck(Twig_Node_Expression_GetAttr $node)
+ private function changeIgnoreStrictCheck(Twig_Node_Expression_GetAttr $node)
{
$node->setAttribute('ignore_strict_check', true);
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
index d5bed234..0d6bdb49 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
index d7853e89..fe42e627 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
index 1c83825a..934d8356 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
index 421c19e8..4f16029a 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
index b48905ee..abc2f5be 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
index 1cf54c32..66a47a59 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
@@ -3,15 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
{
- public function __construct(Twig_NodeInterface $node, $lineno)
+ public function __construct(Twig_Node $node, $lineno)
{
parent::__construct(array('node' => $node), array(), $lineno);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
index 2a3937ec..ca3ef8f3 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
index f94073cf..a5e4f198 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
index 04edb52a..5497532b 100644
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Flush.php b/vendor/twig/twig/lib/Twig/Node/Flush.php
index 2af17a42..cd4be411 100644
--- a/vendor/twig/twig/lib/Twig/Node/Flush.php
+++ b/vendor/twig/twig/lib/Twig/Node/Flush.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/For.php b/vendor/twig/twig/lib/Twig/Node/For.php
index 5498a88d..59eabbad 100644
--- a/vendor/twig/twig/lib/Twig/Node/For.php
+++ b/vendor/twig/twig/lib/Twig/Node/For.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,9 +17,9 @@
*/
class Twig_Node_For extends Twig_Node
{
- protected $loop;
+ private $loop;
- public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
+ public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_Node $body, Twig_Node $else = null, $lineno, $tag = null)
{
$body = new Twig_Node(array($body, $this->loop = new Twig_Node_ForLoop($lineno, $tag)));
diff --git a/vendor/twig/twig/lib/Twig/Node/ForLoop.php b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
index 2554d480..ab0215e6 100644
--- a/vendor/twig/twig/lib/Twig/Node/ForLoop.php
+++ b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/If.php b/vendor/twig/twig/lib/Twig/Node/If.php
index 0aa9e707..86a84b14 100644
--- a/vendor/twig/twig/lib/Twig/Node/If.php
+++ b/vendor/twig/twig/lib/Twig/Node/If.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,7 +17,7 @@
*/
class Twig_Node_If extends Twig_Node
{
- public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
+ public function __construct(Twig_Node $tests, Twig_Node $else = null, $lineno, $tag = null)
{
$nodes = array('tests' => $tests);
if (null !== $else) {
diff --git a/vendor/twig/twig/lib/Twig/Node/Import.php b/vendor/twig/twig/lib/Twig/Node/Import.php
index 507fb662..759bb5c3 100644
--- a/vendor/twig/twig/lib/Twig/Node/Import.php
+++ b/vendor/twig/twig/lib/Twig/Node/Import.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Include.php b/vendor/twig/twig/lib/Twig/Node/Include.php
index 714c9915..15a27ca6 100644
--- a/vendor/twig/twig/lib/Twig/Node/Include.php
+++ b/vendor/twig/twig/lib/Twig/Node/Include.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Macro.php b/vendor/twig/twig/lib/Twig/Node/Macro.php
index 2d5226a8..95af3f39 100644
--- a/vendor/twig/twig/lib/Twig/Node/Macro.php
+++ b/vendor/twig/twig/lib/Twig/Node/Macro.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,7 +18,7 @@ class Twig_Node_Macro extends Twig_Node
{
const VARARGS_NAME = 'varargs';
- public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface $arguments, $lineno, $tag = null)
+ public function __construct($name, Twig_Node $body, Twig_Node $arguments, $lineno, $tag = null)
{
foreach ($arguments as $argumentName => $argument) {
if (self::VARARGS_NAME === $argumentName) {
@@ -33,7 +33,7 @@ class Twig_Node_Macro extends Twig_Node
{
$compiler
->addDebugInfo($this)
- ->write(sprintf('public function get%s(', $this->getAttribute('name')))
+ ->write(sprintf('public function macro_%s(', $this->getAttribute('name')))
;
$count = count($this->getNode('arguments'));
@@ -49,15 +49,12 @@ class Twig_Node_Macro extends Twig_Node
}
}
- if (PHP_VERSION_ID >= 50600) {
- if ($count) {
- $compiler->raw(', ');
- }
-
- $compiler->raw('...$__varargs__');
+ if ($count) {
+ $compiler->raw(', ');
}
$compiler
+ ->raw('...$__varargs__')
->raw(")\n")
->write("{\n")
->indent()
@@ -83,19 +80,8 @@ class Twig_Node_Macro extends Twig_Node
->raw(' => ')
;
- if (PHP_VERSION_ID >= 50600) {
- $compiler->raw("\$__varargs__,\n");
- } else {
- $compiler
- ->raw('func_num_args() > ')
- ->repr($count)
- ->raw(' ? array_slice(func_get_args(), ')
- ->repr($count)
- ->raw(") : array(),\n")
- ;
- }
-
$compiler
+ ->raw("\$__varargs__,\n")
->outdent()
->write("));\n\n")
->write("\$blocks = array();\n\n")
@@ -103,19 +89,14 @@ class Twig_Node_Macro extends Twig_Node
->write("try {\n")
->indent()
->subcompile($this->getNode('body'))
+ ->raw("\n")
+ ->write("return ('' === \$tmp = ob_get_contents()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
->outdent()
- ->write("} catch (Exception \$e) {\n")
+ ->write("} finally {\n")
->indent()
- ->write("ob_end_clean();\n\n")
- ->write("throw \$e;\n")
+ ->write("ob_end_clean();\n")
->outdent()
- ->write("} catch (Throwable \$e) {\n")
- ->indent()
- ->write("ob_end_clean();\n\n")
- ->write("throw \$e;\n")
- ->outdent()
- ->write("}\n\n")
- ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
+ ->write("}\n")
->outdent()
->write("}\n\n")
;
diff --git a/vendor/twig/twig/lib/Twig/Node/Module.php b/vendor/twig/twig/lib/Twig/Node/Module.php
index fe7da34d..8b208ff2 100644
--- a/vendor/twig/twig/lib/Twig/Node/Module.php
+++ b/vendor/twig/twig/lib/Twig/Node/Module.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -23,14 +23,9 @@ class Twig_Node_Module extends Twig_Node
{
private $source;
- public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $name, $source = '')
+ public function __construct(Twig_Node $body, Twig_Node_Expression $parent = null, Twig_Node $blocks, Twig_Node $macros, Twig_Node $traits, $embeddedTemplates, Twig_Source $source)
{
- if (!$name instanceof Twig_Source) {
- @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
- $this->source = new Twig_Source($source, $name);
- } else {
- $this->source = $name;
- }
+ $this->source = $source;
$nodes = array(
'body' => $body,
@@ -49,10 +44,6 @@ class Twig_Node_Module extends Twig_Node
// embedded templates are set as attributes so that they are only visited once by the visitors
parent::__construct($nodes, array(
- // source to be remove in 2.0
- 'source' => $this->source->getCode(),
- // filename to be remove in 2.0 (use getTemplateName() instead)
- 'filename' => $this->source->getName(),
'index' => null,
'embedded_templates' => $embeddedTemplates,
), 1);
@@ -108,8 +99,6 @@ class Twig_Node_Module extends Twig_Node
$this->compileDebugInfo($compiler);
- $this->compileGetSource($compiler);
-
$this->compileGetSourceContext($compiler);
$this->compileClassFooter($compiler);
@@ -192,7 +181,17 @@ class Twig_Node_Module extends Twig_Node
if ($countTraits) {
// traits
foreach ($this->getNode('traits') as $i => $trait) {
- $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i));
+ $node = $trait->getNode('template');
+
+ $compiler
+ ->write(sprintf('$_trait_%s = $this->loadTemplate(', $i))
+ ->subcompile($node)
+ ->raw(', ')
+ ->repr($node->getTemplateName())
+ ->raw(', ')
+ ->repr($node->getTemplateLine())
+ ->raw(");\n")
+ ;
$compiler
->addDebugInfo($trait->getNode('template'))
@@ -409,20 +408,6 @@ class Twig_Node_Module extends Twig_Node
;
}
- protected function compileGetSource(Twig_Compiler $compiler)
- {
- $compiler
- ->write("/** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */\n")
- ->write("public function getSource()\n", "{\n")
- ->indent()
- ->write("@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);\n\n")
- ->write('return $this->getSourceContext()->getCode();')
- ->raw("\n")
- ->outdent()
- ->write("}\n\n")
- ;
- }
-
protected function compileGetSourceContext(Twig_Compiler $compiler)
{
$compiler
diff --git a/vendor/twig/twig/lib/Twig/Node/Print.php b/vendor/twig/twig/lib/Twig/Node/Print.php
index 7b69ee81..9e317c84 100644
--- a/vendor/twig/twig/lib/Twig/Node/Print.php
+++ b/vendor/twig/twig/lib/Twig/Node/Print.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/Sandbox.php b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
index 4c8f8fa6..a4a6d8e2 100644
--- a/vendor/twig/twig/lib/Twig/Node/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,7 +16,7 @@
*/
class Twig_Node_Sandbox extends Twig_Node
{
- public function __construct(Twig_NodeInterface $body, $lineno, $tag = null)
+ public function __construct(Twig_Node $body, $lineno, $tag = null)
{
parent::__construct(array('body' => $body), array(), $lineno, $tag);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
index 78cc45a7..132f1a4d 100644
--- a/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
+++ b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -38,7 +38,7 @@ class Twig_Node_SandboxedPrint extends Twig_Node_Print
*
* @return Twig_Node
*/
- protected function removeNodeFilter(Twig_Node $node)
+ private function removeNodeFilter(Twig_Node $node)
{
if ($node instanceof Twig_Node_Expression_Filter) {
return $this->removeNodeFilter($node->getNode('node'));
diff --git a/vendor/twig/twig/lib/Twig/Node/Set.php b/vendor/twig/twig/lib/Twig/Node/Set.php
index b77b8b6e..f1e0e510 100644
--- a/vendor/twig/twig/lib/Twig/Node/Set.php
+++ b/vendor/twig/twig/lib/Twig/Node/Set.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,9 +14,9 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Node_Set extends Twig_Node
+class Twig_Node_Set extends Twig_Node implements Twig_NodeCaptureInterface
{
- public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
+ public function __construct($capture, Twig_Node $names, Twig_Node $values, $lineno, $tag = null)
{
parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag);
diff --git a/vendor/twig/twig/lib/Twig/Node/SetTemp.php b/vendor/twig/twig/lib/Twig/Node/SetTemp.php
deleted file mode 100644
index 3bdd1cb7..00000000
--- a/vendor/twig/twig/lib/Twig/Node/SetTemp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Node_SetTemp extends Twig_Node
-{
- public function __construct($name, $lineno)
- {
- parent::__construct(array(), array('name' => $name), $lineno);
- }
-
- public function compile(Twig_Compiler $compiler)
- {
- $name = $this->getAttribute('name');
- $compiler
- ->addDebugInfo($this)
- ->write('if (isset($context[')
- ->string($name)
- ->raw('])) { $_')
- ->raw($name)
- ->raw('_ = $context[')
- ->repr($name)
- ->raw(']; } else { $_')
- ->raw($name)
- ->raw("_ = null; }\n")
- ;
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Spaceless.php b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
index 486e461a..4932b6cc 100644
--- a/vendor/twig/twig/lib/Twig/Node/Spaceless.php
+++ b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,7 +18,7 @@
*/
class Twig_Node_Spaceless extends Twig_Node
{
- public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless')
+ public function __construct(Twig_Node $body, $lineno, $tag = 'spaceless')
{
parent::__construct(array('body' => $body), array(), $lineno, $tag);
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Text.php b/vendor/twig/twig/lib/Twig/Node/Text.php
index 39879bb2..2c013cd7 100644
--- a/vendor/twig/twig/lib/Twig/Node/Text.php
+++ b/vendor/twig/twig/lib/Twig/Node/Text.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Node/With.php b/vendor/twig/twig/lib/Twig/Node/With.php
index 17953e8a..4978f375 100644
--- a/vendor/twig/twig/lib/Twig/Node/With.php
+++ b/vendor/twig/twig/lib/Twig/Node/With.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2016 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/NodeInterface.php b/vendor/twig/twig/lib/Twig/NodeInterface.php
deleted file mode 100644
index 80d99938..00000000
--- a/vendor/twig/twig/lib/Twig/NodeInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_NodeInterface extends Countable, IteratorAggregate
-{
- /**
- * Compiles the node to PHP.
- */
- public function compile(Twig_Compiler $compiler);
-
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getLine();
-
- public function getNodeTag();
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeOutputInterface.php b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
index 22172c09..e6bbd964 100644
--- a/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
+++ b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/NodeTraverser.php b/vendor/twig/twig/lib/Twig/NodeTraverser.php
index 85c663b9..1eedc2ff 100644
--- a/vendor/twig/twig/lib/Twig/NodeTraverser.php
+++ b/vendor/twig/twig/lib/Twig/NodeTraverser.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,10 +16,10 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_NodeTraverser
+final class Twig_NodeTraverser
{
- protected $env;
- protected $visitors = array();
+ private $env;
+ private $visitors = array();
/**
* @param Twig_Environment $env
@@ -45,9 +45,9 @@ class Twig_NodeTraverser
/**
* Traverses a node and calls the registered visitors.
*
- * @return Twig_NodeInterface
+ * @return Twig_Node
*/
- public function traverse(Twig_NodeInterface $node)
+ public function traverse(Twig_Node $node)
{
ksort($this->visitors);
foreach ($this->visitors as $visitors) {
@@ -59,12 +59,8 @@ class Twig_NodeTraverser
return $node;
}
- protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
+ private function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_Node $node)
{
- if (null === $node) {
- return;
- }
-
$node = $visitor->enterNode($node, $this->env);
foreach ($node as $k => $n) {
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
index 28a97922..81175b01 100644
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,23 +14,20 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
+final class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
{
- protected $statusStack = array();
- protected $blocks = array();
- protected $safeAnalysis;
- protected $traverser;
- protected $defaultStrategy = false;
- protected $safeVars = array();
+ private $statusStack = array();
+ private $blocks = array();
+ private $safeAnalysis;
+ private $traverser;
+ private $defaultStrategy = false;
+ private $safeVars = array();
public function __construct()
{
$this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
}
- /**
- * {@inheritdoc}
- */
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
@@ -50,9 +47,6 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return $node;
}
- /**
- * {@inheritdoc}
- */
protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
@@ -74,7 +68,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return $node;
}
- protected function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type)
+ private function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type)
{
if (false === $type) {
return $node;
@@ -94,7 +88,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
);
}
- protected function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env)
+ private function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env)
{
$name = $filter->getNode('filter')->getAttribute('value');
@@ -113,7 +107,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return $filter;
}
- protected function isSafeFor($type, Twig_NodeInterface $expression, $env)
+ private function isSafeFor($type, Twig_Node $expression, $env)
{
$safe = $this->safeAnalysis->getSafe($expression);
@@ -131,7 +125,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return in_array($type, $safe) || in_array('all', $safe);
}
- protected function needEscaping(Twig_Environment $env)
+ private function needEscaping(Twig_Environment $env)
{
if (count($this->statusStack)) {
return $this->statusStack[count($this->statusStack) - 1];
@@ -140,7 +134,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return $this->defaultStrategy ? $this->defaultStrategy : false;
}
- protected function getEscaperFilter($type, Twig_NodeInterface $node)
+ private function getEscaperFilter($type, Twig_Node $node)
{
$line = $node->getTemplateLine();
$name = new Twig_Node_Expression_Constant('escape', $line);
@@ -149,9 +143,6 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
return new Twig_Node_Expression_Filter($node, $name, $args, $line);
}
- /**
- * {@inheritdoc}
- */
public function getPriority()
{
return 0;
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
index c0411cb6..384bd522 100644
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -19,19 +19,18 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
+final class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
{
const OPTIMIZE_ALL = -1;
const OPTIMIZE_NONE = 0;
const OPTIMIZE_FOR = 2;
const OPTIMIZE_RAW_FILTER = 4;
+ // obsolete, does not do anything
const OPTIMIZE_VAR_ACCESS = 8;
- protected $loops = array();
- protected $loopsTargets = array();
- protected $optimizers;
- protected $prependedNodes = array();
- protected $inABody = false;
+ private $loops = array();
+ private $loopsTargets = array();
+ private $optimizers;
/**
* @param int $optimizers The optimizer mode
@@ -45,39 +44,17 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
$this->optimizers = $optimizers;
}
- /**
- * {@inheritdoc}
- */
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
$this->enterOptimizeFor($node, $env);
}
- if (PHP_VERSION_ID < 50400 && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
- if ($this->inABody) {
- if (!$node instanceof Twig_Node_Expression) {
- if (get_class($node) !== 'Twig_Node') {
- array_unshift($this->prependedNodes, array());
- }
- } else {
- $node = $this->optimizeVariables($node, $env);
- }
- } elseif ($node instanceof Twig_Node_Body) {
- $this->inABody = true;
- }
- }
-
return $node;
}
- /**
- * {@inheritdoc}
- */
protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
- $expression = $node instanceof Twig_Node_Expression;
-
if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
$this->leaveOptimizeFor($node, $env);
}
@@ -88,33 +65,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
$node = $this->optimizePrintNode($node, $env);
- if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
- if ($node instanceof Twig_Node_Body) {
- $this->inABody = false;
- } elseif ($this->inABody) {
- if (!$expression && get_class($node) !== 'Twig_Node' && $prependedNodes = array_shift($this->prependedNodes)) {
- $nodes = array();
- foreach (array_unique($prependedNodes) as $name) {
- $nodes[] = new Twig_Node_SetTemp($name, $node->getTemplateLine());
- }
-
- $nodes[] = $node;
- $node = new Twig_Node($nodes);
- }
- }
- }
-
- return $node;
- }
-
- protected function optimizeVariables(Twig_NodeInterface $node, Twig_Environment $env)
- {
- if ('Twig_Node_Expression_Name' === get_class($node) && $node->isSimple()) {
- $this->prependedNodes[0][] = $node->getAttribute('name');
-
- return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getTemplateLine());
- }
-
return $node;
}
@@ -125,9 +75,9 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
*
* * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()"
*
- * @return Twig_NodeInterface
+ * @return Twig_Node
*/
- protected function optimizePrintNode(Twig_NodeInterface $node, Twig_Environment $env)
+ private function optimizePrintNode(Twig_Node $node, Twig_Environment $env)
{
if (!$node instanceof Twig_Node_Print) {
return $node;
@@ -149,9 +99,9 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
/**
* Removes "raw" filters.
*
- * @return Twig_NodeInterface
+ * @return Twig_Node
*/
- protected function optimizeRawFilter(Twig_NodeInterface $node, Twig_Environment $env)
+ private function optimizeRawFilter(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Expression_Filter && 'raw' == $node->getNode('filter')->getAttribute('value')) {
return $node->getNode('node');
@@ -163,7 +113,7 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
/**
* Optimizes "for" tag by removing the "loop" variable creation whenever possible.
*/
- protected function enterOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
+ private function enterOptimizeFor(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_For) {
// disable the loop variable by default
@@ -227,7 +177,7 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
/**
* Optimizes "for" tag by removing the "loop" variable creation whenever possible.
*/
- protected function leaveOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
+ private function leaveOptimizeFor(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_For) {
array_shift($this->loops);
@@ -236,21 +186,18 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
}
}
- protected function addLoopToCurrent()
+ private function addLoopToCurrent()
{
$this->loops[0]->setAttribute('with_loop', true);
}
- protected function addLoopToAll()
+ private function addLoopToAll()
{
foreach ($this->loops as $loop) {
$loop->setAttribute('with_loop', true);
}
}
- /**
- * {@inheritdoc}
- */
public function getPriority()
{
return 255;
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
index 439f5bf4..63a635bb 100644
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -9,17 +9,17 @@
* file that was distributed with this source code.
*/
-class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
+final class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
{
- protected $data = array();
- protected $safeVars = array();
+ private $data = array();
+ private $safeVars = array();
public function setSafeVars($safeVars)
{
$this->safeVars = $safeVars;
}
- public function getSafe(Twig_NodeInterface $node)
+ public function getSafe(Twig_Node $node)
{
$hash = spl_object_hash($node);
if (!isset($this->data[$hash])) {
@@ -39,7 +39,7 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
}
}
- protected function setSafe(Twig_NodeInterface $node, array $safe)
+ private function setSafe(Twig_Node $node, array $safe)
{
$hash = spl_object_hash($node);
if (isset($this->data[$hash])) {
@@ -57,17 +57,11 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
);
}
- /**
- * {@inheritdoc}
- */
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
return $node;
}
- /**
- * {@inheritdoc}
- */
protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Expression_Constant) {
@@ -114,8 +108,7 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
}
} elseif ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name) {
$name = $node->getNode('node')->getAttribute('name');
- // attributes on template instances are safe
- if ('_self' == $name || in_array($name, $this->safeVars)) {
+ if (in_array($name, $this->safeVars)) {
$this->setSafe($node, array('all'));
} else {
$this->setSafe($node, array());
@@ -127,7 +120,7 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
return $node;
}
- protected function intersectSafe(array $a = null, array $b = null)
+ private function intersectSafe(array $a = null, array $b = null)
{
if (null === $a || null === $b) {
return array();
@@ -144,9 +137,6 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
return array_intersect($a, $b);
}
- /**
- * {@inheritdoc}
- */
public function getPriority()
{
return 0;
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
index a5e23c29..fb4321d2 100644
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,16 +14,13 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
+final class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
{
- protected $inAModule = false;
- protected $tags;
- protected $filters;
- protected $functions;
+ private $inAModule = false;
+ private $tags;
+ private $filters;
+ private $functions;
- /**
- * {@inheritdoc}
- */
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
@@ -58,9 +55,6 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
return $node;
}
- /**
- * {@inheritdoc}
- */
protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
@@ -72,9 +66,6 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
return $node;
}
- /**
- * {@inheritdoc}
- */
public function getPriority()
{
return 0;
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
index a12de77f..26ad8e6b 100644
--- a/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -19,16 +19,16 @@ interface Twig_NodeVisitorInterface
/**
* Called before child nodes are visited.
*
- * @return Twig_NodeInterface The modified node
+ * @return Twig_Node The modified node
*/
- public function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
+ public function enterNode(Twig_Node $node, Twig_Environment $env);
/**
* Called after child nodes are visited.
*
- * @return Twig_NodeInterface|false The modified node or false if the node must be removed
+ * @return Twig_Node|false The modified node or false if the node must be removed
*/
- public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
+ public function leaveNode(Twig_Node $node, Twig_Environment $env);
/**
* Returns the priority for this visitor.
diff --git a/vendor/twig/twig/lib/Twig/Parser.php b/vendor/twig/twig/lib/Twig/Parser.php
index d4e45607..aad55df2 100644
--- a/vendor/twig/twig/lib/Twig/Parser.php
+++ b/vendor/twig/twig/lib/Twig/Parser.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,73 +15,46 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Parser implements Twig_ParserInterface
+class Twig_Parser
{
- protected $stack = array();
- protected $stream;
- protected $parent;
- protected $handlers;
- protected $visitors;
- protected $expressionParser;
- protected $blocks;
- protected $blockStack;
- protected $macros;
- protected $env;
- protected $reservedMacroNames;
- protected $importedSymbols;
- protected $traits;
- protected $embeddedTemplates = array();
+ private $stack = array();
+ private $stream;
+ private $parent;
+ private $handlers;
+ private $visitors;
+ private $expressionParser;
+ private $blocks;
+ private $blockStack;
+ private $macros;
+ private $env;
+ private $importedSymbols;
+ private $traits;
+ private $embeddedTemplates = array();
public function __construct(Twig_Environment $env)
{
$this->env = $env;
}
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getEnvironment()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
- return $this->env;
- }
-
public function getVarName()
{
return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
}
- /**
- * @deprecated since 1.27 (to be removed in 2.0). Use $parser->getStream()->getSourceContext()->getPath() instead.
- */
- public function getFilename()
- {
- @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use $parser->getStream()->getSourceContext()->getPath() instead.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->stream->getSourceContext()->getName();
- }
-
- /**
- * {@inheritdoc}
- */
public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false)
{
- // push all variables into the stack to keep the current state of the parser
- // using get_object_vars() instead of foreach would lead to https://bugs.php.net/71336
- // This hack can be removed when min version if PHP 7.0
- $vars = array();
- foreach ($this as $k => $v) {
- $vars[$k] = $v;
- }
-
+ $vars = get_object_vars($this);
unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser'], $vars['reservedMacroNames']);
$this->stack[] = $vars;
// tag handlers
if (null === $this->handlers) {
- $this->handlers = $this->env->getTokenParsers();
- $this->handlers->setParser($this);
+ $this->handlers = array();
+ foreach ($this->env->getTokenParsers() as $handler) {
+ $handler->setParser($this);
+
+ $this->handlers[$handler->getTag()] = $handler;
+ }
}
// node visitors
@@ -109,8 +82,8 @@ class Twig_Parser implements Twig_ParserInterface
$body = new Twig_Node();
}
} catch (Twig_Error_Syntax $e) {
- if (!$e->getTemplateName()) {
- $e->setTemplateName($this->stream->getSourceContext()->getName());
+ if (!$e->getSourceContext()) {
+ $e->setSourceContext($this->stream->getSourceContext());
}
if (!$e->getTemplateLine()) {
@@ -157,10 +130,10 @@ class Twig_Parser implements Twig_ParserInterface
$token = $this->getCurrentToken();
if ($token->getType() !== Twig_Token::NAME_TYPE) {
- throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext());
}
- if (null !== $test && call_user_func($test, $token)) {
+ if (null !== $test && $test($token)) {
if ($dropNeedle) {
$this->stream->next();
}
@@ -172,16 +145,15 @@ class Twig_Parser implements Twig_ParserInterface
return new Twig_Node($rv, array(), $lineno);
}
- $subparser = $this->handlers->getTokenParser($token->getValue());
- if (null === $subparser) {
+ if (!isset($this->handlers[$token->getValue()])) {
if (null !== $test) {
- $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getSourceContext()->getName());
+ $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {
$e->appendMessage(sprintf(' (expecting closing tag for the "%s" tag defined near line %s).', $test[0]->getTag(), $lineno));
}
} else {
- $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getSourceContext()->getName());
+ $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
$e->addSuggestions($token->getValue(), array_keys($this->env->getTags()));
}
@@ -190,6 +162,7 @@ class Twig_Parser implements Twig_ParserInterface
$this->stream->next();
+ $subparser = $this->handlers[$token->getValue()];
$node = $subparser->parse($token);
if (null !== $node) {
$rv[] = $node;
@@ -197,7 +170,7 @@ class Twig_Parser implements Twig_ParserInterface
break;
default:
- throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', $this->getCurrentToken()->getLine(), $this->stream->getSourceContext());
}
}
@@ -208,26 +181,6 @@ class Twig_Parser implements Twig_ParserInterface
return new Twig_Node($rv, array(), $lineno);
}
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function addHandler($name, $class)
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
- $this->handlers[$name] = $class;
- }
-
- /**
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
- $this->visitors[] = $visitor;
- }
-
public function getBlockStack()
{
return $this->blockStack;
@@ -270,28 +223,12 @@ class Twig_Parser implements Twig_ParserInterface
public function setMacro($name, Twig_Node_Macro $node)
{
- if ($this->isReservedMacroName($name)) {
- throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword.', $name), $node->getTemplateLine(), $this->stream->getSourceContext()->getName());
- }
-
$this->macros[$name] = $node;
}
public function isReservedMacroName($name)
{
- if (null === $this->reservedMacroNames) {
- $this->reservedMacroNames = array();
- $r = new ReflectionClass($this->env->getBaseTemplateClass());
- foreach ($r->getMethods() as $method) {
- $methodName = strtolower($method->getName());
-
- if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) {
- $this->reservedMacroNames[] = substr($methodName, 3);
- }
- }
- }
-
- return in_array(strtolower($name), $this->reservedMacroNames);
+ return false;
}
public function addTrait($trait)
@@ -374,7 +311,7 @@ class Twig_Parser implements Twig_ParserInterface
return $this->stream->getCurrent();
}
- protected function filterBodyNodes(Twig_NodeInterface $node)
+ private function filterBodyNodes(Twig_Node $node)
{
// check that the body does not contain non-empty output nodes
if (
@@ -383,14 +320,14 @@ class Twig_Parser implements Twig_ParserInterface
(!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
) {
if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {
- throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext());
}
- throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
}
- // bypass "set" nodes as they "capture" the output
- if ($node instanceof Twig_Node_Set) {
+ // bypass nodes that will "capture" the output
+ if ($node instanceof Twig_NodeCaptureInterface) {
return $node;
}
diff --git a/vendor/twig/twig/lib/Twig/ParserInterface.php b/vendor/twig/twig/lib/Twig/ParserInterface.php
deleted file mode 100644
index 73da61b1..00000000
--- a/vendor/twig/twig/lib/Twig/ParserInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by parser classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_ParserInterface
-{
- /**
- * Converts a token stream to a node tree.
- *
- * @return Twig_Node_Module
- *
- * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
- */
- public function parse(Twig_TokenStream $stream);
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
index b82747a9..3bfad4b2 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -12,7 +12,7 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Profiler_Dumper_Blackfire
+final class Twig_Profiler_Dumper_Blackfire
{
public function dump(Twig_Profiler_Profile $profile)
{
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
index f066da75..05348b3e 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -12,7 +12,7 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
+final class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
{
private static $colors = array(
'block' => '#dfd',
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
index 998e210d..c77e6918 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -11,6 +11,8 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
*/
class Twig_Profiler_Dumper_Text
{
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
index 2f972148..e10d857e 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -21,9 +21,6 @@ class Twig_Profiler_Node_EnterProfile extends Twig_Node
parent::__construct(array(), array('extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName));
}
- /**
- * {@inheritdoc}
- */
public function compile(Twig_Compiler $compiler)
{
$compiler
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
index 88074c2f..e4d0beb4 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -21,9 +21,6 @@ class Twig_Profiler_Node_LeaveProfile extends Twig_Node
parent::__construct(array(), array('var_name' => $varName));
}
- /**
- * {@inheritdoc}
- */
public function compile(Twig_Compiler $compiler)
{
$compiler
diff --git a/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php b/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
index 099a44f5..1f9431d2 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -12,7 +12,7 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
+final class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
{
private $extensionName;
@@ -21,17 +21,11 @@ class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
$this->extensionName = $extensionName;
}
- /**
- * {@inheritdoc}
- */
protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
{
return $node;
}
- /**
- * {@inheritdoc}
- */
protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_Module) {
@@ -62,9 +56,6 @@ class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
}
- /**
- * {@inheritdoc}
- */
public function getPriority()
{
return 0;
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Profile.php b/vendor/twig/twig/lib/Twig/Profiler/Profile.php
index 104bc058..9274da28 100644
--- a/vendor/twig/twig/lib/Twig/Profiler/Profile.php
+++ b/vendor/twig/twig/lib/Twig/Profiler/Profile.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -11,6 +11,8 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
*/
class Twig_Profiler_Profile implements IteratorAggregate, Serializable
{
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
index 015bfaea..5a4e021d 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
index 99faba9d..1967cf76 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
index 05cf488a..79a400f1 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
index 5b352d95..9e5d4df0 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
index 8b4cbc35..9f7eab29 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
index b3bb5e8e..a177206c 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
index ed4ba8eb..52ddf7e4 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,13 +14,13 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
+final class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
{
- protected $allowedTags;
- protected $allowedFilters;
- protected $allowedMethods;
- protected $allowedProperties;
- protected $allowedFunctions;
+ private $allowedTags;
+ private $allowedFilters;
+ private $allowedMethods;
+ private $allowedProperties;
+ private $allowedFunctions;
public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array())
{
@@ -82,7 +82,7 @@ class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterfac
public function checkMethodAllowed($obj, $method)
{
- if ($obj instanceof Twig_TemplateInterface || $obj instanceof Twig_Markup) {
+ if ($obj instanceof Twig_Template || $obj instanceof Twig_Markup) {
return true;
}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
index 6ab48e3c..2111a03c 100644
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/SimpleFilter.php b/vendor/twig/twig/lib/Twig/SimpleFilter.php
deleted file mode 100644
index 0c1e092a..00000000
--- a/vendor/twig/twig/lib/Twig/SimpleFilter.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009-2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleFilter
-{
- protected $name;
- protected $callable;
- protected $options;
- protected $arguments = array();
-
- public function __construct($name, $callable, array $options = array())
- {
- $this->name = $name;
- $this->callable = $callable;
- $this->options = array_merge(array(
- 'needs_environment' => false,
- 'needs_context' => false,
- 'is_variadic' => false,
- 'is_safe' => null,
- 'is_safe_callback' => null,
- 'pre_escape' => null,
- 'preserves_safety' => null,
- 'node_class' => 'Twig_Node_Expression_Filter',
- 'deprecated' => false,
- 'alternative' => null,
- ), $options);
- }
-
- public function getName()
- {
- return $this->name;
- }
-
- public function getCallable()
- {
- return $this->callable;
- }
-
- public function getNodeClass()
- {
- return $this->options['node_class'];
- }
-
- public function setArguments($arguments)
- {
- $this->arguments = $arguments;
- }
-
- public function getArguments()
- {
- return $this->arguments;
- }
-
- public function needsEnvironment()
- {
- return $this->options['needs_environment'];
- }
-
- public function needsContext()
- {
- return $this->options['needs_context'];
- }
-
- public function getSafe(Twig_Node $filterArgs)
- {
- if (null !== $this->options['is_safe']) {
- return $this->options['is_safe'];
- }
-
- if (null !== $this->options['is_safe_callback']) {
- return call_user_func($this->options['is_safe_callback'], $filterArgs);
- }
- }
-
- public function getPreservesSafety()
- {
- return $this->options['preserves_safety'];
- }
-
- public function getPreEscape()
- {
- return $this->options['pre_escape'];
- }
-
- public function isVariadic()
- {
- return $this->options['is_variadic'];
- }
-
- public function isDeprecated()
- {
- return (bool) $this->options['deprecated'];
- }
-
- public function getDeprecatedVersion()
- {
- return $this->options['deprecated'];
- }
-
- public function getAlternative()
- {
- return $this->options['alternative'];
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/SimpleFunction.php b/vendor/twig/twig/lib/Twig/SimpleFunction.php
index 63003d6a..8b0e9538 100644
--- a/vendor/twig/twig/lib/Twig/SimpleFunction.php
+++ b/vendor/twig/twig/lib/Twig/SimpleFunction.php
@@ -3,105 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2010-2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
- * Represents a template function.
- *
- * @author Fabien Potencier <fabien@symfony.com>
+ * Empty class for Twig 1.x compatibility.
*/
-class Twig_SimpleFunction
+final class Twig_SimpleFunction extends Twig_Function
{
- protected $name;
- protected $callable;
- protected $options;
- protected $arguments = array();
-
- public function __construct($name, $callable, array $options = array())
- {
- $this->name = $name;
- $this->callable = $callable;
- $this->options = array_merge(array(
- 'needs_environment' => false,
- 'needs_context' => false,
- 'is_variadic' => false,
- 'is_safe' => null,
- 'is_safe_callback' => null,
- 'node_class' => 'Twig_Node_Expression_Function',
- 'deprecated' => false,
- 'alternative' => null,
- ), $options);
- }
-
- public function getName()
- {
- return $this->name;
- }
-
- public function getCallable()
- {
- return $this->callable;
- }
-
- public function getNodeClass()
- {
- return $this->options['node_class'];
- }
-
- public function setArguments($arguments)
- {
- $this->arguments = $arguments;
- }
-
- public function getArguments()
- {
- return $this->arguments;
- }
-
- public function needsEnvironment()
- {
- return $this->options['needs_environment'];
- }
-
- public function needsContext()
- {
- return $this->options['needs_context'];
- }
-
- public function getSafe(Twig_Node $functionArgs)
- {
- if (null !== $this->options['is_safe']) {
- return $this->options['is_safe'];
- }
-
- if (null !== $this->options['is_safe_callback']) {
- return call_user_func($this->options['is_safe_callback'], $functionArgs);
- }
-
- return array();
- }
-
- public function isVariadic()
- {
- return $this->options['is_variadic'];
- }
-
- public function isDeprecated()
- {
- return (bool) $this->options['deprecated'];
- }
-
- public function getDeprecatedVersion()
- {
- return $this->options['deprecated'];
- }
-
- public function getAlternative()
- {
- return $this->options['alternative'];
- }
}
diff --git a/vendor/twig/twig/lib/Twig/SimpleTest.php b/vendor/twig/twig/lib/Twig/SimpleTest.php
index cff3ae7c..a134eead 100644
--- a/vendor/twig/twig/lib/Twig/SimpleTest.php
+++ b/vendor/twig/twig/lib/Twig/SimpleTest.php
@@ -3,67 +3,15 @@
/*
* This file is part of Twig.
*
- * (c) 2010-2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
+ * Empty class for Twig 1.x compatibility.
*/
-class Twig_SimpleTest
+final class Twig_SimpleTest extends Twig_Test
{
- protected $name;
- protected $callable;
- protected $options;
-
- public function __construct($name, $callable, array $options = array())
- {
- $this->name = $name;
- $this->callable = $callable;
- $this->options = array_merge(array(
- 'is_variadic' => false,
- 'node_class' => 'Twig_Node_Expression_Test',
- 'deprecated' => false,
- 'alternative' => null,
- ), $options);
- }
-
- public function getName()
- {
- return $this->name;
- }
-
- public function getCallable()
- {
- return $this->callable;
- }
-
- public function getNodeClass()
- {
- return $this->options['node_class'];
- }
-
- public function isVariadic()
- {
- return $this->options['is_variadic'];
- }
-
- public function isDeprecated()
- {
- return (bool) $this->options['deprecated'];
- }
-
- public function getDeprecatedVersion()
- {
- return $this->options['deprecated'];
- }
-
- public function getAlternative()
- {
- return $this->options['alternative'];
- }
}
diff --git a/vendor/twig/twig/lib/Twig/Source.php b/vendor/twig/twig/lib/Twig/Source.php
index b3fb0cee..f2fb0f65 100644
--- a/vendor/twig/twig/lib/Twig/Source.php
+++ b/vendor/twig/twig/lib/Twig/Source.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2016 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,7 +14,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Source
+final class Twig_Source
{
private $code;
private $name;
diff --git a/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php b/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
deleted file mode 100644
index bb4115e8..00000000
--- a/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2016 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Adds a getSourceContext() method for loaders.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.27 (to be removed in 3.0)
- */
-interface Twig_SourceContextLoaderInterface
-{
- /**
- * Returns the source context for a given template logical name.
- *
- * @param string $name The template logical name
- *
- * @return Twig_Source
- *
- * @throws Twig_Error_Loader When $name is not found
- */
- public function getSourceContext($name);
-}
diff --git a/vendor/twig/twig/lib/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
index 54f6b0dc..b635967a 100644
--- a/vendor/twig/twig/lib/Twig/Template.php
+++ b/vendor/twig/twig/lib/Twig/Template.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -21,8 +21,12 @@
*
* @internal
*/
-abstract class Twig_Template implements Twig_TemplateInterface
+abstract class Twig_Template
{
+ const ANY_CALL = 'any';
+ const ARRAY_CALL = 'array';
+ const METHOD_CALL = 'method';
+
/**
* @internal
*/
@@ -39,6 +43,14 @@ abstract class Twig_Template implements Twig_TemplateInterface
$this->env = $env;
}
+ /**
+ * @internal this method will be removed in 2.0 and is only used internally to provide an upgrade path from 1.x to 2.0
+ */
+ public function __toString()
+ {
+ return $this->getTemplateName();
+ }
+
/**
* Returns the template name.
*
@@ -53,24 +65,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
*
* @internal
*/
- public function getDebugInfo()
- {
- return array();
- }
-
- /**
- * Returns the template source code.
- *
- * @return string The template source code
- *
- * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead
- */
- public function getSource()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
-
- return '';
- }
+ abstract public function getDebugInfo();
/**
* Returns information about the original template source code.
@@ -82,16 +77,6 @@ abstract class Twig_Template implements Twig_TemplateInterface
return new Twig_Source('', $this->getTemplateName());
}
- /**
- * @deprecated since 1.20 (to be removed in 2.0)
- */
- public function getEnvironment()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.20 and will be removed in 2.0.', E_USER_DEPRECATED);
-
- return $this->env;
- }
-
/**
* Returns the parent template.
*
@@ -100,7 +85,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
*
* @param array $context
*
- * @return Twig_TemplateInterface|false The parent template or false if there is no parent
+ * @return Twig_Template|false The parent template or false if there is no parent
*
* @internal
*/
@@ -125,7 +110,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
$this->parents[$parent] = $this->loadTemplate($parent);
}
} catch (Twig_Error_Loader $e) {
- $e->setTemplateName(null);
+ $e->setSourceContext(null);
$e->guess();
throw $e;
@@ -158,14 +143,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function displayParentBlock($name, array $context, array $blocks = array())
{
- $name = (string) $name;
-
if (isset($this->traits[$name])) {
$this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
} elseif (false !== $parent = $this->getParent($context)) {
$parent->displayBlock($name, $context, $blocks, false);
} else {
- throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getTemplateName());
+ throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
}
}
@@ -184,8 +167,6 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
{
- $name = (string) $name;
-
if ($useBlocks && isset($blocks[$name])) {
$template = $blocks[$name][0];
$block = $blocks[$name][1];
@@ -197,17 +178,17 @@ abstract class Twig_Template implements Twig_TemplateInterface
$block = null;
}
- if (null !== $template) {
- // avoid RCEs when sandbox is enabled
- if (!$template instanceof self) {
- throw new LogicException('A block must be a method on a Twig_Template instance.');
- }
+ // avoid RCEs when sandbox is enabled
+ if (null !== $template && !$template instanceof self) {
+ throw new LogicException('A block must be a method on a Twig_Template instance.');
+ }
+ if (null !== $template) {
try {
$template->$block($context, $blocks);
} catch (Twig_Error $e) {
- if (!$e->getTemplateName()) {
- $e->setTemplateName($template->getTemplateName());
+ if (!$e->getSourceContext()) {
+ $e->setSourceContext($template->getSourceContext());
}
// this is mostly useful for Twig_Error_Loader exceptions
@@ -219,10 +200,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
throw $e;
} catch (Exception $e) {
- throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getTemplateName(), $e);
+ throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
}
} elseif (false !== $parent = $this->getParent($context)) {
$parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
+ } else {
+ throw new Twig_Error_Runtime(sprintf('Block "%s" on template "%s" does not exist.', $name, $this->getTemplateName()), -1, $this->getTemplateName());
}
}
@@ -285,14 +268,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
*
* @internal
*/
- public function hasBlock($name, array $context = null, array $blocks = array())
+ public function hasBlock($name, array $context, array $blocks = array())
{
- if (null === $context) {
- @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
-
- return isset($this->blocks[(string) $name]);
- }
-
if (isset($blocks[$name])) {
return $blocks[$name][0] instanceof self;
}
@@ -321,14 +298,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
*
* @internal
*/
- public function getBlockNames(array $context = null, array $blocks = array())
+ public function getBlockNames(array $context, array $blocks = array())
{
- if (null === $context) {
- @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
-
- return array_keys($this->blocks);
- }
-
$names = array_merge(array_keys($blocks), array_keys($this->blocks));
if (false !== $parent = $this->getParent($context)) {
@@ -355,8 +326,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
return $this->env->loadTemplate($template, $index);
} catch (Twig_Error $e) {
- if (!$e->getTemplateName()) {
- $e->setTemplateName($templateName ? $templateName : $this->getTemplateName());
+ if (!$e->getSourceContext()) {
+ $e->setSourceContext($templateName ? new Twig_Source('', $templateName) : $this->getSourceContext());
}
if ($e->getTemplateLine()) {
@@ -388,17 +359,11 @@ abstract class Twig_Template implements Twig_TemplateInterface
return $this->blocks;
}
- /**
- * {@inheritdoc}
- */
public function display(array $context, array $blocks = array())
{
$this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
}
- /**
- * {@inheritdoc}
- */
public function render(array $context)
{
$level = ob_get_level();
@@ -427,8 +392,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
try {
$this->doDisplay($context, $blocks);
} catch (Twig_Error $e) {
- if (!$e->getTemplateName()) {
- $e->setTemplateName($this->getTemplateName());
+ if (!$e->getSourceContext()) {
+ $e->setSourceContext($this->getSourceContext());
}
// this is mostly useful for Twig_Error_Loader exceptions
@@ -440,7 +405,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
throw $e;
} catch (Exception $e) {
- throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
+ throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
}
}
@@ -451,247 +416,4 @@ abstract class Twig_Template implements Twig_TemplateInterface
* @param array $blocks An array of blocks to pass to the template
*/
abstract protected function doDisplay(array $context, array $blocks = array());
-
- /**
- * Returns a variable from the context.
- *
- * This method is for internal use only and should never be called
- * directly.
- *
- * This method should not be overridden in a sub-class as this is an
- * implementation detail that has been introduced to optimize variable
- * access for versions of PHP before 5.4. This is not a way to override
- * the way to get a variable value.
- *
- * @param array $context The context
- * @param string $item The variable to return from the context
- * @param bool $ignoreStrictCheck Whether to ignore the strict variable check or not
- *
- * @return mixed The content of the context variable
- *
- * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode
- *
- * @internal
- */
- final protected function getContext($context, $item, $ignoreStrictCheck = false)
- {
- if (!array_key_exists($item, $context)) {
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return;
- }
-
- throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist.', $item), -1, $this->getTemplateName());
- }
-
- return $context[$item];
- }
-
- /**
- * Returns the attribute value for a given array/object.
- *
- * @param mixed $object The object or array from where to get the item
- * @param mixed $item The item to get from the array or object
- * @param array $arguments An array of arguments to pass if the item is an object method
- * @param string $type The type of attribute (@see Twig_Template constants)
- * @param bool $isDefinedTest Whether this is only a defined check
- * @param bool $ignoreStrictCheck Whether to ignore the strict attribute check or not
- *
- * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
- *
- * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
- *
- * @internal
- */
- protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
- {
- // array
- if (self::METHOD_CALL !== $type) {
- $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
-
- if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
- || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
- ) {
- if ($isDefinedTest) {
- return true;
- }
-
- return $object[$arrayItem];
- }
-
- if (self::ARRAY_CALL === $type || !is_object($object)) {
- if ($isDefinedTest) {
- return false;
- }
-
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return;
- }
-
- if ($object instanceof ArrayAccess) {
- $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, get_class($object));
- } elseif (is_object($object)) {
- $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, get_class($object));
- } elseif (is_array($object)) {
- if (empty($object)) {
- $message = sprintf('Key "%s" does not exist as the array is empty.', $arrayItem);
- } else {
- $message = sprintf('Key "%s" for array with keys "%s" does not exist.', $arrayItem, implode(', ', array_keys($object)));
- }
- } elseif (self::ARRAY_CALL === $type) {
- if (null === $object) {
- $message = sprintf('Impossible to access a key ("%s") on a null variable.', $item);
- } else {
- $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
- }
- } elseif (null === $object) {
- $message = sprintf('Impossible to access an attribute ("%s") on a null variable.', $item);
- } else {
- $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
- }
-
- throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
- }
- }
-
- if (!is_object($object)) {
- if ($isDefinedTest) {
- return false;
- }
-
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return;
- }
-
- if (null === $object) {
- $message = sprintf('Impossible to invoke a method ("%s") on a null variable.', $item);
- } else {
- $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
- }
-
- throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
- }
-
- // object property
- if (self::METHOD_CALL !== $type && !$object instanceof self) { // Twig_Template does not have public properties, and we don't want to allow access to internal ones
- if (isset($object->$item) || array_key_exists((string) $item, $object)) {
- if ($isDefinedTest) {
- return true;
- }
-
- if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
- $this->env->getExtension('Twig_Extension_Sandbox')->checkPropertyAllowed($object, $item);
- }
-
- return $object->$item;
- }
- }
-
- $class = get_class($object);
-
- // object method
- if (!isset(self::$cache[$class])) {
- // get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
- if ($object instanceof self) {
- $ref = new ReflectionClass($class);
- $methods = array();
-
- foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
- // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
- if ('getenvironment' !== strtolower($refMethod->name)) {
- $methods[] = $refMethod->name;
- }
- }
- } else {
- $methods = get_class_methods($object);
- }
- // sort values to have consistent behavior, so that "get" methods win precedence over "is" methods
- sort($methods);
-
- $cache = array();
-
- foreach ($methods as $method) {
- $cache[$method] = $method;
- $cache[$lcName = strtolower($method)] = $method;
-
- if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
- $name = substr($method, 3);
- $lcName = substr($lcName, 3);
- } elseif ('i' === $lcName[0] && 0 === strpos($lcName, 'is')) {
- $name = substr($method, 2);
- $lcName = substr($lcName, 2);
- } else {
- continue;
- }
-
- if (!isset($cache[$name])) {
- $cache[$name] = $method;
- }
- if (!isset($cache[$lcName])) {
- $cache[$lcName] = $method;
- }
- }
- self::$cache[$class] = $cache;
- }
-
- $call = false;
- if (isset(self::$cache[$class][$item])) {
- $method = self::$cache[$class][$item];
- } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) {
- $method = self::$cache[$class][$lcItem];
- } elseif (isset(self::$cache[$class]['__call'])) {
- $method = $item;
- $call = true;
- } else {
- if ($isDefinedTest) {
- return false;
- }
-
- if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return;
- }
-
- throw new Twig_Error_Runtime(sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()"/"is%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), -1, $this->getTemplateName());
- }
-
- if ($isDefinedTest) {
- return true;
- }
-
- if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
- $this->env->getExtension('Twig_Extension_Sandbox')->checkMethodAllowed($object, $method);
- }
-
- // Some objects throw exceptions when they have __call, and the method we try
- // to call is not supported. If ignoreStrictCheck is true, we should return null.
- try {
- if (!$arguments) {
- $ret = $object->$method();
- } else {
- $ret = call_user_func_array(array($object, $method), $arguments);
- }
- } catch (BadMethodCallException $e) {
- if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
- return;
- }
- throw $e;
- }
-
- // @deprecated in 1.28
- if ($object instanceof Twig_TemplateInterface) {
- $self = $object->getTemplateName() === $this->getTemplateName();
- $message = sprintf('Calling "%s" on template "%s" from template "%s" is deprecated since version 1.28 and won\'t be supported anymore in 2.0.', $method, $object->getTemplateName(), $this->getTemplateName());
- if ('renderBlock' === $method || 'displayBlock' === $method) {
- $message .= sprintf(' Use block("%s"%s) instead).', $arguments[0], $self ? '' : ', template');
- } elseif ('hasBlock' === $method) {
- $message .= sprintf(' Use "block("%s"%s) is defined" instead).', $arguments[0], $self ? '' : ', template');
- } elseif ('render' === $method || 'display' === $method) {
- $message .= sprintf(' Use include("%s") instead).', $object->getTemplateName());
- }
- @trigger_error($message, E_USER_DEPRECATED);
-
- return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
- }
-
- return $ret;
- }
}
diff --git a/vendor/twig/twig/lib/Twig/TemplateInterface.php b/vendor/twig/twig/lib/Twig/TemplateInterface.php
deleted file mode 100644
index 207b54d9..00000000
--- a/vendor/twig/twig/lib/Twig/TemplateInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by all compiled templates.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_TemplateInterface
-{
- const ANY_CALL = 'any';
- const ARRAY_CALL = 'array';
- const METHOD_CALL = 'method';
-
- /**
- * Renders the template with the given context and returns it as string.
- *
- * @param array $context An array of parameters to pass to the template
- *
- * @return string The rendered template
- */
- public function render(array $context);
-
- /**
- * Displays the template with the given context.
- *
- * @param array $context An array of parameters to pass to the template
- * @param array $blocks An array of blocks to pass to the template
- */
- public function display(array $context, array $blocks = array());
-
- /**
- * Returns the bound environment for this template.
- *
- * @return Twig_Environment
- */
- public function getEnvironment();
-}
diff --git a/vendor/twig/twig/lib/Twig/TemplateWrapper.php b/vendor/twig/twig/lib/Twig/TemplateWrapper.php
index 2db61cda..b72b92c2 100644
--- a/vendor/twig/twig/lib/Twig/TemplateWrapper.php
+++ b/vendor/twig/twig/lib/Twig/TemplateWrapper.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2016 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/Test.php b/vendor/twig/twig/lib/Twig/Test.php
deleted file mode 100644
index 3c2d8590..00000000
--- a/vendor/twig/twig/lib/Twig/Test.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Test implements Twig_TestInterface, Twig_TestCallableInterface
-{
- protected $options;
- protected $arguments = array();
-
- public function __construct(array $options = array())
- {
- $this->options = array_merge(array(
- 'callable' => null,
- ), $options);
- }
-
- public function getCallable()
- {
- return $this->options['callable'];
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/Function.php b/vendor/twig/twig/lib/Twig/Test/Function.php
deleted file mode 100644
index 5e76c711..00000000
--- a/vendor/twig/twig/lib/Twig/Test/Function.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Function extends Twig_Test
-{
- protected $function;
-
- public function __construct($function, array $options = array())
- {
- $options['callable'] = $function;
-
- parent::__construct($options);
-
- $this->function = $function;
- }
-
- public function compile()
- {
- return $this->function;
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
index cffa3add..113e12e1 100644
--- a/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
+++ b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -31,7 +31,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
}
/**
- * @return Twig_SimpleFilter[]
+ * @return Twig_Filter[]
*/
protected function getTwigFilters()
{
@@ -39,7 +39,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
}
/**
- * @return Twig_SimpleFunction[]
+ * @return Twig_Function[]
*/
protected function getTwigFunctions()
{
@@ -47,7 +47,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
}
/**
- * @return Twig_SimpleTest[]
+ * @return Twig_Test[]
*/
protected function getTwigTests()
{
@@ -154,12 +154,9 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
}
// avoid using the same PHP class name for different cases
- // only for PHP 5.2+
- if (PHP_VERSION_ID >= 50300) {
- $p = new ReflectionProperty($twig, 'templateClassPrefix');
- $p->setAccessible(true);
- $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
- }
+ $p = new ReflectionProperty($twig, 'templateClassPrefix');
+ $p->setAccessible(true);
+ $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
try {
$template = $twig->loadTemplate('index.twig');
@@ -173,12 +170,6 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
return;
}
- if ($e instanceof Twig_Error_Syntax) {
- $e->setTemplateName($file);
-
- throw $e;
- }
-
throw new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
}
@@ -191,11 +182,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
return;
}
- if ($e instanceof Twig_Error_Syntax) {
- $e->setTemplateName($file);
- } else {
- $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
- }
+ $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
$output = trim(sprintf('%s: %s', get_class($e), $e->getMessage()));
}
@@ -212,13 +199,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
foreach (array_keys($templates) as $name) {
echo "Template: $name\n";
- $loader = $twig->getLoader();
- if (!$loader instanceof Twig_SourceContextLoaderInterface) {
- $source = new Twig_Source($loader->getSource($name), $name);
- } else {
- $source = $loader->getSourceContext($name);
- }
- echo $twig->compile($twig->parse($twig->tokenize($source)));
+ echo $twig->compile($twig->parse($twig->tokenize($twig->getLoader()->getSourceContext($name))));
}
}
$this->assertEquals($expected, $output, $message.' (in '.$file.')');
diff --git a/vendor/twig/twig/lib/Twig/Test/Method.php b/vendor/twig/twig/lib/Twig/Test/Method.php
deleted file mode 100644
index 69144bf7..00000000
--- a/vendor/twig/twig/lib/Twig/Test/Method.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Method extends Twig_Test
-{
- protected $extension;
- protected $method;
-
- public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
- {
- $options['callable'] = array($extension, $method);
-
- parent::__construct($options);
-
- $this->extension = $extension;
- $this->method = $method;
- }
-
- public function compile()
- {
- return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/Node.php b/vendor/twig/twig/lib/Twig/Test/Node.php
deleted file mode 100644
index baef49cc..00000000
--- a/vendor/twig/twig/lib/Twig/Test/Node.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Node class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test as a Node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Node extends Twig_Test
-{
- protected $class;
-
- public function __construct($class, array $options = array())
- {
- parent::__construct($options);
-
- $this->class = $class;
- }
-
- public function getClass()
- {
- return $this->class;
- }
-
- public function compile()
- {
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
index a6b550cf..0a3bbee3 100644
--- a/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
+++ b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
@@ -46,23 +46,11 @@ abstract class Twig_Test_NodeTestCase extends PHPUnit_Framework_TestCase
{
$line = $line > 0 ? "// line {$line}\n" : '';
- if (PHP_VERSION_ID >= 70000) {
- return sprintf('%s($context["%s"] ?? null)', $line, $name, $name);
- }
-
- if (PHP_VERSION_ID >= 50400) {
- return sprintf('%s(isset($context["%s"]) ? $context["%s"] : null)', $line, $name, $name);
- }
-
- return sprintf('%s$this->getContext($context, "%s")', $line, $name);
+ return sprintf('%s($context["%s"] ?? null)', $line, $name, $name);
}
protected function getAttributeGetter()
{
- if (function_exists('twig_template_get_attributes')) {
- return 'twig_template_get_attributes($this, ';
- }
-
- return '$this->getAttribute(';
+ return 'twig_get_attribute($this->env, $this->getSourceContext(), ';
}
}
diff --git a/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/vendor/twig/twig/lib/Twig/TestCallableInterface.php
deleted file mode 100644
index 98d34578..00000000
--- a/vendor/twig/twig/lib/Twig/TestCallableInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestCallableInterface
-{
- public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/TestInterface.php b/vendor/twig/twig/lib/Twig/TestInterface.php
deleted file mode 100644
index 2fa821ca..00000000
--- a/vendor/twig/twig/lib/Twig/TestInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestInterface
-{
- /**
- * Compiles a test.
- *
- * @return string The PHP code for the test
- */
- public function compile();
-}
diff --git a/vendor/twig/twig/lib/Twig/Token.php b/vendor/twig/twig/lib/Twig/Token.php
index 3937a6fa..c1085bbb 100644
--- a/vendor/twig/twig/lib/Twig/Token.php
+++ b/vendor/twig/twig/lib/Twig/Token.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,11 +15,11 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Token
+final class Twig_Token
{
- protected $value;
- protected $type;
- protected $lineno;
+ private $value;
+ private $type;
+ private $lineno;
const EOF_TYPE = -1;
const TEXT_TYPE = 0;
diff --git a/vendor/twig/twig/lib/Twig/TokenParser.php b/vendor/twig/twig/lib/Twig/TokenParser.php
index 56d074bf..700a227f 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
index 044fad70..8a8bcaa4 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -11,23 +11,8 @@
/**
* Marks a section of a template to be escaped or not.
- *
- * <pre>
- * {% autoescape true %}
- * Everything will be automatically escaped in this block
- * {% endautoescape %}
- *
- * {% autoescape false %}
- * Everything will be outputed as is in this block
- * {% endautoescape %}
- *
- * {% autoescape true js %}
- * Everything will be automatically escaped in this block
- * using the js escaping strategy
- * {% endautoescape %}
- * </pre>
*/
-class Twig_TokenParser_AutoEscape extends Twig_TokenParser
+final class Twig_TokenParser_AutoEscape extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -39,25 +24,9 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser
} else {
$expr = $this->parser->getExpressionParser()->parseExpression();
if (!$expr instanceof Twig_Node_Expression_Constant) {
- throw new Twig_Error_Syntax('An escaping strategy must be a string or a bool.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('An escaping strategy must be a string or false.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
$value = $expr->getAttribute('value');
-
- $compat = true === $value || false === $value;
-
- if (true === $value) {
- $value = 'html';
- }
-
- if ($compat && $stream->test(Twig_Token::NAME_TYPE)) {
- @trigger_error('Using the autoescape tag with "true" or "false" before the strategy name is deprecated since version 1.21.', E_USER_DEPRECATED);
-
- if (false === $value) {
- throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
- }
-
- $value = $stream->next()->getValue();
- }
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Block.php b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
index a2df9289..0d61d2e1 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Block.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -20,7 +20,7 @@
* {% endblock %}
* </pre>
*/
-class Twig_TokenParser_Block extends Twig_TokenParser
+final class Twig_TokenParser_Block extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -28,7 +28,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser
$stream = $this->parser->getStream();
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
if ($this->parser->hasBlock($name)) {
- throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
$this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
$this->parser->pushLocalScope();
@@ -40,7 +40,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser
$value = $token->getValue();
if ($value != $name) {
- throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
}
} else {
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Do.php b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
index 7adb5a08..5220933b 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Do.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -12,7 +12,7 @@
/**
* Evaluates an expression, discarding the returned value.
*/
-class Twig_TokenParser_Do extends Twig_TokenParser
+final class Twig_TokenParser_Do extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
index ddc2602c..c380b19d 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -12,7 +12,7 @@
/**
* Embeds a template.
*/
-class Twig_TokenParser_Embed extends Twig_TokenParser_Include
+final class Twig_TokenParser_Embed extends Twig_TokenParser_Include
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Extends.php b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
index 2918cf5a..d6905525 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -17,18 +17,18 @@
* {% extends "base.html" %}
* </pre>
*/
-class Twig_TokenParser_Extends extends Twig_TokenParser
+final class Twig_TokenParser_Extends extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
$stream = $this->parser->getStream();
if (!$this->parser->isMainScope()) {
- throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext());
}
if (null !== $this->parser->getParent()) {
- throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getSourceContext());
}
$this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Filter.php b/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
index b735ed40..2485cda4 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,7 +18,7 @@
* {% endfilter %}
* </pre>
*/
-class Twig_TokenParser_Filter extends Twig_TokenParser
+final class Twig_TokenParser_Filter extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Flush.php b/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
index f9ce7c3b..fb922484 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,7 +14,7 @@
*
* @see flush()
*/
-class Twig_TokenParser_Flush extends Twig_TokenParser
+final class Twig_TokenParser_Flush extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/For.php b/vendor/twig/twig/lib/Twig/TokenParser/For.php
index 90553a16..911b652b 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/For.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/For.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -21,7 +21,7 @@
* </ul>
* </pre>
*/
-class Twig_TokenParser_For extends Twig_TokenParser
+final class Twig_TokenParser_For extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -76,10 +76,10 @@ class Twig_TokenParser_For extends Twig_TokenParser
}
// the loop variable cannot be used in the condition
- protected function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_NodeInterface $node)
+ private function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_Node $node)
{
if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
- throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getTemplateLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getTemplateLine(), $stream->getSourceContext());
}
foreach ($node as $n) {
@@ -93,12 +93,12 @@ class Twig_TokenParser_For extends Twig_TokenParser
// check usage of non-defined loop-items
// it does not catch all problems (for instance when a for is included into another or when the variable is used in an include)
- protected function checkLoopUsageBody(Twig_TokenStream $stream, Twig_NodeInterface $node)
+ private function checkLoopUsageBody(Twig_TokenStream $stream, Twig_Node $node)
{
if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
$attribute = $node->getNode('attribute');
if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {
- throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getTemplateLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getTemplateLine(), $stream->getSourceContext());
}
}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/From.php b/vendor/twig/twig/lib/Twig/TokenParser/From.php
index 77a6eedb..019a367e 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/From.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/From.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,7 +16,7 @@
* {% from 'forms.html' import forms %}
* </pre>
*/
-class Twig_TokenParser_From extends Twig_TokenParser
+final class Twig_TokenParser_From extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -45,11 +45,7 @@ class Twig_TokenParser_From extends Twig_TokenParser
$node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
foreach ($targets as $name => $alias) {
- if ($this->parser->isReservedMacroName($name)) {
- throw new Twig_Error_Syntax(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext()->getName());
- }
-
- $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
+ $this->parser->addImportedSymbol('function', $alias, 'macro_'.$name, $node->getNode('var'));
}
return $node;
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/If.php b/vendor/twig/twig/lib/Twig/TokenParser/If.php
index 8d8328ac..98470df3 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/If.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/If.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -23,7 +23,7 @@
* {% endif %}
* </pre>
*/
-class Twig_TokenParser_If extends Twig_TokenParser
+final class Twig_TokenParser_If extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -56,7 +56,7 @@ class Twig_TokenParser_If extends Twig_TokenParser
break;
default:
- throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Import.php b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
index 85c5c036..aa2e4641 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Import.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -16,7 +16,7 @@
* {% import 'forms.html' as forms %}
* </pre>
*/
-class Twig_TokenParser_Import extends Twig_TokenParser
+final class Twig_TokenParser_Import extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Include.php b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
index 0e76dae3..b3ac1bc7 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Include.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,6 +18,8 @@
* Body
* {% include 'footer.html' %}
* </pre>
+ *
+ * @final
*/
class Twig_TokenParser_Include extends Twig_TokenParser
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Macro.php b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
index bc975ff3..284cd4b0 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -18,7 +18,7 @@
* {% endmacro %}
* </pre>
*/
-class Twig_TokenParser_Macro extends Twig_TokenParser
+final class Twig_TokenParser_Macro extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -35,7 +35,7 @@ class Twig_TokenParser_Macro extends Twig_TokenParser
$value = $token->getValue();
if ($value != $name) {
- throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
}
$this->parser->popLocalScope();
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
index 4809d16a..698395e0 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -20,7 +20,7 @@
*
* @see http://www.twig-project.org/doc/api.html#sandbox-extension for details
*/
-class Twig_TokenParser_Sandbox extends Twig_TokenParser
+final class Twig_TokenParser_Sandbox extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -37,7 +37,7 @@ class Twig_TokenParser_Sandbox extends Twig_TokenParser
}
if (!$node instanceof Twig_Node_Include) {
- throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getTemplateLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getTemplateLine(), $stream->getSourceContext());
}
}
}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Set.php b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
index b6e966e4..0d83df51 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Set.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -26,7 +26,7 @@
* {% set foo %}Some content{% endset %}
* </pre>
*/
-class Twig_TokenParser_Set extends Twig_TokenParser
+final class Twig_TokenParser_Set extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -41,13 +41,13 @@ class Twig_TokenParser_Set extends Twig_TokenParser
$stream->expect(Twig_Token::BLOCK_END_TYPE);
if (count($names) !== count($values)) {
- throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
} else {
$capture = true;
if (count($names) > 1) {
- throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php b/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
index 53d906d8..b79e889f 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -22,7 +22,7 @@
* {# output will be <div><strong>foo</strong></div> #}
* </pre>
*/
-class Twig_TokenParser_Spaceless extends Twig_TokenParser
+final class Twig_TokenParser_Spaceless extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Use.php b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
index 3129e830..e53177cc 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/Use.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -23,7 +23,7 @@
*
* @see http://www.twig-project.org/doc/templates.html#horizontal-reuse for details.
*/
-class Twig_TokenParser_Use extends Twig_TokenParser
+final class Twig_TokenParser_Use extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
@@ -31,7 +31,7 @@ class Twig_TokenParser_Use extends Twig_TokenParser
$stream = $this->parser->getStream();
if (!$template instanceof Twig_Node_Expression_Constant) {
- throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+ throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
}
$targets = array();
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/With.php b/vendor/twig/twig/lib/Twig/TokenParser/With.php
index 73f820a4..673f2165 100644
--- a/vendor/twig/twig/lib/Twig/TokenParser/With.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/With.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2016 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -14,7 +14,7 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_TokenParser_With extends Twig_TokenParser
+final class Twig_TokenParser_With extends Twig_TokenParser
{
public function parse(Twig_Token $token)
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParserBroker.php b/vendor/twig/twig/lib/Twig/TokenParserBroker.php
deleted file mode 100644
index 0349a1c9..00000000
--- a/vendor/twig/twig/lib/Twig/TokenParserBroker.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default implementation of a token parser broker.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
-{
- protected $parser;
- protected $parsers = array();
- protected $brokers = array();
-
- /**
- * @param array|Traversable $parsers A Traversable of Twig_TokenParserInterface instances
- * @param array|Traversable $brokers A Traversable of Twig_TokenParserBrokerInterface instances
- * @param bool $triggerDeprecationError
- */
- public function __construct($parsers = array(), $brokers = array(), $triggerDeprecationError = true)
- {
- if ($triggerDeprecationError) {
- @trigger_error('The '.__CLASS__.' class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
- }
-
- foreach ($parsers as $parser) {
- if (!$parser instanceof Twig_TokenParserInterface) {
- throw new LogicException('$parsers must a an array of Twig_TokenParserInterface.');
- }
- $this->parsers[$parser->getTag()] = $parser;
- }
- foreach ($brokers as $broker) {
- if (!$broker instanceof Twig_TokenParserBrokerInterface) {
- throw new LogicException('$brokers must a an array of Twig_TokenParserBrokerInterface.');
- }
- $this->brokers[] = $broker;
- }
- }
-
- public function addTokenParser(Twig_TokenParserInterface $parser)
- {
- $this->parsers[$parser->getTag()] = $parser;
- }
-
- public function removeTokenParser(Twig_TokenParserInterface $parser)
- {
- $name = $parser->getTag();
- if (isset($this->parsers[$name]) && $parser === $this->parsers[$name]) {
- unset($this->parsers[$name]);
- }
- }
-
- public function addTokenParserBroker(Twig_TokenParserBroker $broker)
- {
- $this->brokers[] = $broker;
- }
-
- public function removeTokenParserBroker(Twig_TokenParserBroker $broker)
- {
- if (false !== $pos = array_search($broker, $this->brokers)) {
- unset($this->brokers[$pos]);
- }
- }
-
- /**
- * Gets a suitable TokenParser for a tag.
- *
- * First looks in parsers, then in brokers.
- *
- * @param string $tag A tag name
- *
- * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
- */
- public function getTokenParser($tag)
- {
- if (isset($this->parsers[$tag])) {
- return $this->parsers[$tag];
- }
- $broker = end($this->brokers);
- while (false !== $broker) {
- $parser = $broker->getTokenParser($tag);
- if (null !== $parser) {
- return $parser;
- }
- $broker = prev($this->brokers);
- }
- }
-
- public function getParsers()
- {
- return $this->parsers;
- }
-
- public function getParser()
- {
- return $this->parser;
- }
-
- public function setParser(Twig_ParserInterface $parser)
- {
- $this->parser = $parser;
- foreach ($this->parsers as $tokenParser) {
- $tokenParser->setParser($parser);
- }
- foreach ($this->brokers as $broker) {
- $broker->setParser($parser);
- }
- }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php b/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
deleted file mode 100644
index b84179cf..00000000
--- a/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parser brokers.
- *
- * Token parser brokers allows to implement custom logic in the process of resolving a token parser for a given tag name.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TokenParserBrokerInterface
-{
- /**
- * Gets a TokenParser suitable for a tag.
- *
- * @param string $tag A tag name
- *
- * @return Twig_TokenParserInterface|null A Twig_TokenParserInterface or null if no suitable TokenParser was found
- */
- public function getTokenParser($tag);
-
- /**
- * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
- */
- public function setParser(Twig_ParserInterface $parser);
-
- /**
- * Gets the Twig_ParserInterface.
- *
- * @return null|Twig_ParserInterface A Twig_ParserInterface instance or null
- */
- public function getParser();
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParserInterface.php b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
index d35f8ff8..80c49428 100644
--- a/vendor/twig/twig/lib/Twig/TokenParserInterface.php
+++ b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
@@ -3,7 +3,7 @@
/*
* This file is part of Twig.
*
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -24,7 +24,7 @@ interface Twig_TokenParserInterface
/**
* Parses a token and returns a node.
*
- * @return Twig_NodeInterface
+ * @return Twig_Node A Twig_Node instance
*
* @throws Twig_Error_Syntax
*/
diff --git a/vendor/twig/twig/lib/Twig/TokenStream.php b/vendor/twig/twig/lib/Twig/TokenStream.php
index 1b6a7b8b..248369ac 100644
--- a/vendor/twig/twig/lib/Twig/TokenStream.php
+++ b/vendor/twig/twig/lib/Twig/TokenStream.php
@@ -3,8 +3,8 @@
/*
* This file is part of Twig.
*
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@@ -15,34 +15,20 @@
*
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_TokenStream
+final class Twig_TokenStream
{
- protected $tokens;
- protected $current = 0;
- protected $filename;
-
+ private $tokens;
+ private $current = 0;
private $source;
/**
* @param array $tokens An array of tokens
- * @param string|null $name The name of the template which tokens are associated with
- * @param string|null $source The source code associated with the tokens
+ * @param Twig_Source $source
*/
- public function __construct(array $tokens, $name = null, $source = null)
+ public function __construct(array $tokens, Twig_Source $source = null)
{
- if (!$name instanceof Twig_Source) {
- if (null !== $name || null !== $source) {
- @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
- }
- $this->source = new Twig_Source($source, $name);
- } else {
- $this->source = $name;
- }
-
$this->tokens = $tokens;
-
- // deprecated, not used anymore, to be removed in 2.0
- $this->filename = $this->source->getName();
+ $this->source = $source ?: new Twig_Source('', '');
}
public function __toString()
@@ -63,7 +49,7 @@ class Twig_TokenStream
public function next()
{
if (!isset($this->tokens[++$this->current])) {
- throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->source->getName());
+ throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->source);
}
return $this->tokens[$this->current - 1];
@@ -96,7 +82,7 @@ class Twig_TokenStream
Twig_Token::typeToEnglish($token->getType()), $token->getValue(),
Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
$line,
- $this->source->getName()
+ $this->source
);
}
$this->next();
@@ -114,7 +100,7 @@ class Twig_TokenStream
public function look($number = 1)
{
if (!isset($this->tokens[$this->current + $number])) {
- throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->source->getName());
+ throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->source);
}
return $this->tokens[$this->current + $number];
@@ -148,36 +134,6 @@ class Twig_TokenStream
return $this->tokens[$this->current];
}
- /**
- * Gets the name associated with this stream (null if not defined).
- *
- * @return string|null
- *
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getFilename()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->source->getName();
- }
-
- /**
- * Gets the source code associated with this stream.
- *
- * @return string
- *
- * @internal Don't use this as it might be empty depending on the environment configuration
- *
- * @deprecated since 1.27 (to be removed in 2.0)
- */
- public function getSource()
- {
- @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->source->getCode();
- }
-
/**
* Gets the source associated with this stream.
*
diff --git a/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php b/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
index 850b628e..7dfc53d0 100644
--- a/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
+++ b/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
@@ -12,10 +12,9 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
*/
-class Twig_Util_DeprecationCollector
+final class Twig_Util_DeprecationCollector
{
private $twig;
- private $deprecations;
public function __construct(Twig_Environment $twig)
{
@@ -50,13 +49,16 @@ class Twig_Util_DeprecationCollector
*/
public function collect(Iterator $iterator)
{
- $this->deprecations = array();
-
- set_error_handler(array($this, 'errorHandler'));
+ $deprecations = array();
+ set_error_handler(function ($type, $msg) use (&$deprecations) {
+ if (E_USER_DEPRECATED === $type) {
+ $deprecations[] = $msg;
+ }
+ });
foreach ($iterator as $name => $contents) {
try {
- $this->twig->parse($this->twig->tokenize($contents, $name));
+ $this->twig->parse($this->twig->tokenize($contents));
} catch (Twig_Error_Syntax $e) {
// ignore templates containing syntax errors
}
@@ -64,19 +66,6 @@ class Twig_Util_DeprecationCollector
restore_error_handler();
- $deprecations = $this->deprecations;
- $this->deprecations = array();
-
return $deprecations;
}
-
- /**
- * @internal
- */
- public function errorHandler($type, $msg)
- {
- if (E_USER_DEPRECATED === $type) {
- $this->deprecations[] = $msg;
- }
- }
}
diff --git a/web/config.php b/web/config.php
index a031a3a1..69df43cf 100644
--- a/web/config.php
+++ b/web/config.php
@@ -270,7 +270,7 @@ $hasMinorProblems = (bool) count($minorProblems);
}
.sf-reset ul a,
.sf-reset ul a:hover {
- background: url(../images/blue-arrow.png) no-repeat right 6px;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
padding-right: 10px;
}
.sf-reset ul, ol {
--
GitLab