summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '2.3' into 2.7Fabien Potencier2016-01-251-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Request] Ignore invalid IP addresses sent by proxies Able to load big xml files with DomCrawler fixed typo [Form] Fix constraints could be null if not set [Finder] Check PHP version before applying a workaround for a PHP bug fixed CS sort bundles in config:dump-reference command Fixer findings.
| * Fixer findings.Possum2016-01-221-0/+4
| |
* | 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
| |
* | 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
| |
* | 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
| |
* | 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
| | |
* | | [Security] Run tests on all PHP versionsv2.7.8Jakub Zalas2015-12-231-9/+0
| | | | | | | | | | | | Symfony 2.7 supports PHP >= 5.3.9
* | | 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 '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
* | 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 '2.3' into 2.7Tobias Schultze2015-12-151-1/+11
|\ \ | |/
| * [Security] backported phpdoc from Guard component.Hugo Hamon2015-12-101-1/+11
| |
* | 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
| | |
* | | 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.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
| |
* | [Security][2.7] Clean depsNicolas Grekas2015-11-032-4/+2
| |
* | [Security] Fix composer.jsonNicolas Grekas2015-11-031-5/+0
| |
* | removed @covers annotations in testsFabien Potencier2015-11-021-3/+0
| |
* | Merge branch '2.3' into 2.7Fabien Potencier2015-11-022-49/+0
|\ \ | |/ | | | | | | | | * 2.3: removed all @covers annotations [PropertyAccess] Major performance improvement
| * minor #16414 removed all @covers annotations (fabpot)Fabien Potencier2015-11-022-49/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- removed all @covers annotations | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Some unit tests have a `@covers` PHPUnit annotations. Most of them were added a very long time ago, but since then, we did not use them anymore and the existing ones are not maintained (see #16413). So, I propose to remove them all. Commits ------- 1e0af36 removed all @covers annotations
| | * removed all @covers annotationsFabien Potencier2015-11-012-49/+0
| | |
* | | added the new Composer exclude-from-classmap optionFabien Potencier2015-10-304-4/+16
| | |
* | | Merge branch '2.3' into 2.7Fabien Potencier2015-10-301-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 2.3: added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
| * | minor #16397 added the new Composer exclude-from-classmap option (annesosensio)Fabien Potencier2015-10-301-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- added the new Composer exclude-from-classmap option | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 65bef75 added the new Composer exclude-from-classmap option
| | * | added the new Composer exclude-from-classmap optionAnne-Sophie Bachelard2015-10-301-1/+4
| | |/
* | | Merge branch '2.3' into 2.7Fabien Potencier2015-10-271-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: added missing quotes in YAML files [HttpKernel] Add `@group time-sensitive` on some transient tests [DoctrineBridge] Fix issue which prevent the profiler to explain a query Use mb_detect_encoding with $strict = true don't allow to install the split Security packages bumped Symfony version to 2.3.35 updated VERSION for 2.3.34 update CONTRIBUTORS for 2.3.34 updated CHANGELOG for 2.3.34
| * | bug #16144 [Security] don't allow to install the split Security packages ↵Fabien Potencier2015-10-271-0/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (xabbuh) This PR was merged into the 2.3 branch. Discussion ---------- [Security] don't allow to install the split Security packages | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16134 | License | MIT | Doc PR | Currently, you would be able to install the Security component fromm Symfony 2.3 together with one of the split packages from a higher Symfony vesion like this: ```json { "require": { "symfony/symfony": "2.3.*", "symfony/security-core": "~2.7" } } ``` However, you will end up with classes being present twice. This must be reverted after merging up in the `2.7` branch. Commits ------- 0d14064 don't allow to install the split Security packages
| | * don't allow to install the split Security packagesChristian Flothmann2015-10-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, you would be able to install the Security component fromm Symfony 2.3 together with one of the split packages from a higher Symfony vesion like this: ```json { "require": { "symfony/symfony": "2.3.*", "symfony/security-core": "~2.7" } } ``` However, you will end up with classes being present twice. This must be reverted after merging up in the `2.7` branch.
* | | Merge branch '2.3' into 2.7v2.7.6Fabien Potencier2015-10-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * 2.3: [Routing] use constants in tests [Validator] Allow an empty path in a URL with only a fragment or a query [HttpFoundation] Fix some typo in the Request doc fixed CS Added separated handling of root paths
| * | [Routing] use constants in testsv2.3.34Tobias Schultze2015-10-181-1/+2
| | |
* | | [Security] Use SessionAuthenticationStrategy on RememberMe loginSergey Novikov2015-10-162-10/+88
| | | | | | | | | | | | Regenerate session ID with default session strategy
* | | Merge branch '2.3' into 2.7Nicolas Grekas2015-10-122-8/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 2.3: [ci] Fix tests requirements Conflicts: src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
| * | [ci] Fix tests requirementsNicolas Grekas2015-10-123-19/+12
| | |
* | | Merge branch '2.3' into 2.7Nicolas Grekas2015-10-115-20/+0
|\ \ \ | |/ / | | | | | | | | | | | | * 2.3: [ci] SymfonyTestsListener is now auto-registered adds validation messages missing italian translations
| * | [ci] SymfonyTestsListener is now auto-registeredNicolas Grekas2015-10-111-4/+0
| | |
* | | minor #16186 [2.7][tests] Use @requires annotation when possible ↵Nicolas Grekas2015-10-102-8/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (nicolas-grekas) This PR was merged into the 2.7 branch. Discussion ---------- [2.7][tests] Use @requires annotation when possible | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- b028aea [tests] Use @requires annotation when possible
| * | | [tests] Use @requires annotation when possibleNicolas Grekas2015-10-102-8/+3
| | | |
* | | | Merge branch '2.3' into 2.7Nicolas Grekas2015-10-1010-5/+20
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [tests] Use @requires annotation when possible [ci] Enable collecting and replaying skipped tests [Process] Workaround buggy PHP warning [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Conflicts: composer.json src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.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/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json
| * | [ci] Enable collecting and replaying skipped testsNicolas Grekas2015-10-102-1/+4
| | |
* | | Merge branch '2.3' into 2.7Nicolas Grekas2015-10-064-26/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
| * | minor #16145 [FrameworkBundle] Fix deps=low/high tests (nicolas-grekas)Fabien Potencier2015-10-061-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.3 branch. Discussion ---------- [FrameworkBundle] Fix deps=low/high tests | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 26ca3dc [FrameworkBundle] Fix deps=low/high tests
| | * | [FrameworkBundle] Fix deps=low/high testsNicolas Grekas2015-10-061-0/+5
| | | |
| * | | [2.3][SECURITY] Add remember me cookie configurationKlaas Cuvelier2015-10-064-26/+5
| |/ /
| * | [FrameworkBundle] [Security] Remove trans from the security/core in 2.3 & ↵maxime.steinhausser2015-10-062-142/+0
| |/ | | | | | | dir loading
* | [Security] sync translations and add a test for itChristian Flothmann2015-10-064-6/+72
| |
* | Merge branch '2.3' into 2.7Nicolas Grekas2015-10-061-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Process/Process.php
| * [Security\Core] Fix test failure after sebastianbergmann/phpunit#1821Nicolas Grekas2015-10-061-1/+1
| |
* | Merge branch '2.3' into 2.7Fabien Potencier2015-10-056-23/+103
|\ \ | |/ | | | | | | | | | | | | | | * 2.3: [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] [ci] Use current PHP_BINARY when running ./phpunit Fixed typos [UPGRADE-3.0] fix bullet indentation [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
| * bug #14842 [Security][bugfix] "Remember me" cookie cleared on logout with ↵Fabien Potencier2015-10-054-6/+50
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom "secure"/"httponly" config options [1] (MacDada) This PR was squashed before being merged into the 2.3 branch (closes #14842). Discussion ---------- [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1] | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #14822 | License | MIT | Doc PR | ~ * test now always pass "secure" and "httponly" options, as they are required * could be considered BC, but [`RememberMeFactory` passes them](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php#L21), so they should've always been treated as required * I can squash the commits before merging * Alternative solution: #14843 Commits ------- 18b1c6a [Security][bugfix] "Remember me" cookie cleared on logout with custom "secure"/"httponly" config options [1]
| | * [Security][bugfix] "Remember me" cookie cleared on logout with custom ↵Dawid Nowak2015-10-054-6/+50
| | | | | | | | | | | | "secure"/"httponly" config options [1]
| * | bug #13627 [Security] InMemoryUserProvider now concerns whether user's ↵Fabien Potencier2015-10-052-17/+53
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password is changed when refreshing (issei-m) This PR was merged into the 2.3 branch. Discussion ---------- [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When a user has changed own password, I want to logout any sessions which is authenticated by its user except changer itself. [DaoAuthenticationManager::checkAuthentication()](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php#L59) method seems to concern about it. But, this situation actually never happens because both users that will be passed to this method are always identical in re-authentication. It's because the token refreshes own user via [ContextListener](https://github.com/symfony/symfony/blob/2.3/src/Symfony/Component/Security/Http/Firewall/ContextListener.php#L90) before re-authentication. Commits ------- 729902a [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing
| | * | [Security] InMemoryUserProvider now concerns whether user's password is ↵Issei.M2015-08-102-17/+53
| | | | | | | | | | | | | | | | changed when refreshing
* | | | Merge branch '2.3' into 2.7Tobias Schultze2015-09-291-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/DefinitionDecorator.php src/Symfony/Component/EventDispatcher/Event.php src/Symfony/Component/Filesystem/Exception/IOException.php src/Symfony/Component/HttpFoundation/File/File.php src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php src/Symfony/Component/HttpFoundation/Session/SessionInterface.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/HttpKernel.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/KernelInterface.php src/Symfony/Component/HttpKernel/Log/LoggerInterface.php src/Symfony/Component/HttpKernel/Log/NullLogger.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Routing/RequestContext.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Templating/EngineInterface.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Templating/TemplateNameParser.php src/Symfony/Component/Templating/TemplateReference.php src/Symfony/Component/Templating/TemplateReferenceInterface.php src/Symfony/Component/Translation/IdentityTranslator.php src/Symfony/Component/Translation/Translator.php src/Symfony/Component/Validator/ConstraintViolationInterface.php src/Symfony/Component/Validator/Constraints/False.php src/Symfony/Component/Validator/Constraints/FalseValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Constraints/Image.php src/Symfony/Component/Validator/Constraints/Null.php src/Symfony/Component/Validator/Constraints/NullValidator.php src/Symfony/Component/Validator/Constraints/True.php src/Symfony/Component/Validator/Constraints/TrueValidator.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/ValidatorInterface.php
| * | | Fixed incorrect and inconsistent translationslashae2015-09-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fiş" is a correct translation for "token", however "bilet" is also used, I fixed that inconsistency. Moreover, "kimlik bilgileri" is a better translation for "credentials" than "girdiler". "Girdiler" is the translation of "inputs", so I fixed sentences with "credentials". "Hesap engellenmiş" is better than "Hesap devre dışı bırakılmış" for "Account is disabled.". "Digest nonce has expired" can be translated better as "Derleme zaman aşımına uğradı." because "Derleme zaman aşımı gerçekleşti" has a confirmation sense like user requested it to expire and it has expired. References: token: http://tureng.com/search/token (3rd entry) credentials: http://www2.zargan.com/tr/q/credentials-ceviri-nedir (1st entry) disable: http://tureng.com/search/disable (15th entry)
* | | | minor #15942 [Security] Improve AbstractVoter tests (WouterJ)Fabien Potencier2015-09-281-46/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 2.7 branch. Discussion ---------- [Security] Improve AbstractVoter tests Applying the improved tests from https://github.com/symfony/symfony/pull/15932 into the oldest possible branch. Merge conflicts from 2.7 into 2.8 caused by this PR do not need to be done carefully, I'll create a new PR for 2.8 updating the tests as soon as these changes are merged up. | Q | A | ------------- | --- | Fixed tickets | - | License | MIT Commits ------- 5ff741d Readd the correct tests
| * | | | Readd the correct testsWouter J2015-09-271-46/+30
| | | | |
* | | | | [Security] fixed composer.jsonFabien Potencier2015-09-281-1/+1
|/ / / /
* | | | Merge branch '2.3' into 2.7Fabien Potencier2015-09-272-2/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Detect Mintty for color support on Windows Add a group for tests of the finder against the FTP server Fix license headers Forbid serializing a Crawler Fix phpdoc block of NativeSessionStorage class Added exception when setAutoInitialize is called when locked [FrameworkBundle] Advanced search templates of bundles [Security] Allow user providers to be defined in many files Use random_bytes function if it is available for random number generation
| * | | Use random_bytes function if it is available for random number generationPierre du Plessis2015-09-232-5/+10
| | | |
* | | | fixed testsv2.7.5Fabien Potencier2015-09-251-1/+1
| | | |
* | | | Fixing test locationsRyan Weaver2015-09-232-2/+2
| | | |
* | | | fix leftover changes from previous mergeTobias Schultze2015-09-091-1/+1
| | | |
* | | | fix class use and in phpdocEvgeniy Sokolov2015-09-091-1/+1
| | | |
* | | | Don't trigger deprecation on interfacesv2.7.4Nicolas Grekas2015-08-301-2/+0
| | | |
* | | | Merge branch '2.3' into 2.7Nicolas Grekas2015-08-262-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: Windows and Intl fixes Add appveyor.yml for C.I. on Windows [travis] merge php: nightly and deps=high test-matrix lines [Security] Add missing docblock in PreAuthenticatedToken Conflicts: .travis.yml src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/HttpFoundation/JsonResponse.php src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
| * | | [Security] Add missing docblock in PreAuthenticatedTokenv2.3.33v2.3.32Titouan Galopin2015-08-072-1/+8
| |/ /
* | | fixes CSFabien Potencier2015-08-2425-26/+40
| | |
* | | Merge branch '2.3' into 2.7v2.7.3Nicolas Grekas2015-07-281-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [php7] Fix for substr() always returning a string [Security] Do not save the target path in the session for a stateless firewall [DependencyInjection] fixed FrozenParameterBag and improved Parameter… Conflicts: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
| * | [Security] Do not save the target path in the session for a stateless firewallGrégoire Pineau2015-07-261-2/+6
| | |
* | | Merge branch '2.6' into 2.7Fabien Potencier2015-07-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Yaml] throw a ParseException on invalid data type #15331 add infos about deprecated classes to UPGRADE-3.0 [Security] removed useless else condition in SwitchUserListener class. [travis] Tests deps=low with PHP 5.6 [Console] Fix console output with closed stdout
| * \ \ Merge branch '2.3' into 2.6v2.6.11Fabien Potencier2015-07-261-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: #15331 add infos about deprecated classes to UPGRADE-3.0 [Security] removed useless else condition in SwitchUserListener class. [travis] Tests deps=low with PHP 5.6 [Console] Fix console output with closed stdout
| | * | [Security] removed useless else condition in SwitchUserListener class.Hugo Hamon2015-07-221-2/+2
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-07-241-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 2.6: [2.6] Static Code Analysis for Components [Security/Http] Fix test relying on a private property
| * | | [Security/Http] Fix test relying on a private propertyNicolas Grekas2015-07-221-4/+3
| | | |
* | | | Merge branch '2.6' into 2.7Nicolas Grekas2015-07-224-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json
| * | | Merge branch '2.3' into 2.6Nicolas Grekas2015-07-224-4/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.3: [Security] fix check for empty usernames [Form] updated exception message of ButtonBuilder::setRequestHandler() [travis] Fix deps=high jobs [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content [DependencyInjection] Remove unused code in XmlFileLoader [HttpFoundation] Behaviour change in PHP7 for substr bumped Symfony version to 2.3.32 updated VERSION for 2.3.31 update CONTRIBUTORS for 2.3.31 updated CHANGELOG for 2.3.31 Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/HttpKernel/Kernel.php
| | * | [Security] fix check for empty usernamesChristian Flothmann2015-07-224-4/+4
| | | |
* | | | Merge branch '2.6' into 2.7v2.7.2Fabien Potencier2015-07-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.6: Added 'default' color [HttpFoundation] Reload the session after regenerating its id [HttpFoundation] Add a test case to confirm a bug in session migration [2.6] Static Code Analysis for Components and Bundles [Finder] Command::addAtIndex() fails with Command instance argument [DependencyInjection] Freeze also FrozenParameterBag::remove [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig fix CS fixed CS Add a way to reset the singleton [Security] allow to use `method` in XML configs Remove duplicate example Remove var not used due to returning early (introduced in 8982c32) Enhance hhvm test skip message