diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-11-22 17:47:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 17:47:04 +0100 |
| commit | 8dcd992ad42bb7b2a3a7a7acab0987579f293e26 (patch) | |
| tree | ee8b2af702550754b0de8880999f63a502e521a5 /apps/federation | |
| parent | 603feb98f24c92992da025255b0e125ad9d169ba (diff) | |
| parent | f244406ebd54bd8eca160078c8513b57d0316f5b (diff) | |
| download | nextcloud-server-8dcd992ad42bb7b2a3a7a7acab0987579f293e26.tar.gz nextcloud-server-8dcd992ad42bb7b2a3a7a7acab0987579f293e26.zip | |
Merge pull request #34940 from nextcloud/feat/add-mastodon
Add mastodon and reorganize profile info section
Diffstat (limited to 'apps/federation')
| -rw-r--r-- | apps/federation/composer/autoload.php | 17 | ||||
| -rw-r--r-- | apps/federation/composer/composer/installed.php | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/apps/federation/composer/autoload.php b/apps/federation/composer/autoload.php index 77ae3e1c118..08b3d13070a 100644 --- a/apps/federation/composer/autoload.php +++ b/apps/federation/composer/autoload.php @@ -3,8 +3,21 @@ // 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); + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + $err = '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; + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, $err); + } elseif (!headers_sent()) { + echo $err; + } + } + trigger_error( + $err, + E_USER_ERROR + ); } require_once __DIR__ . '/composer/autoload_real.php'; diff --git a/apps/federation/composer/composer/installed.php b/apps/federation/composer/composer/installed.php index 5f83b3f2bff..ee1748532a9 100644 --- a/apps/federation/composer/composer/installed.php +++ b/apps/federation/composer/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '144514e49e25b7b123fd535902fee97fa39fb446', + 'reference' => 'e35bcc9381246a8ec3da96e78e9771ef6044a6d4', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '144514e49e25b7b123fd535902fee97fa39fb446', + 'reference' => 'e35bcc9381246a8ec3da96e78e9771ef6044a6d4', 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), |