Skip to content

Commit 203b0ab

Browse files
ingeniumedingeniumed
committed
Updating the dependencies, and ensuring the min php v is raised too
1 parent e3fd40c commit 203b0ab

File tree

80 files changed

+1158
-709
lines changed

Some content is hidden

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

80 files changed

+1158
-709
lines changed

‎composer.lock‎

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

‎vendor/autoload.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
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';

‎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/installed.json‎

Lines changed: 62 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"packages": [
33
{
44
"name": "masterminds/html5",
5-
"version": "2.9.0",
6-
"version_normalized": "2.9.0.0",
5+
"version": "2.10.0",
6+
"version_normalized": "2.10.0.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/Masterminds/html5-php.git",
10-
"reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6"
10+
"reference": "fcf91eb64359852f00d921887b219479b4f21251"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
15-
"reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
14+
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
15+
"reference": "fcf91eb64359852f00d921887b219479b4f21251",
1616
"shasum": ""
1717
},
1818
"require": {
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
2424
},
25-
"time": "2024-03-31T07:05:07+00:00",
25+
"time": "2025-07-25T09:04:22+00:00",
2626
"type": "library",
2727
"extra": {
2828
"branch-alias": {
@@ -66,29 +66,29 @@
6666
],
6767
"support": {
6868
"issues": "https://github.com/Masterminds/html5-php/issues",
69-
"source": "https://github.com/Masterminds/html5-php/tree/2.9.0"
69+
"source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
7070
},
7171
"install-path": "../masterminds/html5"
7272
},
7373
{
7474
"name": "symfony/css-selector",
75-
"version": "v6.0.19",
76-
"version_normalized": "6.0.19.0",
75+
"version": "v6.4.24",
76+
"version_normalized": "6.4.24.0",
7777
"source": {
7878
"type": "git",
7979
"url": "https://github.com/symfony/css-selector.git",
80-
"reference": "f1d00bddb83a4cb2138564b2150001cb6ce272b1"
80+
"reference": "9b784413143701aa3c94ac1869a159a9e53e8761"
8181
},
8282
"dist": {
8383
"type": "zip",
84-
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f1d00bddb83a4cb2138564b2150001cb6ce272b1",
85-
"reference": "f1d00bddb83a4cb2138564b2150001cb6ce272b1",
84+
"url": "https://api.github.com/repos/symfony/css-selector/zipball/9b784413143701aa3c94ac1869a159a9e53e8761",
85+
"reference": "9b784413143701aa3c94ac1869a159a9e53e8761",
8686
"shasum": ""
8787
},
8888
"require": {
89-
"php": ">=8.0.2"
89+
"php": ">=8.1"
9090
},
91-
"time": "2023-01-01T08:36:10+00:00",
91+
"time": "2025-07-10T08:14:14+00:00",
9292
"type": "library",
9393
"installation-source": "dist",
9494
"autoload": {
@@ -120,7 +120,7 @@
120120
"description": "Converts CSS selectors to XPath expressions",
121121
"homepage": "https://symfony.com",
122122
"support": {
123-
"source": "https://github.com/symfony/css-selector/tree/v6.0.19"
123+
"source": "https://github.com/symfony/css-selector/tree/v6.4.24"
124124
},
125125
"funding": [
126126
{
@@ -131,6 +131,10 @@
131131
"url": "https://github.com/fabpot",
132132
"type": "github"
133133
},
134+
{
135+
"url": "https://github.com/nicolas-grekas",
136+
"type": "github"
137+
},
134138
{
135139
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
136140
"type": "tidelift"
@@ -140,35 +144,29 @@
140144
},
141145
{
142146
"name": "symfony/dom-crawler",
143-
"version": "v6.0.19",
144-
"version_normalized": "6.0.19.0",
147+
"version": "v6.4.25",
148+
"version_normalized": "6.4.25.0",
145149
"source": {
146150
"type": "git",
147151
"url": "https://github.com/symfony/dom-crawler.git",
148-
"reference": "622578ff158318b1b49d95068bd6b66c713601e9"
152+
"reference": "976302990f9f2a6d4c07206836dd4ca77cae9524"
149153
},
150154
"dist": {
151155
"type": "zip",
152-
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/622578ff158318b1b49d95068bd6b66c713601e9",
153-
"reference": "622578ff158318b1b49d95068bd6b66c713601e9",
156+
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/976302990f9f2a6d4c07206836dd4ca77cae9524",
157+
"reference": "976302990f9f2a6d4c07206836dd4ca77cae9524",
154158
"shasum": ""
155159
},
156160
"require": {
157-
"php": ">=8.0.2",
161+
"masterminds/html5": "^2.6",
162+
"php": ">=8.1",
158163
"symfony/polyfill-ctype": "~1.8",
159164
"symfony/polyfill-mbstring": "~1.0"
160165
},
161-
"conflict": {
162-
"masterminds/html5": "<2.6"
163-
},
164166
"require-dev": {
165-
"masterminds/html5": "^2.6",
166-
"symfony/css-selector": "^5.4|^6.0"
167-
},
168-
"suggest": {
169-
"symfony/css-selector": ""
167+
"symfony/css-selector": "^5.4|^6.0|^7.0"
170168
},
171-
"time": "2023-01-20T17:44:14+00:00",
169+
"time": "2025-08-05T18:56:08+00:00",
172170
"type": "library",
173171
"installation-source": "dist",
174172
"autoload": {
@@ -196,7 +194,7 @@
196194
"description": "Eases DOM navigation for HTML and XML documents",
197195
"homepage": "https://symfony.com",
198196
"support": {
199-
"source": "https://github.com/symfony/dom-crawler/tree/v6.0.19"
197+
"source": "https://github.com/symfony/dom-crawler/tree/v6.4.25"
200198
},
201199
"funding": [
202200
{
@@ -207,6 +205,10 @@
207205
"url": "https://github.com/fabpot",
208206
"type": "github"
209207
},
208+
{
209+
"url": "https://github.com/nicolas-grekas",
210+
"type": "github"
211+
},
210212
{
211213
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
212214
"type": "tidelift"
@@ -216,34 +218,34 @@
216218
},
217219
{
218220
"name": "symfony/polyfill-ctype",
219-
"version": "v1.29.0",
220-
"version_normalized": "1.29.0.0",
221+
"version": "v1.33.0",
222+
"version_normalized": "1.33.0.0",
221223
"source": {
222224
"type": "git",
223225
"url": "https://github.com/symfony/polyfill-ctype.git",
224-
"reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
226+
"reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
225227
},
226228
"dist": {
227229
"type": "zip",
228-
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
229-
"reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
230+
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
231+
"reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
230232
"shasum": ""
231233
},
232234
"require": {
233-
"php": ">=7.1"
235+
"php": ">=7.2"
234236
},
235237
"provide": {
236238
"ext-ctype": "*"
237239
},
238240
"suggest": {
239241
"ext-ctype": "For best performance"
240242
},
241-
"time": "2024-01-29T20:11:03+00:00",
243+
"time": "2024-09-09T11:45:10+00:00",
242244
"type": "library",
243245
"extra": {
244246
"thanks": {
245-
"name": "symfony/polyfill",
246-
"url": "https://github.com/symfony/polyfill"
247+
"url": "https://github.com/symfony/polyfill",
248+
"name": "symfony/polyfill"
247249
}
248250
},
249251
"installation-source": "dist",
@@ -278,7 +280,7 @@
278280
"portable"
279281
],
280282
"support": {
281-
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
283+
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
282284
},
283285
"funding": [
284286
{
@@ -289,6 +291,10 @@
289291
"url": "https://github.com/fabpot",
290292
"type": "github"
291293
},
294+
{
295+
"url": "https://github.com/nicolas-grekas",
296+
"type": "github"
297+
},
292298
{
293299
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
294300
"type": "tidelift"
@@ -298,34 +304,35 @@
298304
},
299305
{
300306
"name": "symfony/polyfill-mbstring",
301-
"version": "v1.29.0",
302-
"version_normalized": "1.29.0.0",
307+
"version": "v1.33.0",
308+
"version_normalized": "1.33.0.0",
303309
"source": {
304310
"type": "git",
305311
"url": "https://github.com/symfony/polyfill-mbstring.git",
306-
"reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
312+
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
307313
},
308314
"dist": {
309315
"type": "zip",
310-
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
311-
"reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
316+
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
317+
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
312318
"shasum": ""
313319
},
314320
"require": {
315-
"php": ">=7.1"
321+
"ext-iconv": "*",
322+
"php": ">=7.2"
316323
},
317324
"provide": {
318325
"ext-mbstring": "*"
319326
},
320327
"suggest": {
321328
"ext-mbstring": "For best performance"
322329
},
323-
"time": "2024-01-29T20:11:03+00:00",
330+
"time": "2024-12-23T08:48:59+00:00",
324331
"type": "library",
325332
"extra": {
326333
"thanks": {
327-
"name": "symfony/polyfill",
328-
"url": "https://github.com/symfony/polyfill"
334+
"url": "https://github.com/symfony/polyfill",
335+
"name": "symfony/polyfill"
329336
}
330337
},
331338
"installation-source": "dist",
@@ -361,7 +368,7 @@
361368
"shim"
362369
],
363370
"support": {
364-
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
371+
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
365372
},
366373
"funding": [
367374
{
@@ -372,6 +379,10 @@
372379
"url": "https://github.com/fabpot",
373380
"type": "github"
374381
},
382+
{
383+
"url": "https://github.com/nicolas-grekas",
384+
"type": "github"
385+
},
375386
{
376387
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
377388
"type": "tidelift"

0 commit comments

Comments
 (0)