Skip to content

Commit fa394ea

Browse files
slackeroslackero
committed
Updated composer packages
Updated: - enshrined/svg-sanitize (0.19.0 => 0.21.0) - symfony/polyfill-php80 (v1.30.0 => v1.31.0) - symfony/deprecation-contracts (v2.5.3 => v2.5.4) - symfony/polyfill-mbstring (v1.30.0 => v1.31.0) - league/commonmark (2.5.3 => 2.6.1) - myclabs/php-enum (1.8.4 => 1.8.5) - netcarver/textile (v4.1.1 => v4.1.3) - phpmailer/phpmailer (v6.9.1 => v6.9.3) - ezyang/htmlpurifier (v4.17.0 => v4.18.0) - phpoffice/phpspreadsheet (1.29.0 => 1.29.10) - simplepie/simplepie (dev-master 9385c54 => dev-master 72b4293) - symfony/polyfill-php81 (v1.30.0 => v1.31.0) - symfony/polyfill-php82 (v1.30.0 => v1.31.0) Installed: - composer/pcre (3.3.2) - symfony/polyfill-php73 (v1.31.0) - symfony/polyfill-php83 (v1.31.0)
1 parent 6629c55 commit fa394ea

192 files changed

Lines changed: 5158 additions & 1320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎composer.json‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,24 @@
99
"require": {
1010
"php": ">=7.4",
1111
"algo26-matthias/idna-convert": "^v3.1.1",
12-
"enshrined/svg-sanitize": "^0.19.0",
13-
"netcarver/textile": "v4.1.1",
14-
"league/commonmark": "^2.5.3",
15-
"ezyang/htmlpurifier": "^v4.17.0",
12+
"enshrined/svg-sanitize": "^0.21.0",
13+
"netcarver/textile": "v4.1.3",
14+
"league/commonmark": "^2.6.1",
15+
"ezyang/htmlpurifier": "^v4.18.0",
1616
"openpsa/universalfeedcreator": "^v1.9.0",
17-
"phpmailer/phpmailer": "^v6.9.1",
18-
"phpoffice/phpspreadsheet": "^1.29.0",
17+
"phpmailer/phpmailer": "^v6.9.3",
18+
"phpoffice/phpspreadsheet": "^1.29.10",
1919
"simplepie/simplepie": "@dev",
20-
"ext-intl": "*",
2120
"html2text/html2text": "^4.3.2",
21+
"symfony/polyfill-mbstring": "^v1.31.0",
22+
"symfony/polyfill-php73": "^v1.31.0",
23+
"symfony/polyfill-php80": "^v1.31.0",
24+
"symfony/polyfill-php81": "^v1.31.0",
25+
"symfony/polyfill-php82": "^v1.31.0",
26+
"symfony/polyfill-php83": "^v1.31.0",
27+
"ext-intl": "*",
2228
"ext-gd": "*",
2329
"ext-mysqli": "*",
24-
"ext-mbstring": "*",
25-
"symfony/polyfill-mbstring": "^v1.30.0",
26-
"symfony/polyfill-php80": "^v1.30.0",
27-
"symfony/polyfill-php81": "^v1.30.0",
28-
"symfony/polyfill-php82": "^v1.30.0"
30+
"ext-mbstring": "*"
2931
}
3032
}

‎include/vendor/composer/InstalledVersions.php‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ class InstalledVersions
3232
*/
3333
private static $installed;
3434

35+
/**
36+
* @var bool
37+
*/
38+
private static $installedIsLocalDir;
39+
3540
/**
3641
* @var bool|null
3742
*/
@@ -309,6 +314,12 @@ public static function reload($data)
309314
{
310315
self::$installed = $data;
311316
self::$installedByVendor = array();
317+
318+
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
319+
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
320+
// so we have to assume it does not, and that may result in duplicate data being returned when listing
321+
// all installed packages for example
322+
self::$installedIsLocalDir = false;
312323
}
313324

314325
/**
@@ -322,19 +333,27 @@ private static function getInstalled()
322333
}
323334

324335
$installed = array();
336+
$copiedLocalDir = false;
325337

326338
if (self::$canGetVendors) {
339+
$selfDir = strtr(__DIR__, '\\', '/');
327340
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341+
$vendorDir = strtr($vendorDir, '\\', '/');
328342
if (isset(self::$installedByVendor[$vendorDir])) {
329343
$installed[] = self::$installedByVendor[$vendorDir];
330344
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331345
/** @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 */
332346
$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];
347+
self::$installedByVendor[$vendorDir] = $required;
348+
$installed[] = $required;
349+
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
350+
self::$installed = $required;
351+
self::$installedIsLocalDir = true;
336352
}
337353
}
354+
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
355+
$copiedLocalDir = true;
356+
}
338357
}
339358
}
340359

