Autoload without hiding errors (#2300)

Flyingmana · web-flow · commit 6810c782eba3 · 2022-12-25T14:41:21.000Z
diff --git a/lib/Varien/Autoload.php b/lib/Varien/Autoload.php
@@ -57,6 +57,11 @@ public static function register()
      */
     public function autoload($class)
     {
-        return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';
+        $path = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';
+        /** @see https://stackoverflow.com/a/5504486/716029 */
+        $found = stream_resolve_include_path($path);
+        if ($found !== false) {
+            return include $found;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public static function register()`
`57`	`57`	`*/`
`58`	`58`	`public function autoload($class)`
`59`	`59`	`{`
`60`		`- return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';`
	`60`	`+ $path = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';`
	`61`	`+ /** @see https://stackoverflow.com/a/5504486/716029 */`
	`62`	`+ $found = stream_resolve_include_path($path);`
	`63`	`+ if ($found !== false) {`
	`64`	`+ return include $found;`
	`65`	`+ }`
`61`	`66`	`}`
`62`	`67`	`}`