Skip to content

Commit f62f7af

Browse files
kesselbkesselb
committed
Add missing files
Signed-off-by: Daniel Kesselberg <[email protected]>
1 parent 7ebdbd2 commit f62f7af

10 files changed

Lines changed: 327 additions & 20 deletions

File tree

‎composer/autoload_classmap.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,6 +1829,10 @@
18291829
'PhpParser\\JsonDecoder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php',
18301830
'PhpParser\\Lexer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer.php',
18311831
'PhpParser\\Lexer\\Emulative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
1832+
'PhpParser\\Lexer\\TokenEmulator\\CoaleseEqualTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php',
1833+
'PhpParser\\Lexer\\TokenEmulator\\FnTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php',
1834+
'PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
1835+
'PhpParser\\Lexer\\TokenEmulator\\TokenEmulatorInterface' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulatorInterface.php',
18321836
'PhpParser\\NameContext' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NameContext.php',
18331837
'PhpParser\\Node' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node.php',
18341838
'PhpParser\\NodeAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
@@ -1848,6 +1852,7 @@
18481852
'PhpParser\\Node\\Expr\\ArrayDimFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
18491853
'PhpParser\\Node\\Expr\\ArrayItem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
18501854
'PhpParser\\Node\\Expr\\Array_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
1855+
'PhpParser\\Node\\Expr\\ArrowFunction' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php',
18511856
'PhpParser\\Node\\Expr\\Assign' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
18521857
'PhpParser\\Node\\Expr\\AssignOp' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
18531858
'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
@@ -2004,6 +2009,7 @@
20042009
'PhpParser\\Node\\Stmt\\UseUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
20052010
'PhpParser\\Node\\Stmt\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
20062011
'PhpParser\\Node\\Stmt\\While_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
2012+
'PhpParser\\Node\\UnionType' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/UnionType.php',
20072013
'PhpParser\\Node\\VarLikeIdentifier' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php',
20082014
'PhpParser\\Parser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser.php',
20092015
'PhpParser\\ParserAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',

‎composer/autoload_static.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,6 +2349,10 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
23492349
'PhpParser\\JsonDecoder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php',
23502350
'PhpParser\\Lexer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer.php',
23512351
'PhpParser\\Lexer\\Emulative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
2352+
'PhpParser\\Lexer\\TokenEmulator\\CoaleseEqualTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php',
2353+
'PhpParser\\Lexer\\TokenEmulator\\FnTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php',
2354+
'PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
2355+
'PhpParser\\Lexer\\TokenEmulator\\TokenEmulatorInterface' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulatorInterface.php',
23522356
'PhpParser\\NameContext' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NameContext.php',
23532357
'PhpParser\\Node' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node.php',
23542358
'PhpParser\\NodeAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
@@ -2368,6 +2372,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
23682372
'PhpParser\\Node\\Expr\\ArrayDimFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
23692373
'PhpParser\\Node\\Expr\\ArrayItem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
23702374
'PhpParser\\Node\\Expr\\Array_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
2375+
'PhpParser\\Node\\Expr\\ArrowFunction' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php',
23712376
'PhpParser\\Node\\Expr\\Assign' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
23722377
'PhpParser\\Node\\Expr\\AssignOp' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
23732378
'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
@@ -2524,6 +2529,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
25242529
'PhpParser\\Node\\Stmt\\UseUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
25252530
'PhpParser\\Node\\Stmt\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
25262531
'PhpParser\\Node\\Stmt\\While_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
2532+
'PhpParser\\Node\\UnionType' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/UnionType.php',
25272533
'PhpParser\\Node\\VarLikeIdentifier' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php',
25282534
'PhpParser\\Parser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser.php',
25292535
'PhpParser\\ParserAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',

