Skip to content

Commit d664a4f

Browse files
odain-cbdodain-cbd
committed
bump to nikic fork temporarly
1 parent 7e7b587 commit d664a4f

27 files changed

+165
-99
lines changed

‎composer.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"laminas/laminas-mail": "^2.11",
1919
"laminas/laminas-servicemanager": "^3.5",
2020
"league/oauth2-google": "^4.0.1",
21-
"nikic/php-parser": "~5.6.0",
21+
"nikic/php-parser": "dev-master",
2222
"pear/archive_tar": "~1.4.14",
2323
"pelago/emogrifier": "^7.2.0",
2424
"psr/log": "^3.0.0",
@@ -41,6 +41,10 @@
4141
"symfony/stopwatch": "~6.4.0",
4242
"symfony/web-profiler-bundle": "~6.4.0"
4343
},
44+
"repositories": [{
45+
"type": "vcs",
46+
"url": "https://github.com/Combodo/PHP-Parser"
47+
}],
4448
"suggest": {
4549
"ext-libsodium": "Required to use the AttributeEncryptedString.",
4650
"ext-openssl": "Can be used as a polyfill if libsodium is not installed",

‎composer.lock‎

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

‎lib/bin/php-parse.bat‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎lib/composer/InstalledVersions.php‎

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,12 @@
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-
3529
/**
3630
* @var mixed[]|null
3731
* @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
3832
*/
3933
private static $installed;
4034

41-
/**
42-
* @var bool
43-
*/
44-
private static $installedIsLocalDir;
45-
4635
/**
4736
* @var bool|null
4837
*/
@@ -320,24 +309,6 @@ public static function reload($data)
320309
{
321310
self::$installed = $data;
322311
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;
341312
}
342313

343314
/**
@@ -354,24 +325,19 @@ private static function getInstalled()
354325
$copiedLocalDir = false;
355326

356327
if (self::$canGetVendors) {
357-
$selfDir = self::getSelfDir();
358328
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
359-
$vendorDir = strtr($vendorDir, '\\', '/');
360329
if (isset(self::$installedByVendor[$vendorDir])) {
361330
$installed[] = self::$installedByVendor[$vendorDir];
362331
} elseif (is_file($vendorDir.'/composer/installed.php')) {
363332
/** @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 */
364333
$required = require $vendorDir.'/composer/installed.php';
365334
self::$installedByVendor[$vendorDir] = $required;
366335
$installed[] = $required;
367-
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
336+
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
368337
self::$installed = $required;
369-
self::$installedIsLocalDir = true;
338+
$copiedLocalDir = true;
370339
}
371340
}
372-
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
373-
$copiedLocalDir = true;
374-
}
375341
}
376342
}
377343

‎lib/composer/autoload_classmap.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,12 @@
489489
'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
490490
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
491491
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
492+
'Combodo\\iTop\\PhpParser\\Evaluation\\IdenticalEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/IdenticalEvaluator.php',
492493
'Combodo\\iTop\\PhpParser\\Evaluation\\IssetEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/IssetEvaluator.php',
493494
'Combodo\\iTop\\PhpParser\\Evaluation\\MethodCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/MethodCallEvaluator.php',
494495
'Combodo\\iTop\\PhpParser\\Evaluation\\ModEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ModEvaluator.php',
495496
'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/MulEvaluator.php',
496497
'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
497-
'Combodo\\iTop\\PhpParser\\Evaluation\\NullsafeMethodCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/NullsafeMethodCallEvaluator.php',
498-
'Combodo\\iTop\\PhpParser\\Evaluation\\NullsafePropertyFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/NullsafePropertyFetchEvaluator.php',
499498
'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
500499
'Combodo\\iTop\\PhpParser\\Evaluation\\PropertyFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PropertyFetchEvaluator.php',
501500
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',

‎lib/composer/autoload_static.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,13 +867,12 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
867867
'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
868868
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
869869
'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
870+
'Combodo\\iTop\\PhpParser\\Evaluation\\IdenticalEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/IdenticalEvaluator.php',
870871
'Combodo\\iTop\\PhpParser\\Evaluation\\IssetEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/IssetEvaluator.php',
871872
'Combodo\\iTop\\PhpParser\\Evaluation\\MethodCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/MethodCallEvaluator.php',
872873
'Combodo\\iTop\\PhpParser\\Evaluation\\ModEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ModEvaluator.php',
873874
'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/MulEvaluator.php',
874875
'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
875-
'Combodo\\iTop\\PhpParser\\Evaluation\\NullsafeMethodCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/NullsafeMethodCallEvaluator.php',
876-
'Combodo\\iTop\\PhpParser\\Evaluation\\NullsafePropertyFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/NullsafePropertyFetchEvaluator.php',
877876
'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
878877
'Combodo\\iTop\\PhpParser\\Evaluation\\PropertyFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PropertyFetchEvaluator.php',
879878
'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',

