Fabien Potencier
9919918de4
fixed version in HttpKernel
2014-11-03 22:46:45 +01:00
Fabien Potencier
7bd1d4c0e6
updated VERSION for 2.6.0-BETA1
2014-11-03 21:15:26 +01:00
Fabien Potencier
842cba1d0c
Merge branch '2.5'
...
* 2.5:
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.5.7
updated VERSION for 2.5.6
updated CHANGELOG for 2.5.6
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/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
src/Symfony/Component/Form/Extension/Core/Type/DateType.php
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Security/Core/SecurityContextInterface.php
src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php
src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationSuccessHandler.php
src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
src/Symfony/Component/Serializer/Serializer.php
src/Symfony/Component/Validator/Constraints/File.php
2014-10-26 08:46:28 +01:00
Fabien Potencier
b5b12a54f7
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
Fabien Potencier
20e7cf12ba
minor #12293 Remove aligned '=>' and '=' (disquedur)
...
This PR was squashed before being merged into the 2.3 branch (closes #12293 ).
Discussion
----------
Remove aligned '=>' and '='
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | [https://github.com/symfony/symfony/issues/12284 ]
| License | MIT
Could you said to me if i should make an other PR for 2.5 branch.
Commits
-------
51312d3
Remove aligned '=>' and '='
2014-10-26 08:31:56 +01:00
Disquedur
51312d31cc
Remove aligned '=>' and '='
2014-10-26 08:30:58 +01:00
Fabien Potencier
0f4993bd2a
bumped Symfony version to 2.5.7
2014-10-24 10:21:46 +02:00
Fabien Potencier
1a1b1e5289
updated VERSION for 2.5.6
2014-10-24 08:55:39 +02:00
Fabien Potencier
016b0a9ad2
bumped Symfony version to 2.3.22
2014-10-24 08:50:18 +02:00
Fabien Potencier
0a6e90e091
updated VERSION for 2.3.21
2014-10-24 07:54:08 +02:00
Fabien Potencier
6e534f2023
bumped Symfony version to 2.5.6
2014-09-28 20:29:08 +02:00
Fabien Potencier
2aef97bbc9
updated VERSION for 2.5.5
2014-09-28 19:33:53 +02:00
Fabien Potencier
6beca0a945
bumped Symfony version to 2.3.21
2014-09-28 18:55:34 +02:00
Fabien Potencier
5ef0ea8414
updated VERSION for 2.3.20
2014-09-28 18:24:47 +02:00
Fabien Potencier
05815adb22
Merge branch '2.5'
...
* 2.5:
added missing use statements
added missing use statement
added missing use statement
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
2014-09-22 13:59:59 +02:00
Fabien Potencier
b91866f6c1
Merge branch '2.4' into 2.5
...
* 2.4:
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.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/Process/Tests/AbstractProcessTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
src/Symfony/Component/Yaml/Parser.php
2014-09-22 11:14:18 +02:00
Fabien Potencier
27e8c654db
Merge branch '2.3' into 2.4
...
* 2.3:
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Tests/ApplicationTest.php
src/Symfony/Component/Filesystem/Exception/IOException.php
src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
2014-09-22 10:51:05 +02:00
Fabien Potencier
369aebf431
fixed CS
2014-09-22 10:32:35 +02:00
Philipp Wahala
86873f29f8
#11652 [HttpKernel] Remove unused method Kernel::isClassInActiveBundle
2014-09-08 21:56:05 +02:00
Fabien Potencier
afb82e83af
bumped Symfony version to 2.5.5
2014-09-03 14:51:22 +02:00
Fabien Potencier
8d6b59b0bd
bumped Symfony version to 2.4.10
2014-09-03 14:51:14 +02:00
Fabien Potencier
1033dc59cd
bumped Symfony version to 2.3.20
2014-09-03 14:50:59 +02:00
Fabien Potencier
3a369dddea
updated VERSION for 2.5.4
2014-09-03 11:51:48 +02:00
Fabien Potencier
6266883049
updated VERSION for 2.4.9
2014-09-03 11:50:20 +02:00
Fabien Potencier
1fc0575804
updated VERSION for 2.3.19
2014-09-03 11:45:27 +02:00
Fabien Potencier
0c13296d30
bumped Symfony version to 2.5.4
2014-08-06 10:24:10 +02:00
Fabien Potencier
f077a238c7
updated VERSION for 2.5.3
2014-08-06 09:03:01 +02:00
Fabien Potencier
28defa8741
bumped Symfony version to 2.5.3
2014-07-15 22:52:32 +02:00
Fabien Potencier
98142a0a35
bumped Symfony version to 2.4.9
2014-07-15 22:38:14 +02:00
Fabien Potencier
ace5a29867
bumped Symfony version to 2.3.19
2014-07-15 21:58:41 +02:00
Fabien Potencier
e66ee96757
updated VERSION for 2.5.2
2014-07-15 17:39:46 +02:00
Fabien Potencier
3da923989c
updated VERSION for 2.4.8
2014-07-15 16:52:02 +02:00
Fabien Potencier
75e07e6bde
updated VERSION for 2.3.18
2014-07-15 16:20:44 +02:00
Fabien Potencier
50a210b1da
bumped Symfony version to 2.5.2
2014-07-08 20:56:57 +02:00
Fabien Potencier
1fb3ccb3be
bumped Symfony version to 2.4.8
2014-07-08 16:47:36 +02:00
Fabien Potencier
e3d2844abc
updated VERSION for 2.5.1
2014-07-08 16:42:08 +02:00
Fabien Potencier
e72f9ebfdf
updated VERSION for 2.4.7
2014-07-08 13:54:27 +02:00
Fabien Potencier
bf72e871f6
bumped Symfony version to 2.3.18
2014-07-08 13:19:32 +02:00
Fabien Potencier
c02f56f794
updated VERSION for 2.3.17
2014-07-07 14:59:36 +02:00
Fabien Potencier
9c60a8582e
bumped Symfony version to 2.5.1
2014-06-01 17:15:34 +02:00
Fabien Potencier
1fc8a82f35
bumped Symfony version to 2.4.7
2014-06-01 17:15:23 +02:00
Fabien Potencier
1793292ae9
bumped Symfony version to 2.3.17
2014-06-01 17:15:00 +02:00
Fabien Potencier
59365832a0
updated VERSION for 2.5.0
2014-05-31 20:45:50 +02:00
Fabien Potencier
ebf1be8a92
updated VERSION for 2.4.6
2014-05-31 20:42:13 +02:00
Fabien Potencier
069683a14e
updated VERSION for 2.3.16
2014-05-31 04:04:21 +02:00
Fabien Potencier
082006278c
bumped Symfony version to 2.5.0
2014-05-29 01:33:40 +02:00
Fabien Potencier
515fbe9d95
updated VERSION for 2.5.0-RC1
2014-05-28 03:21:58 +02:00
Fabien Potencier
c6947d006e
Merge branch '2.5'
...
* 2.5:
Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
Revert "fixed CS"
Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
Revert "[HttpKernel] simplified some tests"
[HttpKernel] simplified some tests
Make rootPath part of regex greedy
2014-05-26 18:43:36 +02:00
Fabien Potencier
6cee250b55
Merge branch '2.4' into 2.5
...
* 2.4:
Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
Revert "fixed CS"
Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
Revert "[HttpKernel] simplified some tests"
[HttpKernel] simplified some tests
Make rootPath part of regex greedy
2014-05-26 18:43:24 +02:00
Fabien Potencier
53d5ecaa00
Merge branch '2.3' into 2.4
...
* 2.3:
Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
Revert "fixed CS"
Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
Revert "[HttpKernel] simplified some tests"
[HttpKernel] simplified some tests
Make rootPath part of regex greedy
Conflicts:
src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-26 18:43:09 +02:00