summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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()
* | | | Merge branch '2.8'Nicolas Grekas2015-11-041-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: asset test coverage [HttpKernel] PostResponseEvent should extend the KernelEvent [travis] session.gc_probability=0 to fix transient tests on hhvm Write the log message on a single line againn [DI] Deprecate ContainerAware in favor of ContainerAwareTrait [VarDumper] Deprecate VarDumperTestCase in favor of the trait Check whether $this->logger is not null on GuardAuthenticationListener [Console] Add progress indicator helper Conflicts: .travis.yml
| * | | minor #16416 [Security][Guard] Check whether $this->logger is not null on ↵Fabien Potencier2015-11-041-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GuardAuthenticationListener (aeoris, Diego Agulló) This PR was merged into the 2.8 branch. Discussion ---------- [Security][Guard] Check whether $this->logger is not null on GuardAuthenticationListener | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16415 | License | MIT | Doc PR | Commits ------- ebc751d Write the log message on a single line againn 713b99f Check whether $this->logger is not null on GuardAuthenticationListener
| | * | | Write the log message on a single line againnDiego Agulló2015-11-031-4/+1
| | | | |
| | * | | Check whether $this->logger is not null on GuardAuthenticationListenerDiego Agulló2015-11-011-1/+6
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-11-032-6/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Security] Clean deps [Security][2.7] Clean deps [HttpKernel] Fix time-sensitive test case [travis] Fail early when an invalid composer.json is found Conflicts: src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/composer.json
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-11-032-4/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Security][2.7] Clean deps [HttpKernel] Fix time-sensitive test case [travis] Fail early when an invalid composer.json is found Conflicts: src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/composer.json
| | * | | [Security][2.7] Clean depsNicolas Grekas2015-11-032-4/+2
| | | | |
| * | | | [Security] Clean depsNicolas Grekas2015-11-031-4/+0
| | | | |
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-11-031-5/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * 2.7: [Security] Fix composer.json
| | * | | [Security] Fix composer.jsonNicolas Grekas2015-11-031-5/+0
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-11-025-55/+45
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: removed @covers annotations in tests removed @covers annotations in tests removed all @covers annotations checkCredentials() force it to be an affirmative yes! [PropertyAccess] Major performance improvement
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-11-022-52/+0
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | * 2.7: removed @covers annotations in tests removed all @covers annotations [PropertyAccess] Major performance improvement
| | * | 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
| | | | |
| * | | | feature #16395 checkCredentials() force it to be an affirmative yes! ↵Fabien Potencier2015-10-313-3/+45
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (weaverryan) This PR was squashed before being merged into the 2.8 branch (closes #16395). Discussion ---------- checkCredentials() force it to be an affirmative yes! | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no (because 2.8 isn't released) | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This changes `GuardAuthenticatorInterface::checkCredentials()`: you now *must* return true in order for authentication to pass. Before: You could do nothing (i.e. return null) and authentication would pass. You threw an AuthenticationException to cause a failure. New: You *must* return `true` for authentication to pass. If you do nothing, we will throw a `BadCredentialsException` on your behalf. You can still throw your own exception. This was a suggestion at symfony_live to make things more secure. I think it makes sense. Commits ------- 14acadd checkCredentials() force it to be an affirmative yes!
| | * | | | checkCredentials() force it to be an affirmative yes!Ryan Weaver2015-10-313-3/+45
| | | | | |
* | | | | | Merge branch '2.8'Fabien Potencier2015-10-305-5/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: added the new Composer exclude-from-classmap option added the new Composer exclude-from-classmap option fix docblock description for the build() method fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
| * | | | | Merge branch '2.7' into 2.8Fabien Potencier2015-10-305-5/+20
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: added the new Composer exclude-from-classmap option added the new Composer exclude-from-classmap option fix expected argument type docblock Set back libxml settings after testings. fixed Twig deprecation notices
| | * | | 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
| | | | |/
* | | | | feature #16381 remove polyfills for unsupported php versions (Tobion)Tobias Schultze2015-10-303-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was merged into the 3.0-dev branch. Discussion ---------- remove polyfills for unsupported php versions | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Remove obsolete polyfills in master as introduced in #16317 Commits ------- 78512cc remove polyfills for unsupported php versions
| * | | | | remove polyfills for unsupported php versionsTobias Schultze2015-10-293-5/+2
| | | | | |
* | | | | | [Security] remove obsolete test for removed StringUtilsTobias Schultze2015-10-301-63/+0
| | | | | |
* | | | | | [Security] remove deprecated SrtingUtils classTomas Votruba2015-10-301-70/+0
|/ / / / /
* | | | | Merge branch '2.8'Tobias Schultze2015-10-299-46/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/Form/Tests/FormRegistryTest.php src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php src/Symfony/Component/Intl/composer.json src/Symfony/Component/Ldap/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php src/Symfony/Component/VarDumper/composer.json
| * | | | Add the PHP 7 polyfill for the random_bytes functionPierre du Plessis2015-10-282-0/+2
| | | | |
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-10-271-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: 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
| | * | | 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.
| * | | | Rely on iconv and symfony/polyfill-*Nicolas Grekas2015-10-2811-82/+31
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-10-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix the FrameworkBundle dependencies [DoctrineBridge] Fix required guess of boolean fields [DI] don't use array_map to resolve services Remove dead code in the PropertyPath constructor [EventDispatcher] fix docblock [Process] Inherit env vars by default in PhpProcess Changed one console output style to avoid visual issues [VarDumper] Fix return type and anonymous classes dumping [FrameworkBundle] PropertyInfo support [HttpFoundation] Fixes /0 subnet handling in IpUtils [Form] Simplify DateTimeToStringTransformer Avoid unneeded catch and re-throw of the same exception. [Minor] [Serializer] Removed second license header [TwigBundle] added a Twig templates warmer when templating is disabled [HttpKernel] Remove a duplicate test for the EsiFragmentRenderer [Templating] deprecate low-level RouterHelper::generate method as it's cumbersome to use constants in templates [Templating] introduce path and url methods in php templates to be in line with twig templates [Routing] deprecate the old url generator reference type values [Routing] use constant in a test that is new in 2.7 [FrameworkBundle] Add a new ClassCache cache warmer [Validator] Add expressionLanguage to ExpressionValidator constructor Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/ClassCollectionLoader.php src/Symfony/Component/EventDispatcher/EventDispatcher.php
| * | | | [Routing] deprecate the old url generator reference type valuesTobias Schultze2015-10-181-1/+1
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-10-183-11/+90
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [Routing] use constants in tests [Process] tweaked README [TwigBundle] Fix Twig cache is not properly warmed [Validator] Allow an empty path in a URL with only a fragment or a query [Security] Use SessionAuthenticationStrategy on RememberMe login [HttpFoundation] Fix some typo in the Request doc fixed CS Added separated handling of root paths
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-10-181-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [Routing] use constants in tests [Process] tweaked README [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
| | * | | 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
| | | | |
| * | | | Merge branch '2.7' into 2.8Fabien Potencier2015-10-172-10/+88
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * 2.7: [TwigBundle] Fix Twig cache is not properly warmed [Security] Use SessionAuthenticationStrategy on RememberMe login
| | * | | [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
| | | | |
* | | | | Merge branch '2.8'Fabien Potencier2015-10-161-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Added UserLoaderInterface for loading users through Doctrine. Fix the detection of the deprecated usage of the ValidationListener Use entry_type instead of type [Form] Fix missing notice for deprecated `type` [DI] Autowiring: w/a https://bugs.php.net/62715
| * | | | Added UserLoaderInterface for loading users through Doctrine.Michal Trojanowski2015-10-161-2/+0
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-10-115-20/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: [PhpUnit] Auto-register SymfonyTestsListener [phpunit] Upgrade when a change is detected and when install subcommand is used [Filesystem] Fix test on Windows Fix merge [HttpFoundation] Extend ClockMock to session storage tests [Process] Don't use @requires on abstract class [VarDumper] Fix wordwrap with Bootstrap Fix the BC layer for the key->secret renaming for remember_me Fix potential access to undefined index Conflicts: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/Locale/phpunit.xml.dist
| * | | | [PhpUnit] Auto-register SymfonyTestsListenerNicolas Grekas2015-10-115-20/+0
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-10-1011-9/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.8: Fix merge [tests] Use @requires annotation when possible [tests] Use @requires annotation when possible [PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests [ci] Enable collecting and replaying skipped tests [tests] Use @requires annotation when possible [Process] Workaround buggy PHP warning [FrameworkBundle] Replace PhpFileCache by FilesystemCache [FrameworkBundle] composer suggest fix [Console] Add additional ways to detect OS400 platform [Yaml] Allow tabs before comments at the end of a line Added more tests for PropertyAccess Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php src/Symfony/Component/ClassLoader/composer.json src/Symfony/Component/Config/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/CssSelector/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/ExpressionLanguage/composer.json src/Symfony/Component/Filesystem/composer.json src/Symfony/Component/Finder/composer.json src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php src/Symfony/Component/Intl/composer.json src/Symfony/Component/Ldap/composer.json src/Symfony/Component/Locale/composer.json src/Symfony/Component/Locale/phpunit.xml.dist src/Symfony/Component/OptionsResolver/composer.json src/Symfony/Component/Process/composer.json src/Symfony/Component/PropertyAccess/composer.json src/Symfony/Component/PropertyInfo/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Guard/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Stopwatch/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php src/Symfony/Component/Validator/composer.json src/Symfony/Component/VarDumper/composer.json src/Symfony/Component/Yaml/composer.json
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-10-1012-13/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 2.7: [tests] Use @requires annotation when possible [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 Added more tests for PropertyAccess Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bridge/ProxyManager/composer.json src/Symfony/Bridge/Swiftmailer/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/DebugBundle/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/composer.json src/Symfony/Component/Asset/composer.json src/Symfony/Component/BrowserKit/composer.json src/Symfony/Component/ClassLoader/composer.json src/Symfony/Component/Config/composer.json src/Symfony/Component/Console/composer.json src/Symfony/Component/CssSelector/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/ExpressionLanguage/composer.json src/Symfony/Component/Filesystem/composer.json src/Symfony/Component/Finder/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Intl/composer.json src/Symfony/Component/Locale/composer.json src/Symfony/Component/OptionsResolver/composer.json src/Symfony/Component/Process/composer.json src/Symfony/Component/PropertyAccess/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/Acl/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Stopwatch/composer.json src/Symfony/Component/Templating/composer.json src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/Validator/composer.json src/Symfony/Component/VarDumper/composer.json src/Symfony/Component/Yaml/composer.json
| | * | | 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.8'Nicolas Grekas2015-10-074-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json
| * | | | cs fixNicolas Grekas2015-10-074-4/+4
| | | | |
* | | | | Fix merge, removing legacy TranslationSyncStatusTestNicolas Grekas2015-10-071-63/+0
| | | | |
* | | | | Merge branch '2.8'Nicolas Grekas2015-10-0718-444/+99
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php
| * | | | Deprecate the SecureRandom classPierre du Plessis2015-10-0612-177/+50
| | | | |
| * | | | Merge branch '2.7' into 2.8Nicolas Grekas2015-10-069-33/+78
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/composer.json
| | * | | 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
generated by cgit v1.1 at 2025-05-12 20:18:20 +0000