Skip to content

Commit 6e7611e

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 9fb3286 + 8be0525 commit 6e7611e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
"symfony/phpunit-bridge": "~2.7|~3.0.0"
2323
},
2424
"autoload": {
25-
"psr-0": { "Symfony\\Component\\OptionsResolver\\": "" }
25+
"psr-4": { "Symfony\\Component\\OptionsResolver\\": "" }
2626
},
27-
"target-dir": "Symfony/Component/OptionsResolver",
2827
"minimum-stability": "dev",
2928
"extra": {
3029
"branch-alias": {

0 commit comments

Comments
 (0)