Apply fix in #2300 to all autoloaders (#2867)

sreichel · web-flow · commit facc75b619d0 · 2022-12-30T10:21:18.000+01:00
diff --git a/lib/Mage/Autoload/Simple.php b/lib/Mage/Autoload/Simple.php
@@ -37,13 +37,14 @@ public static function register()
         spl_autoload_register([self::instance(), 'autoload']);
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.ErrorControlOperator)
-     */
     public function autoload($class)
     {
         $classFile = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class)));
         $classFile .= '.php';
-        @include $classFile;
+        /** @see https://stackoverflow.com/a/5504486/716029 */
+        $found = stream_resolve_include_path($classFile);
+        if ($found !== false) {
+            include $found;
+        }
     }
 }
diff --git a/lib/Magento/Autoload/Simple.php b/lib/Magento/Autoload/Simple.php
@@ -39,13 +39,14 @@ public static function register()
         spl_autoload_register([self::instance(), 'autoload']);
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.ErrorControlOperator)
-     */
     public function autoload($class)
     {
         $classFile = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class)));
         $classFile .= '.php';
-        @include $classFile;
+        /** @see https://stackoverflow.com/a/5504486/716029 */
+        $found = stream_resolve_include_path($classFile);
+        if ($found !== false) {
+            include $found;
+        }
     }
 }
diff --git a/lib/Varien/Autoload.php b/lib/Varien/Autoload.php
@@ -54,8 +54,6 @@ public static function register()
      * Load class source code
      *
      * @param string $class
-     *
-     * @SuppressWarnings(PHPMD.ErrorControlOperator)
      */
     public function autoload($class)
     {

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,14 @@ public static function register()`
`37`	`37`	`spl_autoload_register([self::instance(), 'autoload']);`
`38`	`38`	`}`
`39`	`39`
`40`		`- /**`
`41`		`- * @SuppressWarnings(PHPMD.ErrorControlOperator)`
`42`		`- */`
`43`	`40`	`public function autoload($class)`
`44`	`41`	`{`
`45`	`42`	`$classFile = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class)));`
`46`	`43`	`$classFile .= '.php';`
`47`		`- @include $classFile;`
	`44`	`+ /** @see https://stackoverflow.com/a/5504486/716029 */`
	`45`	`+ $found = stream_resolve_include_path($classFile);`
	`46`	`+ if ($found !== false) {`
	`47`	`+ include $found;`
	`48`	`+ }`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,14 @@ public static function register()`
`39`	`39`	`spl_autoload_register([self::instance(), 'autoload']);`
`40`	`40`	`}`
`41`	`41`
`42`		`- /**`
`43`		`- * @SuppressWarnings(PHPMD.ErrorControlOperator)`
`44`		`- */`
`45`	`42`	`public function autoload($class)`
`46`	`43`	`{`
`47`	`44`	`$classFile = str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class)));`
`48`	`45`	`$classFile .= '.php';`
`49`		`- @include $classFile;`
	`46`	`+ /** @see https://stackoverflow.com/a/5504486/716029 */`
	`47`	`+ $found = stream_resolve_include_path($classFile);`
	`48`	`+ if ($found !== false) {`
	`49`	`+ include $found;`
	`50`	`+ }`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public static function register()`
`54`	`54`	`* Load class source code`
`55`	`55`	`*`
`56`	`56`	`* @param string $class`
`57`		`- *`
`58`		`- * @SuppressWarnings(PHPMD.ErrorControlOperator)`
`59`	`57`	`*/`
`60`	`58`	`public function autoload($class)`
`61`	`59`	`{`