‎composer/installed.json‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,12 +1952,6 @@
19521952
"uri-template",
19531953
"url",
19541954
"ws"
1955-
],
1956-
"funding": [
1957-
{
1958-
"url": "https://github.com/sponsors/nyamsprod",
1959-
"type": "github"
1960-
}
19611955
]
19621956
},
19631957
{
@@ -4552,20 +4546,6 @@
45524546
"ctype",
45534547
"polyfill",
45544548
"portable"
4555-
],
4556-
"funding": [
4557-
{
4558-
"url": "https://symfony.com/sponsor",
4559-
"type": "custom"
4560-
},
4561-
{
4562-
"url": "https://github.com/fabpot",
4563-
"type": "github"
4564-
},
4565-
{
4566-
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
4567-
"type": "tidelift"
4568-
}
45694549
]
45704550
},
45714551
{

‎nikic/php-parser/.gitattributes‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/test export-ignore
2+
/test_old export-ignore
3+
/doc export-ignore
4+
CHANGELOG.md export-ignore
5+
.travis.yml export-ignore
6+
phpunit.xml.dist export-ignore
7+
UPGRADE-*.md export-ignore
8+
.gitignore export-ignore

‎nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Lexer\TokenEmulator;
4+
5+
use PhpParser\Lexer\Emulative;
6+
7+
final class CoaleseEqualTokenEmulator implements TokenEmulatorInterface
8+
{
9+
public function isEmulationNeeded(string $code) : bool
10+
{
11+
// skip version where this is supported
12+
if (version_compare(\PHP_VERSION, Emulative::PHP_7_4, '>=')) {
13+
return false;
14+
}
15+
16+
return strpos($code, '??=') !== false;
17+
}
18+
19+
public function emulate(string $code, array $tokens): array
20+
{
21+
// We need to manually iterate and manage a count because we'll change
22+
// the tokens array on the way
23+
$line = 1;
24+
for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
25+
if (isset($tokens[$i + 1])) {
26+
if ($tokens[$i][0] === T_COALESCE && $tokens[$i + 1] === '=') {
27+
array_splice($tokens, $i, 2, [
28+
[Emulative::T_COALESCE_EQUAL, '??=', $line]
29+
]);
30+
$c--;
31+
continue;
32+
}
33+
}
34+
if (\is_array($tokens[$i])) {
35+
$line += substr_count($tokens[$i][1], "\n");
36+
}
37+
}
38+
39+
return $tokens;
40+
}
41+
}

‎nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Lexer\TokenEmulator;
4+
5+
use PhpParser\Lexer\Emulative;
6+
7+
final class FnTokenEmulator implements TokenEmulatorInterface
8+
{
9+
public function isEmulationNeeded(string $code) : bool
10+
{
11+
// skip version where this is supported
12+
if (version_compare(\PHP_VERSION, Emulative::PHP_7_4, '>=')) {
13+
return false;
14+
}
15+
16+
return strpos($code, 'fn') !== false;
17+
}
18+
19+
public function emulate(string $code, array $tokens): array
20+
{
21+
// We need to manually iterate and manage a count because we'll change
22+
// the tokens array on the way
23+
foreach ($tokens as $i => $token) {
24+
if ($token[0] === T_STRING && $token[1] === 'fn') {
25+
$previousNonSpaceToken = $this->getPreviousNonSpaceToken($tokens, $i);
26+
if ($previousNonSpaceToken !== null && $previousNonSpaceToken[0] === T_OBJECT_OPERATOR) {
27+
continue;
28+
}
29+
30+
$tokens[$i][0] = Emulative::T_FN;
31+
}
32+
}
33+
34+
return $tokens;
35+
}
36+
37+
/**
38+
* @param mixed[] $tokens
39+
* @return mixed[]|null
40+
*/
41+
private function getPreviousNonSpaceToken(array $tokens, int $start)
42+
{
43+
for ($i = $start - 1; $i >= 0; --$i) {
44+
if ($tokens[$i][0] === T_WHITESPACE) {
45+
continue;
46+
}
47+
48+
return $tokens[$i];
49+
}
50+
51+
return null;
52+
}
53+
}