‎lib/composer/installed.json‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,17 +1053,17 @@
10531053
},
10541054
{
10551055
"name": "nikic/php-parser",
1056-
"version": "v5.6.0",
1057-
"version_normalized": "5.6.0.0",
1056+
"version": "dev-master",
1057+
"version_normalized": "dev-master",
10581058
"source": {
10591059
"type": "git",
1060-
"url": "https://github.com/nikic/PHP-Parser.git",
1061-
"reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56"
1060+
"url": "https://github.com/Combodo/PHP-Parser.git",
1061+
"reference": "fe64d1ac8a1332b9dcc1af05ec4fdfd9d8665f3a"
10621062
},
10631063
"dist": {
10641064
"type": "zip",
1065-
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
1066-
"reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
1065+
"url": "https://api.github.com/repos/Combodo/PHP-Parser/zipball/fe64d1ac8a1332b9dcc1af05ec4fdfd9d8665f3a",
1066+
"reference": "fe64d1ac8a1332b9dcc1af05ec4fdfd9d8665f3a",
10671067
"shasum": ""
10681068
},
10691069
"require": {
@@ -1076,14 +1076,15 @@
10761076
"ircmaxell/php-yacc": "^0.0.7",
10771077
"phpunit/phpunit": "^9.0"
10781078
},
1079-
"time": "2025-07-27T20:03:57+00:00",
1079+
"time": "2025-09-05T13:41:49+00:00",
1080+
"default-branch": true,
10801081
"bin": [
10811082
"bin/php-parse"
10821083
],
10831084
"type": "library",
10841085
"extra": {
10851086
"branch-alias": {
1086-
"dev-master": "5.0-dev"
1087+
"dev-master": "5.x-dev"
10871088
}
10881089
},
10891090
"installation-source": "dist",
@@ -1092,7 +1093,11 @@
10921093
"PhpParser\\": "lib/PhpParser"
10931094
}
10941095
},
1095-
"notification-url": "https://packagist.org/downloads/",
1096+
"autoload-dev": {
1097+
"psr-4": {
1098+
"PhpParser\\": "test/PhpParser/"
1099+
}
1100+
},
10961101
"license": [
10971102
"BSD-3-Clause"
10981103
],
@@ -1107,8 +1112,7 @@
11071112
"php"
11081113
],
11091114
"support": {
1110-
"issues": "https://github.com/nikic/PHP-Parser/issues",
1111-
"source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
1115+
"source": "https://github.com/Combodo/PHP-Parser/tree/master"
11121116
},
11131117
"install-path": "../nikic/php-parser"
11141118
},

‎lib/composer/installed.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'combodo/itop',
44
'pretty_version' => 'dev-develop',
55
'version' => 'dev-develop',
6-
'reference' => '5b9e0a1d4f4751778386710eb52a1326d3c29423',
6+
'reference' => '7e7b5874a648d8d2a011994b3b9e811d85e570c6',
77
'type' => 'project',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -22,7 +22,7 @@
2222
'combodo/itop' => array(
2323
'pretty_version' => 'dev-develop',
2424
'version' => 'dev-develop',
25-
'reference' => '5b9e0a1d4f4751778386710eb52a1326d3c29423',
25+
'reference' => '7e7b5874a648d8d2a011994b3b9e811d85e570c6',
2626
'type' => 'project',
2727
'install_path' => __DIR__ . '/../../',
2828
'aliases' => array(),
@@ -143,12 +143,14 @@
143143
'dev_requirement' => false,
144144
),
145145
'nikic/php-parser' => array(
146-
'pretty_version' => 'v5.6.0',
147-
'version' => '5.6.0.0',
148-
'reference' => '221b0d0fdf1369c71047ad1d18bb5880017bbc56',
146+
'pretty_version' => 'dev-master',
147+
'version' => 'dev-master',
148+
'reference' => 'fe64d1ac8a1332b9dcc1af05ec4fdfd9d8665f3a',
149149
'type' => 'library',
150150
'install_path' => __DIR__ . '/../nikic/php-parser',
151-
'aliases' => array(),
151+
'aliases' => array(
152+
0 => '5.x-dev',
153+
),
152154
'dev_requirement' => false,
153155
),
154156
'paragonie/random_compat' => array(

‎lib/nikic/php-parser/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"extra": {
2626
"branch-alias": {
27-
"dev-master": "5.0-dev"
27+
"dev-master": "5.x-dev"
2828
}
2929
},
3030
"autoload": {

‎lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
require __DIR__ . '/../ArrayItem.php';
66

77
if (false) {
8-
// For classmap-authoritative support.
8+
/**
9+
* For classmap-authoritative support.
10+
*
11+
* @deprecated use \PhpParser\Node\ArrayItem instead.
12+
*/
913
class ArrayItem extends \PhpParser\Node\ArrayItem {
1014
}
1115
}

0 commit comments

Comments
 (0)