summaryrefslogtreecommitdiffstats
path: root/Http
Commit message (Collapse)AuthorAgeFilesLines
* Removed unnecessary statement from PersistentTokenBasedRememberMeServices.phpDawid Nowak2015-05-071-1/+0
|
* Merge branch '2.6' into 2.7Nicolas Grekas2015-04-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Routing][DependencyInjection] Support .yaml extension in YAML loaders [DX] improve file loader error for router/other resources in bundle [FrameworkBundle] Initialize translator with the default locale. [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors [2.6][Translation] remove duplicate code for loading catalogue. [HttpKernel] Cleanup ExceptionListener CS fixes [DependencyInjection] Show better error when the Yaml component is not installed [2.3] SCA for Components - reference mismatches [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions) [2.3] Static Code Analysis for Components [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator [Translation] LoggingTranslator simplifications [Translation][fixed test] refresh cache when resources are no longer fresh. [FrameworkBundle] Fixed server:start --router relative path issue #14124 [FrameworkBundle] improve usage of Table helper [Validator] Added missing Simplified Chinese (zh_CN) translations [FrameworkBundle] Workaround php -S ignoring auto_prepend_file Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Console/Helper/Table.php src/Symfony/Component/Translation/LoggingTranslator.php
| * Merge branch '2.3' into 2.6Nicolas Grekas2015-04-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Routing][DependencyInjection] Support .yaml extension in YAML loaders [DX] improve file loader error for router/other resources in bundle [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors [HttpKernel] Cleanup ExceptionListener CS fixes [DependencyInjection] Show better error when the Yaml component is not installed [2.3] SCA for Components - reference mismatches [2.3] Static Code Analysis for Components [Translation][fixed test] refresh cache when resources are no longer fresh. [Validator] Added missing Simplified Chinese (zh_CN) translations [FrameworkBundle] Workaround php -S ignoring auto_prepend_file Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Config/Exception/FileLoaderLoadException.php src/Symfony/Component/Console/Descriptor/TextDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Yaml/Tests/InlineTest.php
| | * CS fixesDariusz Ruminski2015-04-161-1/+1
| | |
* | | Use PSR-4 everywhere instead of PSR-0Tobias Schultze2015-04-111-2/+1
| | |
* | | removed 3.0 constraints from 2.7 composer filesv2.7.0-BETA1Fabien Potencier2015-04-101-7/+7
| | |
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-03-301-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Validator] Add missing pt_BR translations Add parsing of hexadecimal strings for PHP 7 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition [Validator] Added missing Hungarian translation [Validator] Fixed grammar in Hungarian translation CS: Unary operators should be placed adjacent to their operands CS: Binary operators should be arounded by at least one space remove useless tests that fail in php 7 [Translator] fix test for php 7 compatibility Update phpdoc of ProcessBuilder#setPrefix() Conflicts: src/Symfony/Bridge/Propel1/Logger/PropelLogger.php src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
| * | Merge branch '2.3' into 2.6v2.6.6Fabien Potencier2015-03-301-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Validator] Add missing pt_BR translations Add parsing of hexadecimal strings for PHP 7 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition [Validator] Added missing Hungarian translation [Validator] Fixed grammar in Hungarian translation CS: Unary operators should be placed adjacent to their operands CS: Binary operators should be arounded by at least one space remove useless tests that fail in php 7 [Translator] fix test for php 7 compatibility Update phpdoc of ProcessBuilder#setPrefix() Conflicts: src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf src/Symfony/Component/Yaml/Parser.php
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-03-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: CS: fixes Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places [Form] [TwigBridge] Bootstrap layout whitespace control [travis] Kill tests when a new commit has been pushed fixed CS Change behavior to mirror hash_equals() returning early if there is a length mismatch CS fixing Prevent modifying secrets as much as possible Update StringUtils.php Whitespace Update StringUtils.php StringUtils::equals() arguments in RememberMe Cookie based implementation are confused CS: general fixes [SecurityBundle] removed a duplicated service definition and simplified others. Conflicts: src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
| * | StringUtils::equals() arguments in RememberMe Cookie based implementation ↵Ivan Kurnosov2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | are confused It must be the other way around
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-03-241-5/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: CS: fix some license headers CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline use visited lookup with reference to gain performance Replace GET parameters when changed [FrameworkBundle][debug:config] added support for dynamic configurations. [WebProfiler] Fix partial search on url in list Conflicts: src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php src/Symfony/Bridge/Propel1/Form/EventListener/TranslationFormListener.php
| * | Merge branch '2.3' into 2.6Fabien Potencier2015-03-241-5/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: CS: fix some license headers CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline use visited lookup with reference to gain performance Replace GET parameters when changed Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
| | * minor #14038 CS: fix some license headers (keradus)Fabien Potencier2015-03-241-6/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- CS: fix some license headers | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- 2b74841 CS: fix some license headers
| | | * CS: fix some license headersDariusz Ruminski2015-03-241-0/+10
| | | |
| | * | CS: Ensure there is no code on the same line as the PHP open tag and it is ↵Dariusz Ruminski2015-03-241-0/+1
| | |/ | | | | | | | | | followed by a blankline
| * | Merge branch '2.3' into 2.6Fabien Potencier2015-03-221-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Fix small coding style [2.3] Static Code Analysis for Components [Form] fixed phpdoc CS: Convert double quotes to single quotes Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader. [Validator] added Japanese translation for unmatched charset (id: 80) [DependencyInjection] Highest precedence for user parameters [Translation][MoFileLoader] fixed load empty translation. bumped Symfony version to 2.3.27 updated VERSION for 2.3.26 update CONTRIBUTORS for 2.3.26 updated CHANGELOG for 2.3.26 Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php src/Symfony/Component/Filesystem/Filesystem.php src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/Validator/Constraints/IssnValidator.php src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf src/Symfony/Component/Yaml/Tests/InlineTest.php
| | * CS: Convert double quotes to single quotesDariusz Ruminski2015-03-211-1/+1
| | |
* | | Changed visibility of setUp() and tearDown to protectedsarah khalil2015-03-131-2/+2
| | |
* | | Merge branch '2.6' into 2.7Nicolas Grekas2015-03-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * 2.6: Changed visibility of setUp() and tearDown to protected
| * | Changed visibility of setUp() and tearDown to protectedsarah khalil2015-03-131-1/+1
| | |
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-03-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age Changed visibility of setUp() and tearDown to protected [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback Added default button class used HTML5 meta charset tag and removed hardcoded ones Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)" fixed XSS in the exception handler Php Inspections (EA Extended) - static code analysis includes: [2.3] Remove most refs uses Test with local components instead of waiting for the subtree-splitter when possible Conflicts: .travis.yml
| * | Merge branch '2.3' into 2.6Nicolas Grekas2015-03-121-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Changed visibility of setUp() and tearDown to protected fixed XSS in the exception handler Php Inspections (EA Extended) - static code analysis includes: [2.3] Remove most refs uses Test with local components instead of waiting for the subtree-splitter when possible Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Component/Config/Util/XmlUtils.php src/Symfony/Component/Console/Helper/ProgressHelper.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Yaml/Inline.php
| | * Php Inspections (EA Extended) - static code analysis includes:Vladimir Reznichenko2015-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reduce couple count calls in [Yaml] Modernize type casting, fix several strict comparisons Unsets merged Elvis operator usage Short syntax for applied operations
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-03-072-7/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Php Inspections (EA Extended): squash all PR-13813 commits replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [FrameworkBundle] simplify dep declaration [VarDumper] Fix "next element is already occupied" [Validator] Added missing galician (gl) translations [PropertyAccess] stop overwriting once a reference is reached (3rd) [OptionsResolver] Remove Unused Variable from Foreach Cycles [travis] Tests Security sub-components [Twig] bootstrap_3_layout.html.twig is usable as a trait [travis] Tests Security sub-components CS fixes [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty [travis] test with php nightly Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
| * | Merge branch '2.3' into 2.6Fabien Potencier2015-03-072-7/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: replaced the last remaining is_integer() call [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup [Validator] Added missing galician (gl) translations [travis] Tests Security sub-components [travis] Tests Security sub-components CS fixes [travis] test with php nightly Conflicts: src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
| * | Merge branch '2.3' into 2.6Nicolas Grekas2015-02-242-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Minor hot fix [PROCESS] make sure /dev/tty is readable [2.3] require-dev PHPUnit bridge [FrameworkBundle] Fixed Shell logo [2.3] Update CONTRIBUTING.md [2.3][Process] Fixed PhpProcess::getCommandLine() result [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments Enforce UTF-8 charset for core controllers Conflicts: CONTRIBUTING.md src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php src/Symfony/Component/Console/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Templating/composer.json
| * | [Security] Fix expectation in a test.Jakub Zalas2015-02-191-2/+2
| | |
* | | [PhpUnitBridge] new bridge for testing with PHPUnitNicolas Grekas2015-02-182-3/+2
| | |
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-02-112-3/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (21 commits) [FrameworkBundle] Fix title and placeholder rendering in php form templates. [TwigBridge] Removed duplicated code from TwigRenderer [Translator][Logging] implement TranslatorBagInterface. RequestDataCollector - small fix renamed composer.phar to composer to be consistent with the Symfony docs [FrameworkBundle] bumped min version of Routing to 2.3 removed composer --dev option everywhere fixed a test [Console] Fixed output bug, if escaped string in a formatted string. “console help” ignores --raw option Fix form icon position in web profiler [Security] Remove ContextListener's onKernelResponse listener as it is used Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)" Revert "fixed assertion" fixed assertion [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value fixed URL Add reference to documentation in FormEvents phpdocs [YAML] Fix one-liners to work with multiple new lines Keep "pre" meaning for var_dump quick-and-dirty debug ... Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Security/Http/Firewall/ContextListener.php src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
| * | Merge branch '2.3' into 2.6Fabien Potencier2015-02-112-3/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [FrameworkBundle] Fix title and placeholder rendering in php form templates. RequestDataCollector - small fix renamed composer.phar to composer to be consistent with the Symfony docs [FrameworkBundle] bumped min version of Routing to 2.3 removed composer --dev option everywhere fixed a test [Console] Fixed output bug, if escaped string in a formatted string. [Security] Remove ContextListener's onKernelResponse listener as it is used Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)" Revert "fixed assertion" fixed assertion [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value fixed URL Add reference to documentation in FormEvents phpdocs [YAML] Fix one-liners to work with multiple new lines Keep "pre" meaning for var_dump quick-and-dirty debug [Console][Table] Fix cell padding with multi-byte Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Helper/TableHelper.php
| | * bug #13466 [Security] Remove ContextListener's onKernelResponse listener as ↵Fabien Potencier2015-02-051-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is used (davedevelopment) This PR was squashed before being merged into the 2.3 branch (closes #13466). Discussion ---------- [Security] Remove ContextListener's onKernelResponse listener as it is used | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The context listeners are specific to a particular firewall, and as such, should not be applied if the current request doesn't match that context listener. To avoid this, the context listener can remove itself from the dispatcher as it is called. This comes in to affect when two or more firewalls are setup and using the same kernel for multiple requests. Assuming there are two firewalls 'site' and 'admin' - Request comes in matching 'site' firewall, 'site' ContextListener adds it's onKernelResponse method to the dispatcher - Succesful auth for 'site' - ContextListener writes token to session - Request comes in matching 'admin' firewall, 'admin' ContextListener can't find anything in the session, so nulls the token in the security context - 'site' ContextListener listens for response, can't find a token in the security context so removes the 'site' token from the session Commits ------- 380d805 [Security] Remove ContextListener's onKernelResponse listener as it is used
| | | * [Security] Remove ContextListener's onKernelResponse listener as it is usedDave Marshall2015-02-051-0/+3
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-253-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning Removed dead code and various cleaning [FrameworkBundle][xsd] added missing logging attribute. [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed
| * | | Merge branch '2.5' into 2.6v2.6.4Fabien Potencier2015-01-253-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
| | * \ \ Merge branch '2.3' into 2.5v2.5.12v2.5.11v2.5.10origin/2.5Fabien Potencier2015-01-253-4/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] [HttpFoundation] [MimeTypeGuesser] Removed dead code and various cleaning [Console] Make it clear that the second argument is not about command options. Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes [Yaml] fixed parse shortcut Key after unindented collection. [Console] fixed #10531 Make the container considered non-fresh if the environment parameters are changed Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig src/Symfony/Component/Console/Tests/ApplicationTest.php src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
| | | * | Removed dead code and various cleaningv2.3.25sarah khalil2015-01-213-4/+4
| | | |/
* | | | [SecurityBundle] decouple the logout PHP helper and Twig extensionFabien Potencier2015-01-211-0/+139
| | | |
* | | | [DX] Attempt to improve logging messages with parametersIltar van der Berg2015-01-1617-62/+70
| | | |
* | | | bumped min PHP version to 5.3.9Fabien Potencier2015-01-091-1/+1
| | | |
* | | | added type-hintFabien Potencier2015-01-0816-138/+57
| | | |
* | | | [Security] removed usage of the deprecated SecurityContextInterfaceFabien Potencier2015-01-0828-306/+363
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-081-0/+184
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 2.6: [Security] moved test files into the right place
| * | | Merge branch '2.5' into 2.6Fabien Potencier2015-01-081-0/+184
| |\ \ \ | | |/ / | | | | | | | | | | | | * 2.5: [Security] moved test files into the right place
| | * | [Security] moved test files into the right placeFabien Potencier2015-01-081-0/+184
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-072-1/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: bumped Symfony version to 2.6.4 updated VERSION for 2.6.3 updated CHANGELOG for 2.6.3 bumped Symfony version to 2.6.3 updated VERSION for 2.6.2 updated CHANGELOG for 2.6.2 bumped Symfony version to 2.5.10 updated VERSION for 2.5.9 updated CHANGELOG for 2.5.9 [FrameworkBundle] Use security.token_storage service in Controller::getUser() bumped Symfony version to 2.3.25 updated VERSION for 2.3.24 update CONTRIBUTORS for 2.3.24 Removed unneeded version requirements updated CHANGELOG for 2.3.24 fixed tests [Security] Don't destroy the session on buggy php releases. [Process] Fix input reset in WindowsPipes add back model_timezone and view_timezone options Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| * | | Merge branch '2.5' into 2.6v2.6.3Fabien Potencier2015-01-072-1/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: bumped Symfony version to 2.5.10 updated VERSION for 2.5.9 updated CHANGELOG for 2.5.9 bumped Symfony version to 2.3.25 updated VERSION for 2.3.24 update CONTRIBUTORS for 2.3.24 Removed unneeded version requirements updated CHANGELOG for 2.3.24 fixed tests [Security] Don't destroy the session on buggy php releases. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| | * | Merge branch '2.3' into 2.5v2.5.9Fabien Potencier2015-01-072-1/+21
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: bumped Symfony version to 2.3.25 updated VERSION for 2.3.24 update CONTRIBUTORS for 2.3.24 updated CHANGELOG for 2.3.24 fixed tests [Security] Don't destroy the session on buggy php releases. Conflicts: src/Symfony/Component/Console/Tests/Fixtures/application_2.json src/Symfony/Component/HttpKernel/Kernel.php
| | | * [Security] Don't destroy the session on buggy php releases.v2.3.24Alexander M. Turek2015-01-071-1/+4
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-01-033-5/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/ButtonBuilder.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
| * | | Merge branch '2.5' into 2.6Nicolas Grekas2015-01-033-5/+22
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig src/Symfony/Component/HttpKernel/composer.json
| | * | Merge branch '2.3' into 2.5Nicolas Grekas2015-01-031-4/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | adapted merge to 2.5Fabien Potencier2015-01-032-3/+2
| | | |
| | * | Merge branch '2.3' into 2.5Fabien Potencier2015-01-032-1/+23
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri Conflicts: src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php
| | | * adapted previous commit for 2.3Fabien Potencier2015-01-031-1/+2
| | | |
| | | * [Security] Don't send remember cookie for sub requestblanchonvincent2015-01-031-0/+4
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2015-01-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Updated copyright to 2015 Updated copyright to 2015 [VarDumper] increase debug.max_items to 2500 [Debug] Update exception messages. use value of DIRECTORY_SEPARATOR to detect Windows force ExpressionLanguage version >= 2.6 [Debug] fixes ClassNotFoundFatalErrorHandler to correctly handle class not found errors with Symfony ClassLoader component autoloaders. Clarify a comment. use PHP_WINDOWS_VERSION_BUILD to detect Windows Check if a field type_class is defined before using it. Currently if you want to use inline bootstrap form rendering, this is usually enough: Conflicts: src/Symfony/Component/Debug/composer.json
| * | | Merge branch '2.5' into 2.6Fabien Potencier2015-01-031-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Use PHPUnit ini_set wrapper in tests [Process] Added a test skip check for Windows [Process] Removed unused variable assignment Fixes various phpdoc and coding standards. Fixes Issue #13184 - incremental output getters now return empty strings Updated copyright to 2015 Updated copyright to 2015 Clarify a comment. Conflicts: src/Symfony/Component/HttpKernel/Fragment/EsiFragmentRenderer.php
| | * | Updated copyright to 2015Saro0h2015-01-011-1/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-304-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (21 commits) Updated generateSql tool Fix grammar Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger fix regression in form tests after pr #13027 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Make fabbot happy Clean up testing No global state for isolated tests and other fixes No global state for isolated tests and other fixes fix #10054 - form data collector with dynamic fields [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment [Debug] fix checkip6 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port Update the note about origins of the CssSelector component. Use the correct cssselect library name in docblocks. Fix wrong DateTransformer timezone param for non-UTC configuration. #12808 [Form] Add further timezone tests for date type ... Conflicts: src/Symfony/Component/Locale/Locale.php src/Symfony/Component/Locale/composer.json
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-304-4/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Updated generateSql tool Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger fix regression in form tests after pr #13027 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Make fabbot happy Clean up testing No global state for isolated tests and other fixes No global state for isolated tests and other fixes fix #10054 - form data collector with dynamic fields [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment [Debug] fix checkip6 [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port Update the note about origins of the CssSelector component. Use the correct cssselect library name in docblocks. [DomCrawler] fixed bug #12143 Conflicts: src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-304-4/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Updated generateSql tool Fix the implementation of deprecated Locale classes Fix phpdoc and coding standards Replace usages of the deprecated TypeTestCase by the new one Remove usages of deprecated constants Update functional tests to use the PSR NullLogger Make fabbot happy Clean up testing [DomCrawler] fixed bug #12143 Conflicts: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DomCrawler/Crawler.php src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Serializer/Encoder/EncoderInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
| * | | Merge branch '2.5' into 2.6Nicolas Grekas2014-12-251-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 2.5: [2.5] silence deprecation notices in new components [TwigBundle] added missing absolute URL in Twig exceptions
| | * | [2.5] silence deprecation notices in new componentsNicolas Grekas2014-12-241-0/+4
| | | |
* | | | [2.7] Allow 3.0 requirementsNicolas Grekas2014-12-271-6/+6
| | | |
* | | | [Security/Http] fix mock logger in testNicolas Grekas2014-12-251-4/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-2215-19/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-2215-19/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/Form/Form.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolver.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Stopwatch/Stopwatch.php src/Symfony/Component/Translation/Loader/XliffFileLoader.php src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-2215-19/+20
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] CS And DocBlock Fixes [2.3] CS Fixes Conflicts: src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
| | | * [2.3] CS And DocBlock FixesGraham Campbell2014-12-2215-19/+20
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-202-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (23 commits) [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 skip if param "translator.logging" doesn't exist. update required minimum TwigBridge version Very minor grammar fix in error message Added the function providers as container resources [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. [DebugBundle] enable the DumpDataCollectorPass [FrameworkBundle] Use debug namespace. [FrameworkBundle] update debug commands references skip compiler pass if interface doesn't exist Unify the way to provide expression functions for the DI container CS: There should be no empty lines following phpdocs fix link format handling with disabled templating [FrameworkBundle] fix cache:clear command ... Conflicts: src/Symfony/Bridge/Doctrine/phpunit.xml.dist src/Symfony/Bridge/Monolog/phpunit.xml.dist src/Symfony/Bridge/Propel1/phpunit.xml.dist src/Symfony/Bridge/ProxyManager/phpunit.xml.dist src/Symfony/Bridge/Twig/phpunit.xml.dist src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist src/Symfony/Bundle/TwigBundle/phpunit.xml.dist src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist src/Symfony/Component/BrowserKit/phpunit.xml.dist src/Symfony/Component/ClassLoader/phpunit.xml.dist src/Symfony/Component/Config/phpunit.xml.dist src/Symfony/Component/Console/phpunit.xml.dist src/Symfony/Component/CssSelector/phpunit.xml.dist src/Symfony/Component/Debug/phpunit.xml.dist src/Symfony/Component/DependencyInjection/phpunit.xml.dist src/Symfony/Component/DomCrawler/phpunit.xml.dist src/Symfony/Component/EventDispatcher/phpunit.xml.dist src/Symfony/Component/Filesystem/phpunit.xml.dist src/Symfony/Component/Finder/phpunit.xml.dist src/Symfony/Component/Form/phpunit.xml.dist src/Symfony/Component/HttpFoundation/phpunit.xml.dist src/Symfony/Component/HttpKernel/phpunit.xml.dist src/Symfony/Component/Intl/phpunit.xml.dist src/Symfony/Component/Locale/phpunit.xml.dist src/Symfony/Component/OptionsResolver/phpunit.xml.dist src/Symfony/Component/Process/phpunit.xml.dist src/Symfony/Component/PropertyAccess/phpunit.xml.dist src/Symfony/Component/Routing/phpunit.xml.dist src/Symfony/Component/Security/phpunit.xml.dist src/Symfony/Component/Serializer/phpunit.xml.dist src/Symfony/Component/Stopwatch/phpunit.xml.dist src/Symfony/Component/Templating/phpunit.xml.dist src/Symfony/Component/Translation/phpunit.xml.dist src/Symfony/Component/Validator/phpunit.xml.dist src/Symfony/Component/Yaml/phpunit.xml.dist
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-202-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: [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
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-202-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * [Security] Delete old session on auth strategy migrateAlexander Schwenn2014-12-201-1/+1
| | | |
* | | | [Security] Added the triggering of the security.interactive_login event ↵sarah khalil2014-12-162-6/+153
| | | | | | | | | | | | | | | | after set of token
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2014-12-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [2.6] Test lowest versions of dependencies Test lowest versions of dependencies Fix placeholder date format Test components using their lowest possible deps
| * | | [2.6] Test lowest versions of dependenciesNicolas Grekas2014-12-161-1/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-088-14/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (25 commits) Added information when an error occured during validation of an answer of a question Adding note about known BC issues Adding note about the PdoSessionHandler BC break [Console] fixes some typos and phpdoc. fix phpdoc's alignment [2.6] CS Fixes And Removed An Unused Import Minor phpcs fixes [ClassLoader] Fix undefined index in ClassCollectionLoader CS fixes Revert "minor #12821 Remove deprecated class (MasterB)" [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.6.2 updated VERSION for 2.6.1 updated CHANGELOG for 2.6.1 bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 ... Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| * | | [2.6] CS Fixes And Removed An Unused ImportGraham Campbell2014-12-074-6/+7
| | | |
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-12-054-8/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: CS fixes [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/HttpUtils.php src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
| | * | CS fixesGraham Campbell2014-12-042-6/+6
| | | |
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-12-043-3/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
| | | * CS fixesGraham Campbell2014-12-031-1/+0
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-12-024-12/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes [Filesystem] fix lock file permissions Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Fixed a docblock bumped Symfony version to 2.6.1 updated VERSION for 2.6.0 updated CHANGELOG for 2.6.0 removed unneeded check Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
| * | | Merge branch '2.5' into 2.6v2.6.1Fabien Potencier2014-12-024-12/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Yaml/Inline.php src/Symfony/Component/Yaml/Parser.php
| | * | Merge branch '2.3' into 2.5v2.5.8Fabien Potencier2014-12-024-12/+12
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: composer.json src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Templating/TemplateReference.php src/Symfony/Component/Templating/TemplateReferenceInterface.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/MetadataFactoryInterface.php
| | | * Docblock fixesGraham Campbell2014-11-303-11/+11
| | | |
* | | | [PHPUnit] ignore E_USER_DEPRECATED noticesChristian Flothmann2014-11-291-0/+6
| | | | | | | | | | | | | | | | | | | | This updates the PHPUnit configuration files that have not been updated in #12705.
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-11-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: (36 commits) [Debug] fix error message on double exception [Validator] make DateTime objects represented as strings in the violation message. [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener Upgrade information for the Translation component regarding the new LoggingTranslator class. [WebProfilerBundle] Remove usage of app.request in search bar template Fix initialized() with aliased services fix data type in docblock Rename Symfony2 to Symfony bumped Symfony version to 2.6.0 updated VERSION for 2.6.0-BETA2 updated CHANGELOG for 2.6.0-BETA2 [Debug] fix ENT_SUBSTITUTE usage compare version using PHP_VERSION_ID backport #12489 remove an unneeded check Remove block submit_widget reformat code as suggested by @fabpot Fix typo Make `\Request::get` more performant. properly set request attributes in controller test ...
| * | | fix data type in docblockChristian Flothmann2014-11-241-1/+1
| | | |
* | | | Merge branch '2.6' into 2.7Fabien Potencier2014-11-161-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Update filesystem readme.md to include exists method Add machine readable events Fixed minor typo [FrameworkBundle] Fix server start in case the PHP binary is not found Update UPGRADE-2.6.md [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector fixed typo [Translations] Added missing Hebrew language trans-unit sources [DependencyInjection] inlined factory not referenced Fixed case for empty folder Fixed whitespace control for password form widget [Routing] correctly initialize condition as string
| * | | Merge branch '2.5' into 2.6Fabien Potencier2014-11-161-0/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: Update filesystem readme.md to include exists method Add machine readable events [HttpKernel][2.6] Adding support for invokable controllers in the RequestDataCollector fixed typo [Translations] Added missing Hebrew language trans-unit sources [DependencyInjection] inlined factory not referenced Fixed case for empty folder Fixed whitespace control for password form widget [Routing] correctly initialize condition as string
| | * | Merge branch '2.3' into 2.5Fabien Potencier2014-11-161-0/+4
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Update filesystem readme.md to include exists method Add machine readable events fixed typo [Translations] Added missing Hebrew language trans-unit sources [DependencyInjection] inlined factory not referenced Fixed case for empty folder
| | | * Add machine readable eventsDaniel Wehner2014-11-161-0/+4
| | | |
* | | | updated version to 2.7Fabien Potencier2014-11-102-2/+2
|/ / /
* | | Remove aligned '=>' and '='Disquedur2014-11-042-7/+7
| | |
* | | Merge branch '2.5'v2.6.0-BETA1Fabien Potencier2014-11-031-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.5: added missing files [TwigBundle] added a test Indicate which file was being parsed if an exception is thrown while running translation:debug [ClassLoader] Cast $useIncludePath property to boolean [HttpFoundation] Minor spelling fix in PHPDocs improve error message for multiple documents Remove aligned '=>' and '=' [Session] remove invalid workaround in session regenerate [Kernel] ensure session is saved before sending response [Routing] serialize the compiled route to speed things up [Form] Fixed usage of "name" variable in form_start block [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns [DependencyInjection] use inheritdoc for loaders [Config] fix filelocator with empty name [Form] fix form handling with unconventional request methods like OPTIONS CSRF warning docs on Request::enableHttpMethodParameterOverride() Conflicts: src/Symfony/Component/Console/Helper/ProgressBar.php
| * | Remove aligned '=>' and '='Disquedur2014-10-301-3/+3
| | |
* | | Merge branch '2.5'Fabien Potencier2014-10-269-27/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Merge branch '2.3' into 2.5Fabien Potencier2014-10-2611-36/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Remove aligned '=>' and '='Disquedur2014-10-267-28/+28
| | |