summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [Security] add USERNAME_NONE_PROVIDED constantSofHad2016-01-253-2/+9
|
* Merge branch '3.0'Fabien Potencier2016-01-213-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | * 3.0: fixed CS fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension Remove unused imports [FrameworkBundle][Validator] Fix apc cache service deprecation
| * fixed CSFabien Potencier2016-01-211-1/+0
| |
| * minor #17465 Remove unused imports (Koc)Fabien Potencier2016-01-211-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 3.0 branch. Discussion ---------- Remove unused imports | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | wait travis | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- b8028f6 Remove unused imports
| | * Remove unused importsKonstantin.Myakshin2016-01-211-1/+0
| | |
| * | Merge branch '2.8' into 3.0Fabien Potencier2016-01-211-1/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * 2.8: fixed CS fixed CS fixed test fixed CS Remove default match from AbstractConfigCommand::findExtension [FrameworkBundle][Validator] Fix apc cache service deprecation
| | * fixed CSFabien Potencier2016-01-211-1/+0
| | |
| | * Merge branch '2.7' into 2.8Fabien Potencier2016-01-201-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: (28 commits) [Process] Use stream based storage to avoid memory issues Fix upgrade guides concerning erroneous removal of assets helper [Process] Remove a misleading comment Fix markdown typo ChooseBaseUrl should return an index [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced Improve the phpdoc of SplFileInfo methods [Process] Use stream based storage to avoid memory issues [FrameworkBundle] Don't log twice with the error handler Remove useless is_object condition [Process] Fix typo, no arguments needed anymore [Serializer] Introduce constants for context keys Fixed the documentation of VoterInterface::supportsAttribute Fixed Bootstrap form theme form "reset" buttons Remove useless duplicated tests [FrameworkBundle] Optimize framework extension tests synchronize 2.7 and 3.0 upgrade files fix merge 2.3 into 2.7 for SecureRandom dependency Use is_subclass_of instead of reflection Use is_subclass_of instead of Reflection when possible ...
| | | * Merge branch '2.3' into 2.7Fabien Potencier2016-01-201-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Process] Remove a misleading comment Improve the phpdoc of SplFileInfo methods [Process] Use stream based storage to avoid memory issues Fixed the documentation of VoterInterface::supportsAttribute Remove useless duplicated tests [FrameworkBundle] Optimize framework extension tests Use is_subclass_of instead of Reflection when possible
| | | | * Fixed the documentation of VoterInterface::supportsAttributeJavier Eguiluz2016-01-181-1/+1
| | | | |
| | * | | Merge branch '2.7' into 2.8v2.8.2Fabien Potencier2016-01-141-161/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: added missing requirement removed obsolete tests, fixed composer.json do not ship with a custom rng implementation
| | | * | added missing requirementv2.7.9Fabien Potencier2016-01-141-1/+2
| | | | |
| | | * | Merge branch '2.3' into 2.7Fabien Potencier2016-01-143-291/+3
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | * 2.3: removed obsolete tests, fixed composer.json do not ship with a custom rng implementation
| | | | * removed obsolete tests, fixed composer.jsonv2.3.37Fabien Potencier2016-01-142-205/+3
| | | | |
| | | | * do not ship with a custom rng implementationChristian Flothmann2016-01-142-91/+3
| | | | |
* | | | | minor #17166 Add placeholders into log messages (hason)Fabien Potencier2016-01-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 3.1-dev branch. Discussion ---------- Add placeholders into log messages | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15753 | License | MIT | Doc PR | Commits ------- c92fcdb Added placeholders to all log messages instead of hardcoded values
| * | | | | Added placeholders to all log messages instead of hardcoded valuesMartin Hasoň2015-12-291-1/+1
| | | | | |
* | | | | | Merge branch '3.0'Kévin Dunglas2016-01-131-4/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: (22 commits) [Yaml] Fix tests on PHP 7.0.2 [FrameworkBundle] Don't log twice with the error handler [2.7] Workaround https://bugs.php.net/63206 [2.3] Workaround https://bugs.php.net/63206 Add closing parenthesis [Serializer] Unset object_to_populate after using it Typo fix [WebProfiler] Fixed sf-minitoolbar height [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions [2.3] Static Code Analysis for Components [Serializer] Use $context['cache_key'] to enhance caching Removed non-existent directory from composer autoload Fixed erroneous deprecation notice for extended Interfaces [Routing] cs fix Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php [Serializer] Allow to use proxies in object_to_populate Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner ... Conflicts: src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
| * | | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-121-4/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Typo fix [WebProfiler] Fixed sf-minitoolbar height [2.3] Static Code Analysis for Components [Serializer] Use $context['cache_key'] to enhance caching Fixed erroneous deprecation notice for extended Interfaces [Routing] cs fix Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class [Serializer] ObjectNormalizer: context can contain not serializable data
| | * | | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-121-4/+2
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Typo fix [2.3] Static Code Analysis for Components Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class
| | | * | | Merge branch '2.3' into 2.7Fabien Potencier2016-01-121-4/+2
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Typo fix [2.3] Static Code Analysis for Components Added support \IteratorAggregate for UniqueEntityValidator Fix #17306 Paths with % in it are note allowed (like urlencoded) Added sort order SORT_STRING for params in UriSigner Remove normalizer cache in Serializer class
| | | | * | [2.3] Static Code Analysis for ComponentsVladimir Reznichenko2016-01-121-4/+2
| | | | | |
* | | | | | Merge branch '3.0'Fabien Potencier2016-01-035-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | * 3.0: updated copyright year updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| * | | | Merge branch '2.8' into 3.0Fabien Potencier2016-01-035-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: updated copyright year updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| | * | | updated copyright yearFabien Potencier2016-01-031-1/+1
| | | | |
| | * | | Merge branch '2.7' into 2.8Fabien Potencier2016-01-034-4/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: updated copyright year Update copyright year [2.3] Static Code Analysis for Components
| | | * | updated copyright yearFabien Potencier2016-01-034-4/+4
| | | | |
| | | * | Merge branch '2.3' into 2.7Fabien Potencier2016-01-031-1/+1
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | * 2.3: Update copyright year [2.3] Static Code Analysis for Components
| | | | * Update copyright yearDiego Saint Esteben2016-01-011-1/+1
| | | | |
| | | * | Merge branch '2.3' into 2.7Nicolas Grekas2015-12-282-3/+3
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [travis] timeout the sigchild tests at 60s CS: Single line comments should use double slashes (//) and not hash (#). Do not use HttpKernel Extension when not needed bumped Symfony version to 2.3.37 updated VERSION for 2.3.36 update CONTRIBUTORS for 2.3.36 updated CHANGELOG for 2.3.36 use nowdoc instead of heredoc Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php src/Symfony/Bundle/TwigBundle/Command/LintCommand.php src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php src/Symfony/Component/Debug/ExceptionHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
| | | | * minor #17086 CS: use nowdoc instead of heredoc (gharlan)Nicolas Grekas2015-12-282-3/+3
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- CS: use nowdoc instead of heredoc | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | — | License | MIT | Doc PR | — if this is accepted, we could add the fixer to symfony level of php-cs-fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1580 Commits ------- 3dca549 use nowdoc instead of heredoc
| | | | | * use nowdoc instead of heredocGregor Harlan2015-12-212-3/+3
| | | | | |
* | | | | | Merge branch '3.0'Fabien Potencier2015-12-261-9/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: fixed previous merge [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [DomCrawler] Revert previous restriction, allow selection of every DOMNode object [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| * | | | | Merge branch '2.8' into 3.0v3.0.1Fabien Potencier2015-12-261-9/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [DomCrawler] Revert previous restriction, allow selection of every DOMNode object [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| | * | | | Merge branch '2.7' into 2.8v2.8.1Fabien Potencier2015-12-261-9/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [2.7] Fixed flatten exception recursion with errors Embedded identifier support Also transform inline mappings to objects Change the ExtensionInterface load method definition to bo identical to the documentation. add and correct armenian translations [Config] Fix array sort on normalization in edge case [Security] Run tests on all PHP versions [Serializer] Make metadata interfaces internal [Yaml] fix indented line handling in folded blocks improve BrowserKit test coverage p1
| | | * | | [Security] Run tests on all PHP versionsv2.7.8Jakub Zalas2015-12-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | Symfony 2.7 supports PHP >= 5.3.9
* | | | | | Merge branch '3.0'Nicolas Grekas2015-12-221-0/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| * | | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-221-0/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| | * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-221-0/+9
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms
| | | * | | Merge branch '2.3' into 2.7Nicolas Grekas2015-12-221-0/+9
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Clean EOL whitespace [travis] Fix [Routing] Reduce memory usage of a high consuming test case use requires annotation skip bcrypt tests on incompatible platforms Conflicts: .travis.yml
| | | | * | use requires annotationv2.3.36Christian Flothmann2015-12-221-13/+9
| | | | | |
| | | | * | skip bcrypt tests on incompatible platformsChristian Flothmann2015-12-191-0/+13
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Not all PHP versions before 5.3.7 have backported fixes that make it possible to use `password_hash()` function. Therefore, we have to skip tests on not supported platforms.
* | | | | Merge branch '3.0'Nicolas Grekas2015-12-223-3/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: Fix merge [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Validator] Add missing pt_BR translation Fix doctrine bridge tests on older PHP versions [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks
| * | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-223-3/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix merge [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Validator] Add missing pt_BR translation Fix doctrine bridge tests on older PHP versions [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks Conflicts: src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
| | * | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-223-3/+7
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [SecurityBundle] Removing test insulations for a huge perf win [Validator] Use the new interface in the README [Filesystem] fix tests on 2.3 [Filesystem] Recursivly widen non-executable directories [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Console][Table] fixed render row with multiple cells. [Yaml] do not remove "comments" in scalar blocks Conflicts: src/Symfony/Component/Console/Application.php src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php src/Symfony/Component/Yaml/Tests/ParserTest.php
| | | * | Merge branch '2.3' into 2.7Fabien Potencier2015-12-183-3/+7
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too updated validators.bg.xlf [Security] Enable bcrypt validation and result length tests on all PHP versions [Security] Verify if a password encoded with bcrypt is no longer than 72 characters [Console] Avoid extra blank lines when rendering exceptions [Yaml] do not remove "comments" in scalar blocks
| | | | * [Security] Enable bcrypt validation and result length tests on all PHP versionsJakub Zalas2015-12-171-6/+0
| | | | |
| | | | * [Security] Verify if a password encoded with bcrypt is no longer than 72 ↵Jakub Zalas2015-12-173-3/+7
| | | | | | | | | | | | | | | | | | | | characters
* | | | | Merge branch '3.0'Nicolas Grekas2015-12-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line [FrameworkBundle] fixes outdated phpdoc on Controller::createForm() method. fix error level for deprecation Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto"
| * | | | Merge branch '2.8' into 3.0Nicolas Grekas2015-12-181-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line fix error level for deprecation Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto" Conflicts: .travis.yml UPGRADE-2.8.md appveyor.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpFoundation/ParameterBag.php
| | * | | Merge branch '2.7' into 2.8Nicolas Grekas2015-12-181-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: prefer phpunit 5.x on hhvm [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/composer.json
| | | * | Fix the logout path when not using the routerChristophe Coevoet2015-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This needs to use the base url, not the base path, so that it goes through the front controller when not using url rewriting.
* | | | | Merge branch '3.0'Tobias Schultze2015-12-152-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '2.8' into 3.0Tobias Schultze2015-12-152-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '2.7' into 2.8Tobias Schultze2015-12-151-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '2.3' into 2.7Tobias Schultze2015-12-151-1/+11
| | | |\ \ | | | | |/
| | | | * [Security] backported phpdoc from Guard component.Hugo Hamon2015-12-101-1/+11
| | | | |
| | * | | Added @return to checkCredentials()Alexander M. Turek2015-12-101-0/+2
| | | | |
| | * | | [Security] Fix a Polyfill import statement in StringUtilsBaptiste Lafontaine2015-12-081-1/+1
| | | | |
* | | | | Merge branch '3.0'Christophe Coevoet2015-12-051-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.0: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
| * | | | Merge branch '2.8' into 3.0Christophe Coevoet2015-12-051-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
| | * | | Merge branch '2.7' into 2.8Christophe Coevoet2015-12-051-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
| | | * | Merge branch '2.3' into 2.7Christophe Coevoet2015-12-052-4/+4
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
| | | | * CS: general fixesDariusz Ruminski2015-12-012-4/+4
| | | | |
| | | * | minor #16697 CS: remove impossible default argument value (keradus)Fabien Potencier2015-11-282-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- CS: remove impossible default argument value | 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 ------- acef3a3 CS: remove impossible default argument value
| | | | * | CS: remove impossible default argument valueDariusz Ruminski2015-11-262-2/+2
| | | | | |
* | | | | | updated version to 3.1Fabien Potencier2015-11-309-9/+9
|/ / / / /
* | | | | Merge branch '2.8'v3.0.0Fabien Potencier2015-11-301-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: add subject variable to expression context [Process] Fix signaling/stopping logic on Windows Forward compatibility with AbstractLayout* 2.8 tests [Yaml] minor CS cleaning [Console] do not encode backslashes in console default description
| * | | | add subject variable to expression contextv2.8.0Christian Flothmann2015-11-301-0/+1
| | | | |
* | | | | allow arbitrary types in VoterInterface::vote()Christian Flothmann2015-11-305-13/+13
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-11-294-2/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Bridge/Doctrine+Ldap] Fix tests Marked the Ldap component as internal and removed Ldap constants polyfill Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
| * | | | [Bridge/Doctrine+Ldap] Fix testsNicolas Grekas2015-11-292-0/+6
| | | | |
| * | | | feature #16735 [WIP] [Ldap] Marked the Ldap component as internal (csarrazi)Fabien Potencier2015-11-292-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.8 branch. Discussion ---------- [WIP] [Ldap] Marked the Ldap component as internal | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | no | Fixed tickets | no | License | MIT | Doc PR | not yet As mentioned earlier, the LDAP component suffers from a few problems, addressed in PR #15994 However, as raised by @Tobion, the component does not yet have tests (they can be added at a later time, though), and is not considered stable yet. Commits ------- 3f89b2c Marked the Ldap component as internal and removed Ldap constants polyfill
| | * | | | Marked the Ldap component as internal and removed Ldap constants polyfillCharles Sarrazin2015-11-282-2/+2
| | | | | |
* | | | | | Merge branch '2.8'Nicolas Grekas2015-11-291-0/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Bridge/Twig] Fix lowest form dep [Bridge/Doctrine] Fix legacy tests Make sure security.role_hierarchy.roles always exists [Form] Fix tests and reference usage [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty hierarchy Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListCompositeIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleAssociationToIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListSingleStringIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/AbstractEntityChoiceListTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListCompositeIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleAssociationToIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/LoadedEntityChoiceListSingleStringIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListCompositeIdWithQueryBuilderTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleAssociationToIntIdWithQueryBuilderTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdWithQueryBuilderTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdTest.php src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleStringIdWithQueryBuilderTest.php src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
| * | | | | [SecurityBundle] Fix disabling of RoleHierarchyVoter when passing empty ↵WouterJ2015-11-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | hierarchy
* | | | | | Merge branch '2.8'Fabien Potencier2015-11-281-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 2.8: [Security][SecurityBundle] Use csrf_token_id instead of deprecated intention
| * | | | | [Security][SecurityBundle] Use csrf_token_id instead of deprecated intentionJakub Zalas2015-11-285-7/+39
| |/ / / /
* | | | | feature #16692 [Form] Drop remaing CsrfProviderAdapter/Interface mentions ↵Fabien Potencier2015-11-285-47/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (nicolas-grekas) This PR was merged into the 3.0-dev branch. Discussion ---------- [Form] Drop remaing CsrfProviderAdapter/Interface mentions | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - CsrfProviderAdapter+Interface have already been removed from master, we should not use them anymore. Let's see if tests agree. Commits ------- 5bc34d2 [Form] Drop remaing CsrfProviderAdapter/Interface mentions
| * | | | | [Form] Drop remaing CsrfProviderAdapter/Interface mentionsNicolas Grekas2015-11-285-47/+11
| | | | | |
* | | | | | [Security] remove deprecated HTTP digest auth keyChristian Flothmann2015-11-282-11/+1
|/ / / / /
* | | | | Merge branch '2.8'Nicolas Grekas2015-11-263-87/+73
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Security] Deprecate "AbstractVoter" in favor of "Voter" [Security] Revert changes made between 2.7 and 2.8-beta Conflicts: UPGRADE-2.8.md src/Symfony/Component/Security/Core/Authorization/Voter/AbstractVoter.php src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php
| * | | | [Security] Deprecate "AbstractVoter" in favor of "Voter"Grégoire Pineau2015-11-242-0/+155
| | | | |
| * | | | [Security] Revert changes made between 2.7 and 2.8-betaNicolas Grekas2015-11-243-149/+41
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-11-234-4/+68
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: removed usage of the deprecated StringUtils::equals() method Fix: Resolve tempdir symlink, not working on OSX fixed tests migrate session after remember me authentication prevent timing attacks in digest auth listener mitigate CSRF timing attack vulnerability fix potential timing attack issue [WebProfilerBundle] Added a top left border radius to the minified to… [Routing] Changing RouteCollectionBuilder::import() behavior to add to the builder [HttpKernel] Don't reset on shutdown but in FrameworkBundle/Test/KernelTestCase [Process] PhpExecutableFinder: add regression test
| * | | | removed usage of the deprecated StringUtils::equals() methodFabien Potencier2015-11-232-4/+2
| | | | |
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-11-234-4/+70
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: fixed tests migrate session after remember me authentication prevent timing attacks in digest auth listener mitigate CSRF timing attack vulnerability fix potential timing attack issue
| | * | | Merge branch '2.3' into 2.7v2.7.7Fabien Potencier2015-11-234-4/+70
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: migrate session after remember me authentication prevent timing attacks in digest auth listener mitigate CSRF timing attack vulnerability fix potential timing attack issue
| | | * | security #16631 n/a (xabbuh)v2.3.35Fabien Potencier2015-11-232-0/+71
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- n/a n/a Commits ------- f88e600 migrate session after remember me authentication
| | | | * | migrate session after remember me authenticationChristian Flothmann2015-11-232-0/+71
| | | | | |
| | | * | | prevent timing attacks in digest auth listenerChristian Flothmann2015-11-231-1/+2
| | | | | |
| | | * | | fix potential timing attack issueChristian Flothmann2015-11-232-27/+4
| | | |/ /
* | | | | Merge branch '2.8'Nicolas Grekas2015-11-185-12/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix undefined array $server Fix call to undefined function json_last_error_message Fix bug in windows detection [ProxyManager] Tmp fix composer reqs issue in ZF Fix PropertyInfo extractor namespace in framework bundle Add missing exclusions from phpunit.xml.dist [Serializer] ObjectNormalizer: don't serialize static methods and props [Form] Enhance some FormRegistry deprecation messages [Validator] [sl] BIC (SWIFT-BIC) validation constraint [WebProfilerBundle] correct typo in show stack trace link bumped Symfony version to 2.8.0 updated VERSION for 2.8.0-BETA1 updated CHANGELOG for 2.8.0-BETA1 Fix the server variables in the router_*.php files [Validator] Allow an empty path with a non empty fragment or a query The following change adds support for Armenian pluralization. [2.3][Process] fix Proccess run with pts enabled Conflicts: src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php src/Symfony/Component/Form/FormRegistry.php
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-11-185-12/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: Fix undefined array $server Fix bug in windows detection [ProxyManager] Tmp fix composer reqs issue in ZF Add missing exclusions from phpunit.xml.dist [Serializer] ObjectNormalizer: don't serialize static methods and props Fix the server variables in the router_*.php files [Validator] Allow an empty path with a non empty fragment or a query The following change adds support for Armenian pluralization. [2.3][Process] fix Proccess run with pts enabled Conflicts: composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Component/Security/phpunit.xml.dist
| | * | | Merge branch '2.3' into 2.7Nicolas Grekas2015-11-185-11/+12
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Fix undefined array $server [ProxyManager] Tmp fix composer reqs issue in ZF Add missing exclusions from phpunit.xml.dist Fix the server variables in the router_*.php files [Validator] Allow an empty path with a non empty fragment or a query The following change adds support for Armenian pluralization. [2.3][Process] fix Proccess run with pts enabled Conflicts: composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bundle/DebugBundle/phpunit.xml.dist src/Symfony/Component/Security/phpunit.xml.dist
| | | * Add missing exclusions from phpunit.xml.distNicolas Grekas2015-11-181-1/+4
| | | |
* | | | Merge branch '2.8'v3.0.0-BETA1Fabien Potencier2015-11-105-20/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fixed tabs when there are several groups of tabs in the same page Fix mode Fixed failing test for HHVM Removed unused logic in MockStream Update coding standard for MockStream [Filesystem] added tempnam() stream wrapper aware version of PHP's native tempnam() and fixed dumpFile to allow dumping to streams Renamed key to secret
| * | | Renamed key to secretv2.8.0-BETA1WouterJ2015-11-075-20/+30
| | | |
* | | | Merge branch '2.8'Nicolas Grekas2015-11-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix tests when no Intl extension [VarDumper] Fix casting for ReflectionParameter [HttpKernel] Keep 3.0 compat by not using ContainerAware [DI] Clean a phpdoc [Security\Core] Deprecate passing $salt to BCryptPasswordEncoder::encodePassword() Conflicts: src/Symfony/Component/DependencyInjection/ContainerAware.php src/Symfony/Component/HttpKernel/Bundle/Bundle.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
| * | | [Security\Core] Deprecate passing $salt to ↵Nicolas Grekas2015-11-041-0/+2
| | | | | | | | | | | | | | | | BCryptPasswordEncoder::encodePassword()
generated by cgit v1.1 at 2025-06-07 10:41:42 +0000