Skip to content

Commit e56b0d9

Browse files
author
Simon Mönch
authored
Revert "Add versions to hot-patched symbols" but keep fixed Lexer (#437)
1 parent 4ae2d75 commit e56b0d9

File tree

3 files changed

+54
-67
lines changed

3 files changed

+54
-67
lines changed

‎Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,10 @@ vendor-bin/code-sniffer/vendor: vendor-bin/code-sniffer/composer.lock vendor/bam
432432
composer bin code-sniffer install
433433
touch -c $@
434434

435+
vendor-bin/phpstan/vendor: vendor-bin/phpstan/composer.lock vendor/bamarni
436+
composer bin phpstan install
437+
touch -c $@
438+
435439
fixtures/set005/vendor: fixtures/set005/composer.lock
436440
composer --working-dir=fixtures/set005 install
437441
touch -c $@
@@ -513,6 +517,9 @@ vendor-bin/covers-validator/composer.lock: vendor-bin/covers-validator/composer.
513517
vendor-bin/code-sniffer/composer.lock: vendor-bin/code-sniffer/composer.json
514518
@echo code-sniffer composer.lock is not up to date
515519

520+
vendor-bin/phpstan/composer.lock: vendor-bin/phpstan/composer.json
521+
@echo phpstan composer.lock is not up to date
522+
516523
fixtures/set005/composer.lock: fixtures/set005/composer.json
517524
@echo fixtures/set005/composer.lock is not up to date.
518525

@@ -577,7 +584,7 @@ $(CODE_SNIFFER_FIX): vendor-bin/code-sniffer/vendor
577584
composer bin code-sniffer install
578585
touch -c $@
579586

580-
$(PHPSTAN): vendor/bamarni
587+
$(PHPSTAN): vendor-bin/phpstan/vendor
581588
composer bin phpstan install
582589
touch -c $@
583590

‎src/Reflector.php

Lines changed: 46 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
namespace Humbug\PhpScoper;
1616

1717
use JetBrains\PHPStormStub\PhpStormStubsMap;
18-
use function array_diff;
1918
use function array_fill_keys;
20-
use function array_filter;
2119
use function array_keys;
2220
use function array_merge;
2321
use function strtolower;
24-
use const PHP_VERSION_ID;
2522

2623
/**
2724
* @private
@@ -30,55 +27,55 @@ final class Reflector
3027
{
3128
private const MISSING_CLASSES = [
3229
// https://github.com/JetBrains/phpstorm-stubs/pull/594
33-
'parallel\Channel' => 0,
34-
'parallel\Channel\Error' => 0,
35-
'parallel\Channel\Error\Closed' => 0,
36-
'parallel\Channel\Error\Existence' => 0,
37-
'parallel\Channel\Error\IllegalValue' => 0,
38-
'parallel\Error' => 0,
39-
'parallel\Events' => 0,
40-
'parallel\Events\Error' => 0,
41-
'parallel\Events\Error\Existence' => 0,
42-
'parallel\Events\Error\Timeout' => 0,
43-
'parallel\Events\Event' => 0,
44-
'parallel\Events\Event\Type' => 0,
45-
'parallel\Events\Input' => 0,
46-
'parallel\Events\Input\Error' => 0,
47-
'parallel\Events\Input\Error\Existence' => 0,
48-
'parallel\Events\Input\Error\IllegalValue' => 0,
49-
'parallel\Future' => 0,
50-
'parallel\Future\Error' => 0,
51-
'parallel\Future\Error\Cancelled' => 0,
52-
'parallel\Future\Error\Foreign' => 0,
53-
'parallel\Future\Error\Killed' => 0,
54-
'parallel\Runtime' => 0,
55-
'parallel\Runtime\Bootstrap' => 0,
56-
'parallel\Runtime\Error' => 0,
57-
'parallel\Runtime\Error\Bootstrap' => 0,
58-
'parallel\Runtime\Error\Closed' => 0,
59-
'parallel\Runtime\Error\IllegalFunction' => 0,
60-
'parallel\Runtime\Error\IllegalInstruction' => 0,
61-
'parallel\Runtime\Error\IllegalParameter' => 0,
62-
'parallel\Runtime\Error\IllegalReturn' => 0,
30+
'parallel\Channel',
31+
'parallel\Channel\Error',
32+
'parallel\Channel\Error\Closed',
33+
'parallel\Channel\Error\Existence',
34+
'parallel\Channel\Error\IllegalValue',
35+
'parallel\Error',
36+
'parallel\Events',
37+
'parallel\Events\Error',
38+
'parallel\Events\Error\Existence',
39+
'parallel\Events\Error\Timeout',
40+
'parallel\Events\Event',
41+
'parallel\Events\Event\Type',
42+
'parallel\Events\Input',
43+
'parallel\Events\Input\Error',
44+
'parallel\Events\Input\Error\Existence',
45+
'parallel\Events\Input\Error\IllegalValue',
46+
'parallel\Future',
47+
'parallel\Future\Error',
48+
'parallel\Future\Error\Cancelled',
49+
'parallel\Future\Error\Foreign',
50+
'parallel\Future\Error\Killed',
51+
'parallel\Runtime',
52+
'parallel\Runtime\Bootstrap',
53+
'parallel\Runtime\Error',
54+
'parallel\Runtime\Error\Bootstrap',
55+
'parallel\Runtime\Error\Closed',
56+
'parallel\Runtime\Error\IllegalFunction',
57+
'parallel\Runtime\Error\IllegalInstruction',
58+
'parallel\Runtime\Error\IllegalParameter',
59+
'parallel\Runtime\Error\IllegalReturn',
6360
];
6461

6562
private const MISSING_FUNCTIONS = [];
6663

6764
private const MISSING_CONSTANTS = [
68-
'STDIN' => 0,
69-
'STDOUT' => 0,
70-
'STDERR' => 0,
65+
'STDIN',
66+
'STDOUT',
67+
'STDERR',
7168
// Added in PHP 7.4
72-
'T_BAD_CHARACTER' => 70400,
73-
'T_FN' => 70400,
74-
'T_COALESCE_EQUAL' => 70400,
69+
'T_BAD_CHARACTER',
70+
'T_FN',
71+
'T_COALESCE_EQUAL',
7572
// Added in PHP 8.0
76-
'T_NAME_QUALIFIED' => 80000,
77-
'T_NAME_FULLY_QUALIFIED' => 80000,
78-
'T_NAME_RELATIVE' => 80000,
79-
'T_MATCH' => 80000,
80-
'T_NULLSAFE_OBJECT_OPERATOR' => 80000,
81-
'T_ATTRIBUTE' => 80000,
73+
'T_NAME_QUALIFIED',
74+
'T_NAME_FULLY_QUALIFIED',
75+
'T_NAME_RELATIVE',
76+
'T_MATCH',
77+
'T_NULLSAFE_OBJECT_OPERATOR',
78+
'T_ATTRIBUTE',
8279
];
8380

8481
private static $CLASSES;
@@ -90,30 +87,18 @@ final class Reflector
9087
/**
9188
* @param array<string,string>|null $symbols
9289
* @param array<string,string> $source
93-
* @param array<string, int> $missingSymbols
90+
* @param string[] $missingSymbols
9491
*/
9592
private static function initSymbolList(?array &$symbols, array $source, array $missingSymbols): void
9693
{
9794
if (null !== $symbols) {
9895
return;
9996
}
10097

101-
$excludingSymbols = array_keys(
102-
array_filter(
103-
$missingSymbols,
104-
static function ($version) {
105-
return PHP_VERSION_ID < $version;
106-
}
107-
)
108-
);
109-
11098
$symbols = array_fill_keys(
111-
array_diff(
112-
array_merge(
113-
array_keys($source),
114-
array_keys($missingSymbols)
115-
),
116-
$excludingSymbols
99+
array_merge(
100+
array_keys($source),
101+
$missingSymbols
117102
),
118103
true
119104
);

‎tests/ReflectorTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,5 @@ public function provideConstants(): Generator
163163
'FTP_ASCII',
164164
true,
165165
];
166-
167-
yield 'T_MATCH constant' => [
168-
'T_MATCH',
169-
PHP_VERSION_ID >= 80000,
170-
];
171166
}
172167
}

0 commit comments

Comments
 (0)