Allow autoload to run on 5.6 still, add early exits when running comp…

…oser or autoload.php with outdated PHP versions, fixes composer#10714, refs composer#10709
emahorvat52 · Jan 18, 2023 · 296d7b4 · 296d7b4
1 parent 0a4d95c
commit 296d7b4
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 7 deletions.
diff --git a/bin/composer b/bin/composer
@@ -5,6 +5,11 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
 }
 
+if (PHP_VERSION_ID < 70205) {
+    echo 'Composer 2.3.0 dropped support for PHP <7.2.5 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 setlocale(LC_ALL, 'C');
 require __DIR__.'/../src/bootstrap.php';
 

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
@@ -924,6 +924,11 @@ protected function getAutoloadFile($vendorPathToTargetDirCode, $suffix)
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once $vendorPathToTargetDirCode;
 
 return ComposerAutoloaderInit$suffix::getLoader();
@@ -1000,9 +1005,10 @@ public static function getLoader()
 INCLUDE_PATH;
         }
 
+        // keeping PHP 5.6+ compatibility for the autoloader here by using call_user_func vs getInitializer()()
         $file .= <<<STATIC_INIT
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInit$suffix::getInitializer(\$loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInit$suffix::getInitializer(\$loader));
 
 
 STATIC_INIT;

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_functions.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFilesAutoload::getLoader();
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_functions_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_functions_by_dependency.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFilesAutoloadOrder::getLoader();
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
@@ -27,7 +27,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoloadOrder', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoloadOrder::getInitializer($loader));
 
         $loader->register(true);
 

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
@@ -27,7 +27,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));
 
         $loader->register(true);
 

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php
@@ -31,7 +31,7 @@ public static function getLoader()
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));
 
         $loader->register(true);
 

diff --git a/...utoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php b/...utoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php
@@ -27,7 +27,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInitFilesAutoload', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitFilesAutoload::getInitializer($loader));
 
         $loader->register(true);
 

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
@@ -27,7 +27,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInitIncludePath', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitIncludePath::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitIncludePath::getInitializer($loader));
 
         $loader->setUseIncludePath(true);
         spl_autoload_register(array('ComposerAutoloaderInitIncludePath', 'autoload'), true, true);

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
@@ -27,7 +27,7 @@ public static function getLoader()
         spl_autoload_unregister(array('ComposerAutoloaderInitTargetDir', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        \Composer\Autoload\ComposerStaticInitTargetDir::getInitializer($loader)();
+        call_user_func(\Composer\Autoload\ComposerStaticInitTargetDir::getInitializer($loader));
 
         spl_autoload_register(array('ComposerAutoloaderInitTargetDir', 'autoload'), true, true);
 

diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php b/tests/Composer/Test/Autoload/Fixtures/autoload_target_dir.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitTargetDir::getLoader();