Skip to content

Commit 81e7643

Browse files
bnomeibnomei
committed
⬆️ upgraded dependencies
Signed-off-by: Bruno Meilick <[email protected]>
1 parent fe5d63d commit 81e7643

File tree

25 files changed

+1437
-1039
lines changed

25 files changed

+1437
-1039
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bnomei/kirby3-dotenv",
33
"type": "kirby-plugin",
4-
"version": "5.0.0",
4+
"version": "5.0.1",
55
"description": "Kirby Plugin for environment variables from .env",
66
"license": "MIT",
77
"authors": [

‎composer.lock‎

Lines changed: 1280 additions & 927 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/autoload.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';
2421

25-
return ComposerAutoloaderInitf069016ce632f353034284998eb6501c::getLoader();
22+
return ComposerAutoloaderInit49e6bf8868e0e26ebcf3cdf2a03233ec::getLoader();

‎vendor/composer/InstalledVersions.php‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,23 @@
2626
*/
2727
class InstalledVersions
2828
{
29+
/**
30+
* @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
31+
* @internal
32+
*/
33+
private static $selfDir = null;
34+
2935
/**
3036
* @var mixed[]|null
3137
* @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
3238
*/
3339
private static $installed;
3440

41+
/**
42+
* @var bool
43+
*/
44+
private static $installedIsLocalDir;
45+
3546
/**
3647
* @var bool|null
3748
*/
@@ -309,6 +320,24 @@ public static function reload($data)
309320
{
310321
self::$installed = $data;
311322
self::$installedByVendor = array();
323+
324+
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
325+
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
326+
// so we have to assume it does not, and that may result in duplicate data being returned when listing
327+
// all installed packages for example
328+
self::$installedIsLocalDir = false;
329+
}
330+
331+
/**
332+
* @return string
333+
*/
334+
private static function getSelfDir()
335+
{
336+
if (self::$selfDir === null) {
337+
self::$selfDir = strtr(__DIR__, '\\', '/');
338+
}
339+
340+
return self::$selfDir;
312341
}
313342

314343
/**
@@ -322,19 +351,27 @@ private static function getInstalled()
322351
}
323352

324353
$installed = array();
354+
$copiedLocalDir = false;
325355

326356
if (self::$canGetVendors) {
357+
$selfDir = self::getSelfDir();
327358
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
359+
$vendorDir = strtr($vendorDir, '\\', '/');
328360
if (isset(self::$installedByVendor[$vendorDir])) {
329361
$installed[] = self::$installedByVendor[$vendorDir];
330362
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331363
/** @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[]}>} $required */
332364
$required = require $vendorDir.'/composer/installed.php';
333-
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334-
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335-
self::$installed = $installed[count($installed) - 1];
365+
self::$installedByVendor[$vendorDir] = $required;
366+
$installed[] = $required;
367+
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
368+
self::$installed = $required;
369+
self::$installedIsLocalDir = true;
336370
}
337371
}
372+
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
373+
$copiedLocalDir = true;
374+
}
338375
}
339376
}
340377

@@ -350,7 +387,7 @@ private static function getInstalled()
350387
}
351388
}
352389