‎nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Lexer\TokenEmulator;
4+
5+
use PhpParser\Lexer\Emulative;
6+
7+
final class NumericLiteralSeparatorEmulator implements TokenEmulatorInterface
8+
{
9+
const BIN = '(?:0b[01]+(?:_[01]+)*)';
10+
const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
11+
const DEC = '(?:[0-9]+(?:_[0-9]+)*)';
12+
const SIMPLE_FLOAT = '(?:' . self::DEC . '\.' . self::DEC . '?|\.' . self::DEC . ')';
13+
const EXP = '(?:e[+-]?' . self::DEC . ')';
14+
const FLOAT = '(?:' . self::SIMPLE_FLOAT . self::EXP . '?|' . self::DEC . self::EXP . ')';
15+
const NUMBER = '~' . self::FLOAT . '|' . self::BIN . '|' . self::HEX . '|' . self::DEC . '~iA';
16+
17+
public function isEmulationNeeded(string $code) : bool
18+
{
19+
// skip version where this is supported
20+
if (version_compare(\PHP_VERSION, Emulative::PHP_7_4, '>=')) {
21+
return false;
22+
}
23+
24+
return preg_match('~[0-9a-f]_[0-9a-f]~i', $code) !== false;
25+
}
26+
27+
public function emulate(string $code, array $tokens): array
28+
{
29+
// We need to manually iterate and manage a count because we'll change
30+
// the tokens array on the way
31+
$codeOffset = 0;
32+
for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
33+
$token = $tokens[$i];
34+
$tokenLen = \strlen(\is_array($token) ? $token[1] : $token);
35+
36+
if ($token[0] !== T_LNUMBER && $token[0] !== T_DNUMBER) {
37+
$codeOffset += $tokenLen;
38+
continue;
39+
}
40+
41+
$res = preg_match(self::NUMBER, $code, $matches, 0, $codeOffset);
42+
assert($res, "No number at number token position");
43+
44+
$match = $matches[0];
45+
$matchLen = \strlen($match);
46+
if ($matchLen === $tokenLen) {
47+
// Original token already holds the full number.
48+
$codeOffset += $tokenLen;
49+
continue;
50+
}
51+
52+
$tokenKind = $this->resolveIntegerOrFloatToken($match);
53+
$newTokens = [[$tokenKind, $match, $token[2]]];
54+
55+
$numTokens = 1;
56+
$len = $tokenLen;
57+
while ($matchLen > $len) {
58+
$nextToken = $tokens[$i + $numTokens];
59+
$nextTokenText = \is_array($nextToken) ? $nextToken[1] : $nextToken;
60+
$nextTokenLen = \strlen($nextTokenText);
61+
62+
$numTokens++;
63+
if ($matchLen < $len + $nextTokenLen) {
64+
// Split trailing characters into a partial token.
65+
assert(is_array($nextToken), "Partial token should be an array token");
66+
$partialText = substr($nextTokenText, $matchLen - $len);
67+
$newTokens[] = [$nextToken[0], $partialText, $nextToken[2]];
68+
break;
69+
}
70+
71+
$len += $nextTokenLen;
72+
}
73+
74+
array_splice($tokens, $i, $numTokens, $newTokens);
75+
$c -= $numTokens - \count($newTokens);
76+
$codeOffset += $matchLen;
77+
}
78+
79+
return $tokens;
80+
}
81+
82+
private function resolveIntegerOrFloatToken(string $str): int
83+
{
84+
$str = str_replace('_', '', $str);
85+
86+
if (stripos($str, '0b') === 0) {
87+
$num = bindec($str);
88+
} elseif (stripos($str, '0x') === 0) {
89+
$num = hexdec($str);
90+
} elseif (stripos($str, '0') === 0 && ctype_digit($str)) {
91+
$num = octdec($str);
92+
} else {
93+
$num = +$str;
94+
}
95+
96+
return is_float($num) ? T_DNUMBER : T_LNUMBER;
97+
}
98+
}

‎nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulatorInterface.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Lexer\TokenEmulator;
4+
5+
/** @internal */
6+
interface TokenEmulatorInterface
7+
{
8+
public function isEmulationNeeded(string $code): bool;
9+
10+
/**
11+
* @return array Modified Tokens
12+
*/
13+
public function emulate(string $code, array $tokens): array;
14+
}

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Node\Expr;
4+
5+
use PhpParser\Node;
6+
use PhpParser\Node\Expr;
7+
use PhpParser\Node\FunctionLike;
8+
9+
class ArrowFunction extends Expr implements FunctionLike
10+
{
11+
/** @var bool */
12+
public $static;
13+
14+
/** @var bool */
15+
public $byRef;
16+
17+
/** @var Node\Param[] */
18+
public $params = [];
19+
20+
/** @var null|Node\Identifier|Node\Name|Node\NullableType|Node\UnionType */
21+
public $returnType;
22+
23+
/** @var Expr */
24+
public $expr;
25+
26+
/**
27+
* @param array $subNodes Array of the following optional subnodes:
28+
* 'static' => false : Whether the closure is static
29+
* 'byRef' => false : Whether to return by reference
30+
* 'params' => array() : Parameters
31+
* 'returnType' => null : Return type
32+
* 'expr' => Expr : Expression body
33+
* @param array $attributes Additional attributes
34+
*/
35+
public function __construct(array $subNodes = [], array $attributes = []) {
36+
$this->attributes = $attributes;
37+
$this->static = $subNodes['static'] ?? false;
38+
$this->byRef = $subNodes['byRef'] ?? false;
39+
$this->params = $subNodes['params'] ?? [];
40+
$returnType = $subNodes['returnType'] ?? null;
41+
$this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
42+
$this->expr = $subNodes['expr'] ?? null;
43+
}
44+
45+
public function getSubNodeNames() : array {
46+
return ['static', 'byRef', 'params', 'returnType', 'expr'];
47+
}
48+
49+
public function returnsByRef() : bool {
50+
return $this->byRef;
51+
}
52+
53+
public function getParams() : array {
54+
return $this->params;
55+
}
56+
57+
public function getReturnType() {
58+
return $this->returnType;
59+
}
60+
61+
/**
62+
* @return Node\Stmt\Return_[]
63+
*/
64+
public function getStmts() : array {
65+
return [new Node\Stmt\Return_($this->expr)];
66+
}
67+
68+
public function getType() : string {
69+
return 'Expr_ArrowFunction';
70+
}
71+
}

0 commit comments

Comments
 (0)