ed3019589c
Merge branch '2.3' into 2.5
...
* 2.3:
fixed tests
[EventDispatcher] Add missing checks to RegisterListenersPass
Inline private 'is quoting required' methods in Escaper
[Debug] fix loading order for legacy classes
Add comment as requested
Remove duplicate 'require'
[Yaml] Improve YAML boolean escaping
Conflicts:
src/Symfony/Component/Debug/Exception/FatalErrorException.php
src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
2015-01-16 15:51:58 +01:00
ee29381719
[Debug] fix loading order for legacy classes
2015-01-15 13:58:08 +01:00
dcd43ab175
Merge branch '2.3' into 2.5
...
* 2.3:
[2.3] Remove useless tests skips
[2.3] Cleanup deprecations
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/Debug/Tests/MockExceptionHandler.php
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Security/composer.json
2015-01-03 16:23:51 +01:00
86497902eb
[2.3] Cleanup deprecations
2015-01-03 10:22:29 +01:00
c80c19c531
Merge branch '2.3' into 2.5
...
* 2.3:
[Config] adds missing « use » statement for InvalidTypeException type hint in documentation.
[Config] fixes broken unit test on ArrayNode class.
fixed CS
[Security] Delete old session on auth strategy migrate
update required minimum TwigBridge version
Very minor grammar fix in error message
[Tests] Silenced all deprecations in tests for 2.3
BinaryFileResponse - add missing newline
fixed CS
add a limit and a test to FlattenExceptionTest.
CS: There should be no empty lines following phpdocs
[FrameworkBundle] fix cache:clear command
[2.3] Docblocks should not be followed by a blank line
Fix return phpdoc
[PropertyAccess] Added test to verify #5775 is fixed
Conflicts:
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
2014-12-20 17:01:23 +01:00
1164432942
add a limit and a test to FlattenExceptionTest.
2014-12-17 22:36:26 +01:00
7b7d439e7a
Merge branch '2.3' into 2.5
...
* 2.3:
Remove aligned '=>' and '='
Break infinite loop while resolving aliases
[Security][listener] change priority of switchuser
Improved the phpdoc for security token classes
bumped Symfony version to 2.3.22
updated VERSION for 2.3.21
update CONTRIBUTORS for 2.3.21
updated CHANGELOG for 2.3.21
Conflicts:
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/Finder/Shell/Command.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
src/Symfony/Component/Form/Extension/Core/Type/FormType.php
src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
src/Symfony/Component/HttpKernel/Tests/HttpCache/TestMultipleHttpKernel.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Validator/Constraints/ImageValidator.php
src/Symfony/Component/Validator/Constraints/TypeValidator.php
2014-10-26 08:41:27 +01:00
342b4e4a8e
Remove aligned '=>' and '='
2014-10-26 08:30:58 +01:00
88a4b49c96
[Debug] Handled errors
2014-04-19 10:12:16 +02:00
6a55635898
Fixed recursion level incrementing in FlattenException::flattenArgs().
2014-02-04 08:06:39 +01:00
b8c99a3341
[Debug] added the component ( closes #6828 , closes #6834 , closes #7330 )
2013-04-07 18:19:05 +02:00
Fabien Potencier