Skip to content

Commit 60b546e

Browse files
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
2 parents b1c0a08 + 6e7611e commit 60b546e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Exception/AccessException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/**
1515
* Thrown when trying to read an option outside of or write it inside of
16-
* {@link Options::resolve()}.
16+
* {@link \Symfony\Component\OptionsResolver\Options::resolve()}.
1717
*
1818
* @author Bernhard Schussek <[email protected]>
1919
*/

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.8|~3.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)