8000 Merge branch '2.1' · symfony/symfony@6755546 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6755546

Browse files
fabpotfabpot
committed
Merge branch '2.1'
* 2.1: [Yaml] fixed wrong merge (indentation default is 4 as of 2.1) Fixed missing class argument when throwing exception
2 parents 163e607 + 6f71948 commit 6755546

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎src/Symfony/Component/ClassLoader/DebugClassLoader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function loadClass($class)
8585

8686
if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
8787
if (false !== strpos($class, '/')) {
88-
throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".'));
88+
throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
8989
}
9090

9191
throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));

‎src/Symfony/Component/Yaml/Yaml.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
149149
*
150150
* @api
151151
*/
152-
public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvalidType = false, $objectSupport = false)
152+
public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
153153
{
154154
$yaml = new Dumper();
155155
$yaml->setIndentation($indent);

0 commit comments

Comments
 (0)
0