@@ -350,7 +369,7 @@ private static function getInstalled()
350369
}
351370
}
352371

353-
if (self::$installed !== array()) {
372+
if (self::$installed !== array() && !$copiedLocalDir) {
354373
$installed[] = self::$installed;
355374
}
356375

‎include/vendor/composer/autoload_classmap.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212
'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
1313
'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',
1414
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
15+
'DateError' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateError.php',
16+
'DateException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateException.php',
17+
'DateInvalidOperationException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateInvalidOperationException.php',
18+
'DateInvalidTimeZoneException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateInvalidTimeZoneException.php',
19+
'DateMalformedIntervalStringException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateMalformedIntervalStringException.php',
20+
'DateMalformedPeriodStringException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateMalformedPeriodStringException.php',
21+
'DateMalformedStringException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateMalformedStringException.php',
22+
'DateObjectError' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateObjectError.php',
23+
'DateRangeError' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateRangeError.php',
1524
'FeedCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/FeedCreator.php',
1625
'FeedDate' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedDate.php',
1726
'FeedHtmlField' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedHtmlField.php',
@@ -22,6 +31,7 @@
2231
'HtmlDescribable' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
2332
'JSCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
2433
'JSONCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/JSONCreator.php',
34+
'JsonException' => $vendorDir . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
2535
'KMLCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/KMLCreator.php',
2636
'MBOXCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/MBOXCreator.php',
2737
'Nette\\ArgumentOutOfRangeException' => $vendorDir . '/nette/utils/src/exceptions.php',
@@ -81,6 +91,7 @@
8191
'Nette\\Utils\\UnknownImageFileException' => $vendorDir . '/nette/utils/src/Utils/exceptions.php',
8292
'Nette\\Utils\\Validators' => $vendorDir . '/nette/utils/src/Utils/Validators.php',
8393
'OPMLCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/OPMLCreator.php',
94+
'Override' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/Override.php',
8495
'PHPCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/PHPCreator.php',
8596
'PIECreator01' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/PIECreator01.php',
8697
'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
@@ -94,6 +105,7 @@
94105
'Random\\RandomError' => $vendorDir . '/symfony/polyfill-php82/Resources/stubs/Random/RandomError.php',
95106
'Random\\RandomException' => $vendorDir . '/symfony/polyfill-php82/Resources/stubs/Random/RandomException.php',
96107
'ReturnTypeWillChange' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
108+
'SQLite3Exception' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
97109
'SensitiveParameter' => $vendorDir . '/symfony/polyfill-php82/Resources/stubs/SensitiveParameter.php',
98110
'SensitiveParameterValue' => $vendorDir . '/symfony/polyfill-php82/Resources/stubs/SensitiveParameterValue.php',
99111
'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',

‎include/vendor/composer/autoload_files.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
1313
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
1414
'fdc0e9724ddc47859c8bf0c1ea0a623a' => $vendorDir . '/openpsa/universalfeedcreator/lib/constants.php',
15+
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
1516
'23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
1617
'5897ea0ac4cccf14d323035e65887801' => $vendorDir . '/symfony/polyfill-php82/bootstrap.php',
18+
'662a729f963d39afe703c9d9b7ab4a8c' => $vendorDir . '/symfony/polyfill-php83/bootstrap.php',
1719
);

‎include/vendor/composer/autoload_psr4.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
return array(
99
'enshrined\\svgSanitize\\' => array($vendorDir . '/enshrined/svg-sanitize/src'),
1010
'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'),
11+
'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'),
1112
'Symfony\\Polyfill\\Php82\\' => array($vendorDir . '/symfony/polyfill-php82'),
1213
'Symfony\\Polyfill\\Php81\\' => array($vendorDir . '/symfony/polyfill-php81'),
1314
'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
15+
'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
1416
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
1517
'SimplePie\\' => array($vendorDir . '/simplepie/simplepie/src'),
1618
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
@@ -26,6 +28,7 @@
2628
'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
2729
'Html2Text\\' => array($vendorDir . '/html2text/html2text/src'),
2830
'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
31+
'Composer\\Pcre\\' => array($vendorDir . '/composer/pcre/src'),
2932
'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'),
3033
'Algo26\\IdnaConvert\\' => array($vendorDir . '/algo26-matthias/idna-convert/src'),
3134
);

‎include/vendor/composer/autoload_static.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
1313
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
1414
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
1515
'fdc0e9724ddc47859c8bf0c1ea0a623a' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/constants.php',
16+
'0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
1617
'23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php',
1718
'5897ea0ac4cccf14d323035e65887801' => __DIR__ . '/..' . '/symfony/polyfill-php82/bootstrap.php',
19+
'662a729f963d39afe703c9d9b7ab4a8c' => __DIR__ . '/..' . '/symfony/polyfill-php83/bootstrap.php',
1820
);
1921

