Make sure autoloader closures do not have a scope class set

Author: Seldaek

src/Composer/Autoload/AutoloadGenerator.php

@@ -1021,13 +1021,13 @@ public static function getLoader()
         if ($useIncludeFiles) {
             $file .= <<<INCLUDE_FILES
         \$filesToLoad = \Composer\Autoload\ComposerStaticInit$suffix::\$files;
-        \$requireFile = static function (\$fileIdentifier, \$file) {
+        \$requireFile = \Closure::bind(static function (\$fileIdentifier, \$file) {
             if (empty(\$GLOBALS['__composer_autoload_files'][\$fileIdentifier])) {
                 \$GLOBALS['__composer_autoload_files'][\$fileIdentifier] = true;
 
                 require \$file;
             }
-        };
+        }, null, null);
         foreach (\$filesToLoad as \$fileIdentifier => \$file) {
             (\$requireFile)(\$fileIdentifier, \$file);
         }

src/Composer/Autoload/ClassLoader.php

@@ -574,8 +574,8 @@ private static function initializeIncludeClosure(): void
          * @param  string $file
          * @return void
          */
-        self::$includeFile = static function($file) {
+        self::$includeFile = \Closure::bind(static function($file) {
             include $file;
-        };
+        }, null, null);
     }
 }

tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php

@@ -32,13 +32,13 @@ public static function getLoader()
         $loader->register(true);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::$files;
-        $requireFile = static function ($fileIdentifier, $file) {
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
                 require $file;
             }
-        };
+        }, null, null);
         foreach ($filesToLoad as $fileIdentifier => $file) {
             ($requireFile)($fileIdentifier, $file);
         }

tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php

@@ -32,13 +32,13 @@ public static function getLoader()
         $loader->register(true);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInitFilesAutoload::$files;
-        $requireFile = static function ($fileIdentifier, $file) {
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
                 require $file;
             }
-        };
+        }, null, null);
         foreach ($filesToLoad as $fileIdentifier => $file) {
             ($requireFile)($fileIdentifier, $file);
         }

tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php

@@ -36,13 +36,13 @@ public static function getLoader()
         $loader->register(true);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInitFilesAutoload::$files;
-        $requireFile = static function ($fileIdentifier, $file) {
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
                 require $file;
             }
-        };
+        }, null, null);
         foreach ($filesToLoad as $fileIdentifier => $file) {
             ($requireFile)($fileIdentifier, $file);
         }

tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php

@@ -34,13 +34,13 @@ public static function getLoader()
         $loader->register(true);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInitTargetDir::$files;
-        $requireFile = static function ($fileIdentifier, $file) {
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
                 require $file;
             }
-        };
+        }, null, null);
         foreach ($filesToLoad as $fileIdentifier => $file) {
             ($requireFile)($fileIdentifier, $file);
         }