Skip to content

Commit 62a762f

Browse files
dependabot-preview[bot]dependabot-preview[bot]
authored
Merge pull request #397 from nextcloud/dependabot/composer/nikic/php-parser-4.3.0
2 parents 7375853 + f62f7af commit 62a762f

122 files changed

Lines changed: 2917 additions & 2380 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.lock‎

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

‎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: 9 additions & 28 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
{
@@ -2253,34 +2247,35 @@
22532247
},
22542248
{
22552249
"name": "nikic/php-parser",
2256-
"version": "v4.2.1",
2257-
"version_normalized": "4.2.1.0",
2250+
"version": "v4.3.0",
2251+
"version_normalized": "4.3.0.0",
22582252
"source": {
22592253
"type": "git",
22602254
"url": "https://github.com/nikic/PHP-Parser.git",
2261-
"reference": "5221f49a608808c1e4d436df32884cbc1b821ac0"
2255+
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
22622256
},
22632257
"dist": {
22642258
"type": "zip",
2265-
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0",
2266-
"reference": "5221f49a608808c1e4d436df32884cbc1b821ac0",
2259+
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
2260+
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
22672261
"shasum": ""
22682262
},
22692263
"require": {
22702264
"ext-tokenizer": "*",
22712265
"php": ">=7.0"
22722266
},
22732267
"require-dev": {
2274-
"phpunit/phpunit": "^6.5 || ^7.0"
2268+
"ircmaxell/php-yacc": "0.0.5",
2269+
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
22752270
},
2276-
"time": "2019-02-16T20:54:15+00:00",
2271+
"time": "2019-11-08T13:50:10+00:00",
22772272
"bin": [
22782273
"bin/php-parse"
22792274
],
22802275
"type": "library",
22812276
"extra": {
22822277
"branch-alias": {
2283-
"dev-master": "4.2-dev"
2278+
"dev-master": "4.3-dev"
22842279
}
22852280
},
22862281
"installation-source": "dist",
@@ -4551,20 +4546,6 @@
45514546
"ctype",
45524547
"polyfill",
45534548
"portable"
4554-
],
4555-
"funding": [
4556-
{
4557-
"url": "https://symfony.com/sponsor",
4558-
"type": "custom"
4559-
},
4560-
{
4561-
"url": "https://github.com/fabpot",
4562-
"type": "github"
4563-
},
4564-
{
4565-
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
4566-
"type": "tidelift"
4567-
}
45684549
]
45694550
},
45704551
{

‎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/grammar/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ applied to it:
2121
Building the parser
2222
===================
2323

24-
In order to rebuild the parser, you need [moriyoshi's fork of kmyacc](https://github.com/moriyoshi/kmyacc-forked).
25-
After you compiled/installed it, run the `rebuildParsers.php` script.
24+
Run `php grammar/rebuildParsers.php` to rebuild the parsers. Additional options:
2625

27-
By default only the `Parser.php` is built. If you want to additionally emit debug symbols and create `y.output`, run the
28-
script with `--debug`. If you want to retain the preprocessed grammar pass `--keep-tmp-grammar`.
26+
* The `KMYACC` environment variable can be used to specify an alternative `kmyacc` binary.
27+
By default the `phpyacc` dev dependency will be used. To use the original `kmyacc`, you
28+
need to compile [moriyoshi's fork](https://github.com/moriyoshi/kmyacc-forked).
29+
* The `--debug` option enables emission of debug symbols and creates the `y.output` file.
30+
* The `--keep-tmp-grammar` option preserves the preprocessed grammar file.

‎nikic/php-parser/lib/PhpParser/Builder/Param.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Param implements PhpParser\Builder
1212

1313
protected $default = null;
1414

15-
/** @var string|Node\Name|Node\NullableType|null */
15+
/** @var Node\Identifier|Node\Name|Node\NullableType|null */
1616
protected $type = null;
1717

1818
protected $byRef = false;

0 commit comments

Comments
 (0)