Merge branch '2.1'

fabpot · fabpot · commit 6755546b8c6e · 2013-01-27T17:49:19.000+01:00
* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
diff --git a/src/Symfony/Component/ClassLoader/DebugClassLoader.php b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -85,7 +85,7 @@ public function loadClass($class)
 
             if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
                 if (false !== strpos($class, '/')) {
-                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".'));
+                    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));
                 }
 
                 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));
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -149,7 +149,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
      *
      * @api
      */
-    public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvalidType = false, $objectSupport = false)
+    public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         $yaml = new Dumper();
         $yaml->setIndentation($indent);

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function loadClass($class)`
`85`	`85`
`86`	`86`	`if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') \|\| !trait_exists($class, false))) {`
`87`	`87`	`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));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`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));`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup`
`149`	`149`	`*`
`150`	`150`	`* @api`
`151`	`151`	`*/`
`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)`
`153`	`153`	`{`
`154`	`154`	`$yaml = new Dumper();`
`155`	`155`	`$yaml->setIndentation($indent);`