merged branch Seldaek/ucl_exception (PR symfony#1825)

fabpot · fabpot · commit b463646ce02d · 2011-08-02T09:24:13.000+02:00
Commits ------- c0571fc [ClassLoader] Improve exception messages of the debug class loader Discussion ---------- [ClassLoader] Improve exception messages of the debug class loader --------------------------------------------------------------------------- by Seldaek at 2011/07/31 14:01:40 -0700 Ok, I updated this to just clarify the message, because when I got the issue after some serious copy-paste coding, I thought it was quite confusing - it seems to imply you mistyped the class name when using the class, and therefore it was not found, while the typo is in the class's file itself.
diff --git a/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php b/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
@@ -55,7 +55,7 @@ public function loadClass($class)
             require $file;
 
             if (!class_exists($class, false) && !interface_exists($class, false)) {
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". You probably have a typo in the namespace or the class name.', $class, $file));
+                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
`@@ -55,7 +55,7 @@ public function loadClass($class)`
`55`	`55`	`require $file;`
`56`	`56`
`57`	`57`	`if (!class_exists($class, false) && !interface_exists($class, false)) {`
`58`		`- throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". You probably have a typo in the namespace or the class name.', $class, $file));`
	`58`	`+ 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));`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`