diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:02:53 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-04-24 09:03:44 +0200 |
commit | 91520c37bd5317989094f5f9305ba0ce1c9a968f (patch) | |
tree | 94d455984db3adbb2a6ef5f0199d8f3c893fe39b | |
parent | 51d4d398f0eb03cd89075734599a0e1f4fbc996a (diff) | |
parent | c17ff740851d23d48e26ff922b45d0c695081015 (diff) | |
download | symfony-security-91520c37bd5317989094f5f9305ba0ce1c9a968f.zip symfony-security-91520c37bd5317989094f5f9305ba0ce1c9a968f.tar.gz symfony-security-91520c37bd5317989094f5f9305ba0ce1c9a968f.tar.bz2 |
Merge branch '2.7' into 2.8
* 2.7: (40 commits)
[Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
[2.6][Translator] Extend, refactor and simplify Translator tests.
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
[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.
[2.6][Translation] remove duplicate code for loading catalogue.
[HttpKernel] Cleanup ExceptionListener
CS fixes
[DependencyInjection] Show better error when the Yaml component is not installed
[2.3] SCA for Components - reference mismatches
...
-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 31f43f1..f293564 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 1b7e523..c16ff6b 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -36,9 +36,8 @@ "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5" }, "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 8311d62..14ae766 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 9c4dc1d..2b0041a 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 307759a..e3343ea 100644 --- a/composer.json +++ b/composer.json @@ -49,9 +49,8 @@ "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security\\": "" } + "psr-4": { "Symfony\\Component\\Security\\": "" } }, - "target-dir": "Symfony/Component/Security", "minimum-stability": "dev", "extra": { "branch-alias": { |