diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:09:27 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:12:41 +0200 |
commit | d1087257354aca87ceeea2116cb20326354baa88 (patch) | |
tree | b7dace5670e1641930d0ce874ae5e4ba70344154 | |
parent | 9dcf8c062707f846771f87fd64a9dbc2cb417f49 (diff) | |
parent | 91520c37bd5317989094f5f9305ba0ce1c9a968f (diff) | |
download | symfony-security-d1087257354aca87ceeea2116cb20326354baa88.zip symfony-security-d1087257354aca87ceeea2116cb20326354baa88.tar.gz symfony-security-d1087257354aca87ceeea2116cb20326354baa88.tar.bz2 |
Merge branch '2.8'
* 2.8: (61 commits)
[Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
[2.6][Translator] Extend, refactor and simplify Translator tests.
[VarDumper] Allow preserving a subset of cut arrays
[Console] Bind the closure (code) to the Command if possible
[VarDumper] Added support for SplFileObject
[VarDumper] Added support for SplFileInfo
Update DebugClassLoader.php
inject asset packages in assets helper service
[travis] Do not exclude legacy tests on 2.7
[HttpFoundation] remove getExtension method
[2.6][Translation] fix legacy tests.
[Form] Removed remaining deprecation notices in the test suite
[Form] Moved deprecation notice triggers to file level
[Debug] Map PHP errors to LogLevel::CRITICAL
[FrameworkBundle][Server Command] add address port number option.
[Routing][DependencyInjection] Support .yaml extension in YAML loaders
[DX] improve file loader error for router/other resources in bundle
[FrameworkBundle] Initialize translator with the default locale.
[FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
[2.7][Translation] remove duplicate code for loading catalogue.
...
Conflicts:
composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Component/Console/Helper/DialogHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
src/Symfony/Component/Locale/composer.json
-rw-r--r-- | Acl/composer.json | 3 | ||||
-rw-r--r-- | Core/composer.json | 3 | ||||
-rw-r--r-- | Csrf/composer.json | 3 | ||||
-rw-r--r-- | Http/Firewall/DigestAuthenticationListener.php | 2 | ||||
-rw-r--r-- | Http/composer.json | 3 | ||||
-rw-r--r-- | composer.json | 3 |
6 files changed, 6 insertions, 11 deletions
diff --git a/Acl/composer.json b/Acl/composer.json index 95dec11..66ad4da 100644 --- a/Acl/composer.json +++ b/Acl/composer.json @@ -31,9 +31,8 @@ "doctrine/dbal": "For using the built-in ACL implementation" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Acl\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Acl\\": "" } }, - "target-dir": "Symfony/Component/Security/Acl", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/Core/composer.json b/Core/composer.json index 97cad4b..d073aef 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -34,9 +34,8 @@ "symfony/expression-language": "For using the expression voter" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Core\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Core\\": "" } }, - "target-dir": "Symfony/Component/Security/Core", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/Csrf/composer.json b/Csrf/composer.json index 8493ef3..bfeb913 100644 --- a/Csrf/composer.json +++ b/Csrf/composer.json @@ -27,9 +27,8 @@ "symfony/http-foundation": "For using the class SessionTokenStorage." }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Csrf\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" } }, - "target-dir": "Symfony/Component/Security/Csrf", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/Http/Firewall/DigestAuthenticationListener.php b/Http/Firewall/DigestAuthenticationListener.php index e459152..c5aaca3 100644 --- a/Http/Firewall/DigestAuthenticationListener.php +++ b/Http/Firewall/DigestAuthenticationListener.php @@ -161,7 +161,7 @@ class DigestData public function getUsername() { - return strtr($this->elements['username'], array("\\\"" => "\"", "\\\\" => "\\")); + return strtr($this->elements['username'], array('\\"' => '"', '\\\\' => '\\')); } public function validateAndDecode($entryPointKey, $expectedRealm) diff --git a/Http/composer.json b/Http/composer.json index f3ca7f1..27354e7 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -33,9 +33,8 @@ "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\Http\\": "" } + "psr-4": { "Symfony\\Component\\Security\\Http\\": "" } }, - "target-dir": "Symfony/Component/Security/Http", "minimum-stability": "dev", "extra": { "branch-alias": { diff --git a/composer.json b/composer.json index 16d94ac..2643362 100644 --- a/composer.json +++ b/composer.json @@ -47,9 +47,8 @@ "symfony/expression-language": "For using the expression voter" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\": "" } + "psr-4": { "Symfony\\Component\\Security\\": "" } }, - "target-dir": "Symfony/Component/Security", "minimum-stability": "dev", "extra": { "branch-alias": { |