CoreLibs update

This commit is contained in:
Clemens Schwaighofer
2026-01-06 18:22:17 +09:00
parent 4b015505ff
commit 40e6444c2a
50 changed files with 3216 additions and 709 deletions

View File

@@ -26,12 +26,23 @@ use Composer\Semver\VersionParser;
*/
class InstalledVersions
{
/**
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
* @internal
*/
private static $selfDir = null;
/**
* @var mixed[]|null
* @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
*/
private static $installed;
/**
* @var bool
*/
private static $installedIsLocalDir;
/**
* @var bool|null
*/
@@ -309,6 +320,24 @@ class InstalledVersions
{
self::$installed = $data;
self::$installedByVendor = array();
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
// so we have to assume it does not, and that may result in duplicate data being returned when listing
// all installed packages for example
self::$installedIsLocalDir = false;
}
/**
* @return string
*/
private static function getSelfDir()
{
if (self::$selfDir === null) {
self::$selfDir = strtr(__DIR__, '\\', '/');
}
return self::$selfDir;
}
/**
@@ -325,7 +354,9 @@ class InstalledVersions
$copiedLocalDir = false;
if (self::$canGetVendors) {
$selfDir = self::getSelfDir();
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
$vendorDir = strtr($vendorDir, '\\', '/');
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
@@ -333,11 +364,14 @@ class InstalledVersions
$required = require $vendorDir.'/composer/installed.php';
self::$installedByVendor[$vendorDir] = $required;
$installed[] = $required;
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
self::$installed = $required;
$copiedLocalDir = true;
self::$installedIsLocalDir = true;
}
}
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
$copiedLocalDir = true;
}
}
}

View File

@@ -7,35 +7,35 @@ namespace Composer\Autoload;
class ComposerStaticInit1b7cd5bacf2590b458d7a94400b505d4
{
public static $prefixLengthsPsr4 = array (
'g' =>
'g' =>
array (
'gullevek\\dotenv\\' => 16,
'gullevek\\dotEnv\\' => 16,
),
'P' =>
'P' =>
array (
'Psr\\Log\\' => 8,
),
'C' =>
'C' =>
array (
'CoreLibs\\' => 9,
),
);
public static $prefixDirsPsr4 = array (
'gullevek\\dotenv\\' =>
'gullevek\\dotenv\\' =>
array (
0 => __DIR__ . '/..' . '/gullevek/dotenv/src',
),
'gullevek\\dotEnv\\' =>
'gullevek\\dotEnv\\' =>
array (
0 => __DIR__ . '/..' . '/gullevek/dotenv/src',
),
'Psr\\Log\\' =>
'Psr\\Log\\' =>
array (
0 => __DIR__ . '/..' . '/psr/log/src',
),
'CoreLibs\\' =>
'CoreLibs\\' =>
array (
0 => __DIR__ . '/..' . '/egrajp/corelibs-composer-all/src',
),

View File

@@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All",
"reference": "ec1fb72ba95699907605ac1507fe4c4dd7349896"
"reference": "f765f50350a6364ba36d832ed5acfdb4b3c78143"
},
"require": {
"php": ">=8.2",
@@ -56,11 +56,23 @@
"name": "egrajp/smarty-extended",
"version": "4.5.2",
"version_normalized": "4.5.2.0",
"source": {
"type": "git",
"url": "https://git.egplusww.jp/Composer/Smarty-Extended",
"reference": "4.5.2"
},
"dist": {
"type": "zip",
"url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip",
"shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c"
},
"require": {
"ext-mbstring": "*",
"php": "^7.4 || ^8.0"
},
"require-dev": {
"egrajp/corelibs-composer-all": "^9"
},
"time": "2024-04-16T18:25:27+09:00",
"type": "library",
"installation-source": "dist",

View File

@@ -13,7 +13,7 @@
'egrajp/corelibs-composer-all' => array(
'pretty_version' => 'dev-development',
'version' => 'dev-development',
'reference' => 'ec1fb72ba95699907605ac1507fe4c4dd7349896',
'reference' => 'f765f50350a6364ba36d832ed5acfdb4b3c78143',
'type' => 'library',
'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all',
'aliases' => array(),
@@ -31,7 +31,7 @@
'egrajp/smarty-extended' => array(
'pretty_version' => '4.5.2',
'version' => '4.5.2.0',
'reference' => null,
'reference' => '4.5.2',
'type' => 'library',
'install_path' => __DIR__ . '/../egrajp/smarty-extended',
'aliases' => array(),

View File

@@ -19,8 +19,7 @@ if ($issues) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error(
'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR
throw new \RuntimeException(
'Composer detected issues in your platform: ' . implode(' ', $issues)
);
}