Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 91520c3

Browse files
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 ...
2 parents 51d4d39 + c17ff74 commit 91520c3

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

Acl/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
"doctrine/dbal": "For using the built-in ACL implementation"
3232
},
3333
"autoload": {
34-
"psr-0": { "Symfony\\Component\\Security\\Acl\\": "" }
34+
"psr-4": { "Symfony\\Component\\Security\\Acl\\": "" }
3535
},
36-
"target-dir": "Symfony/Component/Security/Acl",
3736
"minimum-stability": "dev",
3837
"extra": {
3938
"branch-alias": {

Core/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
"ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5"
3737
},
3838
"autoload": {
39-
"psr-0": { "Symfony\\Component\\Security\\Core\\": "" }
39+
"psr-4": { "Symfony\\Component\\Security\\Core\\": "" }
4040
},
41-
"target-dir": "Symfony/Component/Security/Core",
4241
"minimum-stability": "dev",
4342
"extra": {
4443
"branch-alias": {

Csrf/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
"symfony/http-foundation": "For using the class SessionTokenStorage."
2828
},
2929
"autoload": {
30-
"psr-0": { "Symfony\\Component\\Security\\Csrf\\": "" }
30+
"psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" }
3131
},
32-
"target-dir": "Symfony/Component/Security/Csrf",
3332
"minimum-stability": "dev",
3433
"extra": {
3534
"branch-alias": {

Http/Firewall/DigestAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function getResponse()
161161

162162
public function getUsername()
163163
{
164-
return strtr($this->elements['username'], array("\\\"" => "\"", "\\\\" => "\\"));
164+
return strtr($this->elements['username'], array('\\"' => '"', '\\\\' => '\\'));
165165
}
166166

167167
public function validateAndDecode($entryPointKey, $expectedRealm)

Http/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
"symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs"
3434
},
3535
"autoload": {
36-
"psr-0": { "Symfony\\Component\\Security\\Http\\": "" }
36+
"psr-4": { "Symfony\\Component\\Security\\Http\\": "" }
3737
},
38-
"target-dir": "Symfony/Component/Security/Http",
3938
"minimum-stability": "dev",
4039
"extra": {
4140
"branch-alias": {

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949
"ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5"
5050
},
5151
"autoload": {
52-
"psr-0": { "Symfony\\Component\\Security\\": "" }
52+
"psr-4": { "Symfony\\Component\\Security\\": "" }
5353
},
54-
"target-dir": "Symfony/Component/Security",
5554
"minimum-stability": "dev",
5655
"extra": {
5756
"branch-alias": {

0 commit comments

Comments
 (0)