2022
public static $prefixLengthsPsr4 = array (
@@ -28,9 +30,11 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
2830
),
2931
'S' =>
3032
array (
33+
'Symfony\\Polyfill\\Php83\\' => 23,
3134
'Symfony\\Polyfill\\Php82\\' => 23,
3235
'Symfony\\Polyfill\\Php81\\' => 23,
3336
'Symfony\\Polyfill\\Php80\\' => 23,
37+
'Symfony\\Polyfill\\Php73\\' => 23,
3438
'Symfony\\Polyfill\\Mbstring\\' => 26,
3539
'SimplePie\\' => 10,
3640
),
@@ -67,6 +71,7 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
6771
),
6872
'C' =>
6973
array (
74+
'Composer\\Pcre\\' => 14,
7075
'Complex\\' => 8,
7176
),
7277
'A' =>
@@ -84,6 +89,10 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
8489
array (
8590
0 => __DIR__ . '/..' . '/maennchen/zipstream-php/src',
8691
),
92+
'Symfony\\Polyfill\\Php83\\' =>
93+
array (
94+
0 => __DIR__ . '/..' . '/symfony/polyfill-php83',
95+
),
8796
'Symfony\\Polyfill\\Php82\\' =>
8897
array (
8998
0 => __DIR__ . '/..' . '/symfony/polyfill-php82',
@@ -96,6 +105,10 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
96105
array (
97106
0 => __DIR__ . '/..' . '/symfony/polyfill-php80',
98107
),
108+
'Symfony\\Polyfill\\Php73\\' =>
109+
array (
110+
0 => __DIR__ . '/..' . '/symfony/polyfill-php73',
111+
),
99112
'Symfony\\Polyfill\\Mbstring\\' =>
100113
array (
101114
0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
@@ -157,6 +170,10 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
157170
array (
158171
0 => __DIR__ . '/..' . '/dflydev/dot-access-data/src',
159172
),
173+
'Composer\\Pcre\\' =>
174+
array (
175+
0 => __DIR__ . '/..' . '/composer/pcre/src',
176+
),
160177
'Complex\\' =>
161178
array (
162179
0 => __DIR__ . '/..' . '/markbaker/complex/classes/src',
@@ -191,6 +208,15 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
191208
'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
192209
'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',
193210
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
211+
'DateError' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateError.php',
212+
'DateException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateException.php',
213+
'DateInvalidOperationException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateInvalidOperationException.php',
214+
'DateInvalidTimeZoneException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateInvalidTimeZoneException.php',
215+
'DateMalformedIntervalStringException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateMalformedIntervalStringException.php',
216+
'DateMalformedPeriodStringException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateMalformedPeriodStringException.php',
217+
'DateMalformedStringException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateMalformedStringException.php',
218+
'DateObjectError' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateObjectError.php',
219+
'DateRangeError' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateRangeError.php',
194220
'FeedCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/FeedCreator.php',
195221
'FeedDate' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedDate.php',
196222
'FeedHtmlField' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedHtmlField.php',
@@ -201,6 +227,7 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
201227
'HtmlDescribable' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
202228
'JSCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
203229
'JSONCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/JSONCreator.php',
230+
'JsonException' => __DIR__ . '/..' . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
204231
'KMLCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/KMLCreator.php',
205232
'MBOXCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/MBOXCreator.php',
206233
'Nette\\ArgumentOutOfRangeException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
@@ -260,6 +287,7 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
260287
'Nette\\Utils\\UnknownImageFileException' => __DIR__ . '/..' . '/nette/utils/src/Utils/exceptions.php',
261288
'Nette\\Utils\\Validators' => __DIR__ . '/..' . '/nette/utils/src/Utils/Validators.php',
262289
'OPMLCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/OPMLCreator.php',
290+
'Override' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/Override.php',
263291
'PHPCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/PHPCreator.php',
264292
'PIECreator01' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/PIECreator01.php',
265293
'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
@@ -273,6 +301,7 @@ class ComposerStaticInit95ad66835bf12809290dc5d76be58922
273301
'Random\\RandomError' => __DIR__ . '/..' . '/symfony/polyfill-php82/Resources/stubs/Random/RandomError.php',
274302
'Random\\RandomException' => __DIR__ . '/..' . '/symfony/polyfill-php82/Resources/stubs/Random/RandomException.php',
275303
'ReturnTypeWillChange' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
304+
'SQLite3Exception' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
276305
'SensitiveParameter' => __DIR__ . '/..' . '/symfony/polyfill-php82/Resources/stubs/SensitiveParameter.php',
277306
'SensitiveParameterValue' => __DIR__ . '/..' . '/symfony/polyfill-php82/Resources/stubs/SensitiveParameterValue.php',
278307
'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',

0 commit comments

Comments
 (0)