353-
if (self::$installed !== array()) {
390+
if (self::$installed !== array() && !$copiedLocalDir) {
354391
$installed[] = self::$installed;
355392
}
356393

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInitf069016ce632f353034284998eb6501c
5+
class ComposerAutoloaderInit49e6bf8868e0e26ebcf3cdf2a03233ec
66
{
77
private static $loader;
88

@@ -24,16 +24,16 @@ public static function getLoader()
2424

2525
require __DIR__ . '/platform_check.php';
2626

27-
spl_autoload_register(array('ComposerAutoloaderInitf069016ce632f353034284998eb6501c', 'loadClassLoader'), true, true);
27+
spl_autoload_register(array('ComposerAutoloaderInit49e6bf8868e0e26ebcf3cdf2a03233ec', 'loadClassLoader'), true, true);
2828
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
29-
spl_autoload_unregister(array('ComposerAutoloaderInitf069016ce632f353034284998eb6501c', 'loadClassLoader'));
29+
spl_autoload_unregister(array('ComposerAutoloaderInit49e6bf8868e0e26ebcf3cdf2a03233ec', 'loadClassLoader'));
3030

3131
require __DIR__ . '/autoload_static.php';
32-
call_user_func(\Composer\Autoload\ComposerStaticInitf069016ce632f353034284998eb6501c::getInitializer($loader));
32+
call_user_func(\Composer\Autoload\ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec::getInitializer($loader));
3333

3434
$loader->register(true);
3535

36-
$filesToLoad = \Composer\Autoload\ComposerStaticInitf069016ce632f353034284998eb6501c::$files;
36+
$filesToLoad = \Composer\Autoload\ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec::$files;
3737
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3838
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3939
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitf069016ce632f353034284998eb6501c
7+
class ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec
88
{
99
public static $files = array (
1010
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -146,9 +146,9 @@ class ComposerStaticInitf069016ce632f353034284998eb6501c
146146
public static function getInitializer(ClassLoader $loader)
147147
{
148148
return \Closure::bind(function () use ($loader) {
149-
$loader->prefixLengthsPsr4 = ComposerStaticInitf069016ce632f353034284998eb6501c::$prefixLengthsPsr4;
150-
$loader->prefixDirsPsr4 = ComposerStaticInitf069016ce632f353034284998eb6501c::$prefixDirsPsr4;
151-
$loader->classMap = ComposerStaticInitf069016ce632f353034284998eb6501c::$classMap;
149+
$loader->prefixLengthsPsr4 = ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec::$prefixLengthsPsr4;
150+
$loader->prefixDirsPsr4 = ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec::$prefixDirsPsr4;
151+
$loader->classMap = ComposerStaticInit49e6bf8868e0e26ebcf3cdf2a03233ec::$classMap;
152152

153153
}, null, ClassLoader::class);
154154
}

‎vendor/composer/installed.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php return array(
22
'root' => array(
33
'name' => 'bnomei/kirby3-dotenv',
4-
'pretty_version' => '5.0.0',
5-
'version' => '5.0.0.0',
4+
'pretty_version' => '5.0.1',
5+
'version' => '5.0.1.0',
66
'reference' => null,
77
'type' => 'kirby-plugin',
88
'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
1111
),
1212
'versions' => array(
1313
'bnomei/kirby3-dotenv' => array(
14-
'pretty_version' => '5.0.0',
15-
'version' => '5.0.0.0',
14+
'pretty_version' => '5.0.1',
15+
'version' => '5.0.1.0',
1616
'reference' => null,
1717
'type' => 'kirby-plugin',
1818
'install_path' => __DIR__ . '/../../',
@@ -38,45 +38,45 @@
3838
'dev_requirement' => false,
3939
),
4040
'phpoption/phpoption' => array(
41-
'pretty_version' => '1.9.3',
42-
'version' => '1.9.3.0',
43-
'reference' => 'e3fac8b24f56113f7cb96af14958c0dd16330f54',
41+
'pretty_version' => '1.9.4',
42+
'version' => '1.9.4.0',
43+
'reference' => '638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d',
4444
'type' => 'library',
4545
'install_path' => __DIR__ . '/../phpoption/phpoption',
4646
'aliases' => array(),
4747
'dev_requirement' => false,
4848
),
4949
'symfony/polyfill-ctype' => array(
50-
'pretty_version' => 'v1.31.0',
51-
'version' => '1.31.0.0',
50+
'pretty_version' => 'v1.33.0',
51+
'version' => '1.33.0.0',
5252
'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
5555
'aliases' => array(),
5656
'dev_requirement' => false,
5757
),
5858
'symfony/polyfill-mbstring' => array(
59-
'pretty_version' => 'v1.31.0',
60-
'version' => '1.31.0.0',
61-
'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341',
59+
'pretty_version' => 'v1.32.0',
60+
'version' => '1.32.0.0',
61+
'reference' => '6d857f4d76bd4b343eac26d6b539585d2bc56493',
6262
'type' => 'library',
6363
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
6464
'aliases' => array(),
6565
'dev_requirement' => false,
6666
),
6767
'symfony/polyfill-php80' => array(
68-
'pretty_version' => 'v1.31.0',
69-
'version' => '1.31.0.0',
70-
'reference' => '60328e362d4c2c802a54fcbf04f9d3fb892b4cf8',
68+
'pretty_version' => 'v1.33.0',
69+
'version' => '1.33.0.0',
70+
'reference' => '0cc9dd0f17f61d8131e7df6b84bd344899fe2608',
7171
'type' => 'library',
7272
'install_path' => __DIR__ . '/../symfony/polyfill-php80',
7373
'aliases' => array(),
7474
'dev_requirement' => false,
7575
),
7676
'vlucas/phpdotenv' => array(
77-
'pretty_version' => 'v5.6.1',
78-
'version' => '5.6.1.0',
79-
'reference' => 'a59a13791077fe3d44f90e7133eb68e7d22eaff2',
77+
'pretty_version' => 'v5.6.2',
78+
'version' => '5.6.2.0',
79+
'reference' => '24ac4c74f91ee2c193fa1aaa5c249cb0822809af',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../vlucas/phpdotenv',
8282
'aliases' => array(),

‎vendor/composer/platform_check.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
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;
2020
}
2121
}
22-
trigger_error(
23-
'Composer detected issues in your platform: ' . implode(' ', $issues),
24-
E_USER_ERROR
22+
throw new \RuntimeException(
23+
'Composer detected issues in your platform: ' . implode(' ', $issues)
2524
);
2625
}

‎vendor/symfony/polyfill-mbstring/Mbstring.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ public static function mb_ltrim(string $string, ?string $characters = null, ?str
983983

984984
public static function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string
985985
{
986-
return self::mb_internal_trim('{[%s]+$}D', $string, $characters, $encoding, __FUNCTION__);
986+
return self::mb_internal_trim('{[%s]+$}Du', $string, $characters, $encoding, __FUNCTION__);
987987
}
988988

989989
private static function mb_internal_trim(string $regex, string $string, ?string $characters, ?string $encoding, string $function): string

‎vendor/symfony/polyfill-mbstring/bootstrap80.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $
133133
}
134134

135135
if (!function_exists('mb_ucfirst')) {
136-
function mb_ucfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
136+
function mb_ucfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
137137
}
138138

139139
if (!function_exists('mb_lcfirst')) {
140-
function mb_lcfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
140+
function mb_lcfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
141141
}
142142

143143
if (!function_exists('mb_trim')) {

0 commit comments

Comments
 (0)