Explicitly require `psr/http-server-handler` composer dependency

diff --git a/wcfsetup/install/files/lib/system/api/autoload.php b/wcfsetup/install/files/lib/system/api/autoload.php
index 4a0e648118aefe4369e77fb6fd0a3db0da770590..b5930ce8fb81b0fa0a32363b2b3c2c631831cc0b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/autoload.php
+++ b/wcfsetup/install/files/lib/system/api/autoload.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 ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d::getLoader();

diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index f4555f91321cab7baa3301979ce2bae6c6e78193..ed1d1570d3a903feca7e89a457057a029235fd95 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -21,6 +21,7 @@
         "pear/net_idna2": "^0.2.0",
         "pelago/emogrifier": "^6.0.0",
         "scssphp/scssphp": "^1.10.2",
-        "true/punycode": "^2.1.1"
+        "true/punycode": "^2.1.1",
+        "psr/http-server-handler": "^1.0"
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index 4579fee145fd4213aba6eee506c3f7fcd490e797..f02949f9068c2cc1f7d3dae51cf37396cc5beb6b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "99009961280142468dc935e22652f5a2",
+    "content-hash": "a0515c273a984b19e05fad9d486e7e00",
     "packages": [
         {
             "name": "chrisjean/php-ico",
@@ -1687,5 +1687,5 @@
         "php": "8.1.2",
         "ext-gd": "0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php b/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php
index d50e0c9fcc47df4f65268ae1a0b4074990160486..41bc143c11489e9cc3e2138f7e32d4ea1f986ba1 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php
+++ b/wcfsetup/install/files/lib/system/api/composer/InstalledVersions.php
@@ -21,6 +21,8 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
index ad6c495a5b06b393c3576d413e649a5ce1072822..d46e3d6cbffe8e187f1298b50a3adda148984f9e 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
 
 return array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php
index 7c47b61b1fceaf184118910556810877e99c0d2c..2ffd9c6e2d8cda1ad2d84a47c6a917d2fa095d32 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php
@@ -2,7 +2,7 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
 
 return array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php
index 67a9a9a041f1961ca89cc0e5e2390e1d2b49d912..de98c728731646479df2f449e547d8fb4e534eed 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
 
 return array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
index 272956225b5c54ce548cf0f5eddfc1b03019cfc3..c1d9021093289b1012112118bfda8b0e0b1a375f 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
 
 return array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_real.php b/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
index 05eb3408c4d0a7f755a5d08bfd270945d4cb3a09..15e78e0228dca3c558098e62498be878efdd5a13 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
@@ -25,42 +25,19 @@ class ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d', 'loadClassLoader'), true, false);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::getInitializer($loader));
 
         $loader->register(false);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
+        $includeFiles = \Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequirea1f5f7c74275d47a45049a2936db1d0d($fileIdentifier, $file);
         }

diff --git a/wcfsetup/install/files/lib/system/api/composer/include_paths.php b/wcfsetup/install/files/lib/system/api/composer/include_paths.php
index 68aeefeb8d6d0fc5ed82d5de71a46a900aa32a86..0d7111cca361ee1b9cf37abc62a9920a2c4e8242 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/include_paths.php
+++ b/wcfsetup/install/files/lib/system/api/composer/include_paths.php
@@ -2,7 +2,7 @@
 
 // include_paths.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = $vendorDir;
 
 return array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json
index e39a38c9fe62afba66713a5c3385da64e85ae212..b0752a2c7c3337b79476fcb804edcfbde0e3e351 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@ -1718,6 +1718,6 @@
             "install-path": "../true/punycode"
         }
     ],
-    "dev": false,
+    "dev": true,
     "dev-package-names": []
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php
index 5df6748ca4cae13bb9202c5d00c37ba6316d80aa..7d95b59d4c5337ac27ba2fc7fb06d8a1c7841782 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@ -7,7 +7,7 @@
         'aliases' => array(),
         'reference' => NULL,
         'name' => '__root__',
-        'dev' => false,
+        'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(